Switch to support only PHP 5.6+ and move PHPUnit up to 5 and 6

omines · Feb 7, 2017 · bea5585 · bea5585
1 parent 9e90488
commit bea5585
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,17 +4,21 @@ sudo: false
 
 matrix:
     include:
-        - php: 5.5
         - php: 5.6
         - php: 7.0
         - php: 7.1
         - php: hhvm-3.9
           dist: trusty
 
+env:
+    matrix:
+        - COMPOSER_FLAGS=""
+        - COMPOSER_FLAGS="--prefer-lowest"
+
 before_script:
   - curl --version
   - composer self-update
-  - composer install --no-interaction
+  - composer update --no-interaction --no-progress $COMPOSER_FLAGS
 
 script:
   - ./vendor/bin/phpunit -v
@@ -23,4 +27,4 @@ after_script:
   - php vendor/bin/coveralls -v
 
 after_success:
-  - if  [ $TRAVIS_PHP_VERSION = '7.1' ] && [ $TRAVIS_BRANCH = 'master' ] && [ $TRAVIS_PULL_REQUEST = 'false' ]; then sh bin/generate-api; fi
+  - if  [ $TRAVIS_PHP_VERSION = '7.1' ] && [ $TRAVIS_BRANCH = 'master' ] && [ $TRAVIS_PULL_REQUEST = 'false' ] && [ $COMPOSER_FLAGS = '']; then sh bin/generate-api; fi
diff --git a/README.md b/README.md
@@ -29,7 +29,7 @@ If you're not familiar with `composer` follow the installation instructions for
 ## Dependencies
 
 The library uses [Guzzle 6](https://github.com/guzzle/guzzle) as its HTTP communication layer. PHP versions supported
-are 5.5, 5.6, 7.0, 7.1 and hhvm.
+are 5.6, 7.0, 7.1 and hhvm.
 
 ## Basic usage
 

diff --git a/composer.json b/composer.json
@@ -18,11 +18,11 @@
     "issues": "https://github.com/omines/directadmin/issues"
   },
   "require": {
-    "php": ">=5.5.9",
-    "guzzlehttp/guzzle": "^6.2"
+    "php": ">=5.6.0",
+    "guzzlehttp/guzzle": "^6.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^4.8",
+    "phpunit/phpunit": "^5.7 || ^6.0",
     "satooshi/php-coveralls": "dev-master",
     "friendsofphp/php-cs-fixer": "^2.0"
   },

diff --git a/tests/DirectAdmin/AccountManagementTest.php b/tests/DirectAdmin/AccountManagementTest.php
@@ -15,7 +15,7 @@
  *
  * @author Niels Keurentjes <niels.keurentjes@omines.com>
  */
-class AccountManagementTest extends \PHPUnit_Framework_TestCase
+class AccountManagementTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * This function is explicitly implemented as setup, not teardown, so in case of failed tests you may investigate

diff --git a/tests/DirectAdmin/AdminTest.php b/tests/DirectAdmin/AdminTest.php
@@ -17,7 +17,7 @@
  *
  * @author Niels Keurentjes <niels.keurentjes@omines.com>
  */
-class AdminTest extends \PHPUnit_Framework_TestCase
+class AdminTest extends \PHPUnit\Framework\TestCase
 {
     /** @var AdminContext */
     private static $master;

diff --git a/tests/DirectAdmin/EnvironmentTest.php b/tests/DirectAdmin/EnvironmentTest.php
@@ -15,7 +15,7 @@
  *
  * @author Niels Keurentjes <niels.keurentjes@omines.com>
  */
-class EnvironmentTest extends \PHPUnit_Framework_TestCase
+class EnvironmentTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @expectedException \Omines\DirectAdmin\DirectAdminException

diff --git a/tests/DirectAdmin/ResellerTest.php b/tests/DirectAdmin/ResellerTest.php
@@ -18,7 +18,7 @@
  *
  * @author Niels Keurentjes <niels.keurentjes@omines.com>
  */
-class ResellerTest extends \PHPUnit_Framework_TestCase
+class ResellerTest extends \PHPUnit\Framework\TestCase
 {
     /** @var AdminContext */
     private static $master;

diff --git a/tests/DirectAdmin/UserTest.php b/tests/DirectAdmin/UserTest.php
@@ -19,7 +19,7 @@
  *
  * @author Niels Keurentjes <niels.keurentjes@omines.com>
  */
-class UserTest extends \PHPUnit_Framework_TestCase
+class UserTest extends \PHPUnit\Framework\TestCase
 {
     /** @var AdminContext */
     private static $master;

diff --git a/tests/phpunit-bootstrap.php b/tests/phpunit-bootstrap.php
@@ -11,6 +11,7 @@
 /**
  * @author Niels Keurentjes <niels.keurentjes@omines.com>>
  */
+
 define('PASSWORD_LENGTH', 16);
 
 function generateTemporaryPassword()
@@ -53,3 +54,10 @@ function generateTemporaryPassword()
 
 // Include composer autoload
 require __DIR__ . str_replace('/', DIRECTORY_SEPARATOR, '/../vendor/autoload.php');
+
+// Polyfill PHPUnit 6.0 both ways
+if (!class_exists('\PHPUnit\Framework\TestCase', true)) {
+    class_alias('\PHPUnit_Framework_TestCase', '\PHPUnit\Framework\TestCase');
+} elseif (!class_exists('\PHPUnit_Framework_TestCase', true)) {
+    class_alias('\PHPUnit\Framework\TestCase', '\PHPUnit_Framework_TestCase');
+}