Merge pull request #2419 from doctrine/cleanup/remove-5.5-support

Remove PHP 5.5 support

.travis.yml

@@ -8,8 +8,6 @@ cache:
         - $HOME/.composer/cache
 
 php:
-  - 5.4
-  - 5.5
   - 5.6
   - 7.0
   - hhvm
@@ -34,14 +32,6 @@ script: ./vendor/bin/phpunit --configuration tests/travis/$DB.travis.xml
 matrix:
   fast_finish: true
   include:
-    - php: 5.4
-      env: DB=mariadb
-      addons:
-        mariadb: 5.5
-    - php: 5.5
-      env: DB=mariadb
-      addons:
-        mariadb: 5.5
     - php: 5.6
       env: DB=mariadb
       addons:
@@ -55,14 +45,6 @@ matrix:
       addons:
         mariadb: 5.5
 
-    - php: 5.4
-      env: DB=mariadb
-      addons:
-        mariadb: 10.0
-    - php: 5.5
-      env: DB=mariadb
-      addons:
-        mariadb: 10.0
     - php: 5.6
       env: DB=mariadb
       addons:
@@ -76,14 +58,6 @@ matrix:
       addons:
         mariadb: 10.0
 
-    - php: 5.4
-      env: DB=mariadb
-      addons:
-        mariadb: 10.1
-    - php: 5.5
-      env: DB=mariadb
-      addons:
-        mariadb: 10.1
     - php: 5.6
       env: DB=mariadb
       addons:

composer.json

@@ -12,11 +12,11 @@
         {"name": "Jonathan Wage", "email": "jonwage@gmail.com"}
     ],
     "require": {
-        "php": ">=5.4",
+        "php": "^5.6 || ^7.0",
         "doctrine/common": "~2.4"
     },
     "require-dev": {
-        "phpunit/phpunit": "4.*",
+        "phpunit/phpunit": "^5.4.6",
         "symfony/console": "2.*"
     },
     "suggest": {

tests/Doctrine/Tests/DBAL/Functional/Schema/SchemaManagerFunctionalTestCase.php

@@ -283,7 +283,10 @@ class SchemaManagerFunctionalTestCase extends \Doctrine\Tests\DbalFunctionalTest
 
         $this->_sm->dropAndCreateTable($table);
 
-        $listenerMock = $this->getMock('ListTableColumnsDispatchEventListener', array('onSchemaColumnDefinition'));
+        $listenerMock = $this
+            ->getMockBuilder('ListTableColumnsDispatchEventListener')
+            ->setMethods(['onSchemaColumnDefinition'])
+            ->getMock();
         $listenerMock
             ->expects($this->exactly(7))
             ->method('onSchemaColumnDefinition');
@@ -308,7 +311,10 @@ class SchemaManagerFunctionalTestCase extends \Doctrine\Tests\DbalFunctionalTest
 
         $this->_sm->dropAndCreateTable($table);
 
-        $listenerMock = $this->getMock('ListTableIndexesDispatchEventListener', array('onSchemaIndexDefinition'));
+        $listenerMock = $this
+            ->getMockBuilder('ListTableIndexesDispatchEventListener')
+            ->setMethods(['onSchemaIndexDefinition'])
+            ->getMock();
         $listenerMock
             ->expects($this->exactly(3))
             ->method('onSchemaIndexDefinition');

tests/Doctrine/Tests/DbalFunctionalTestCase.php

@@ -40,7 +40,7 @@ class DbalFunctionalTestCase extends DbalTestCase
         $this->_conn->getConfiguration()->setSQLLogger($this->_sqlLoggerStack);
     }
 
-    protected function onNotSuccessfulTest(\Exception $e)
+    protected function onNotSuccessfulTest($e)
     {
         if ($e instanceof \PHPUnit_Framework_AssertionFailedError) {
             throw $e;