New 3.0.x; removing HHVM support; minimum PHP 7.1

doublecompile · doublecompile · commit 88f9f40f7f7c · 2018-02-10T17:42:56.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
-/nbproject/private/
 /vendor/
 /build/
 /composer.lock
diff --git a/.hhconfig b/.hhconfig
diff --git a/.travis.yml b/.travis.yml
@@ -2,29 +2,17 @@ sudo: required
 dist: trusty
 language: php
 php:
-  - 7.0
   - 7.1
-  - hhvm
-  - hhvm-3.18
-  - hhvm-3.15
-  - hhvm-3.12
-matrix:
-    allow_failures:
-        - php: hhvm
-        - php: hhvm-3.18
-        - php: hhvm-3.15
-        - php: hhvm-3.12
+  - 7.2
 before_install:
   - composer self-update
 install:
   - composer update --ignore-platform-reqs --prefer-source
-before_script:
-  - if [[ $TRAVIS_PHP_VERSION = "hhvm" ]]; then sudo cat travis-php.ini >> /etc/hhvm/php.ini; fi
 script:
   - vendor/bin/phpunit --coverage-clover=coverage.clover
 after_script:
-  - sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then wget https://scrutinizer-ci.com/ocular.phar; fi;'
-  - sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi;'
+  - wget https://scrutinizer-ci.com/ocular.phar
+  - php ocular.phar code-coverage:upload --format=php-clover coverage.clover
 cache:
   directories:
     - $HOME/.composer/cache
diff --git a/README.md b/README.md
@@ -10,8 +10,6 @@ This is its module loader. You can use it to write extensible applications.
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/libreworks/caridea-module/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/libreworks/caridea-module/?branch=master)
 [![Code Coverage](https://scrutinizer-ci.com/g/libreworks/caridea-module/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/libreworks/caridea-module/?branch=master)
 
-We've also included `.hhi` files for the Hack typechecker.
-
 ## Installation
 
 You can install this library using Composer:
@@ -20,7 +18,8 @@ You can install this library using Composer:
 $ composer require caridea/module
 ```
 
-* The master branch (version 2.x) of this project requires PHP 7.0 and depends on `caridea/container`.
+* The master branch (version 3.x) of this project requires PHP 7.1 and depends on `caridea/container`.
+* Version 2.x of this project requires PHP 7.0 and depends on `caridea/container`.
 
 ## Compliance
 
diff --git a/composer.json b/composer.json
@@ -13,15 +13,15 @@
     ],
     "extra": {
         "branch-alias": {
-            "dev-master": "2.0.x-dev"
+            "dev-master": "3.0.x-dev"
         }
     },
     "require": {
-        "php": ">=7.0.0",
-        "caridea/container": "^2.2"
+        "php": ">=7.1.0",
+        "caridea/container": "^3.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.2.0"
+        "phpunit/phpunit": "^6.0.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/hhi/Configuration.hhi b/hhi/Configuration.hhi
diff --git a/hhi/Module.hhi b/hhi/Module.hhi
diff --git a/hhi/System.hhi b/hhi/System.hhi
diff --git a/src/Configuration.php b/src/Configuration.php
@@ -16,7 +16,7 @@
  * the License.
  *
  * @copyright 2015-2017 Appertly
- * @copyright 2017 LibreWorks contributors
+ * @copyright 2017-2018 LibreWorks contributors
  * @license   Apache-2.0
  */
 namespace Caridea\Module;
diff --git a/src/Module.php b/src/Module.php
@@ -16,7 +16,7 @@
  * the License.
  *
  * @copyright 2015-2017 Appertly
- * @copyright 2017 LibreWorks contributors
+ * @copyright 2017-2018 LibreWorks contributors
  * @license   Apache-2.0
  */
 namespace Caridea\Module;
diff --git a/src/System.php b/src/System.php
@@ -16,7 +16,7 @@
  * the License.
  *
  * @copyright 2015-2017 Appertly
- * @copyright 2017 LibreWorks contributors
+ * @copyright 2017-2018 LibreWorks contributors
  * @license   Apache-2.0
  */
 namespace Caridea\Module;
diff --git a/tests/ConfigurationTest.php b/tests/ConfigurationTest.php
@@ -15,12 +15,12 @@
  * the License.
  *
  * @copyright 2015-2017 Appertly
- * @copyright 2017 LibreWorks contributors
+ * @copyright 2017-2018 LibreWorks contributors
  * @license   Apache-2.0
  */
 namespace Caridea\Module;
 
-class ConfigurationTest extends \PHPUnit_Framework_TestCase
+class ConfigurationTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @covers \Caridea\Module\Configuration
diff --git a/tests/ModuleTest.php b/tests/ModuleTest.php
@@ -15,7 +15,7 @@
  * the License.
  *
  * @copyright 2015-2017 Appertly
- * @copyright 2017 LibreWorks contributors
+ * @copyright 2017-2018 LibreWorks contributors
  * @license   Apache-2.0
  */
 namespace Caridea\Module;
@@ -27,7 +27,7 @@
 /**
  * It really is just for code coverage
  */
-class ModuleTest extends \PHPUnit_Framework_TestCase
+class ModuleTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @covers \Caridea\Module\Module
diff --git a/tests/SystemTest.php b/tests/SystemTest.php
@@ -15,7 +15,7 @@
  * the License.
  *
  * @copyright 2015-2017 Appertly
- * @copyright 2017 LibreWorks contributors
+ * @copyright 2017-2018 LibreWorks contributors
  * @license   Apache-2.0
  */
 namespace Caridea\Module;
@@ -24,7 +24,7 @@
 use Caridea\Container\Objects;
 use Caridea\Container\Properties;
 
-class SystemTest extends \PHPUnit_Framework_TestCase
+class SystemTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @covers \Caridea\Module\System
diff --git a/travis-php.ini b/travis-php.ini

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`* the License.`
`17`	`17`	`*`
`18`	`18`	`* @copyright 2015-2017 Appertly`
`19`		`- * @copyright 2017 LibreWorks contributors`
	`19`	`+ * @copyright 2017-2018 LibreWorks contributors`
`20`	`20`	`* @license Apache-2.0`
`21`	`21`	`*/`
`22`	`22`	`namespace Caridea\Module;`