Bumped requirements

s9e · Dec 1, 2017 · d515ddc · d515ddc
1 parent fc1df18
commit d515ddc
Show file tree

Hide file tree

Showing 30 changed files with 49 additions and 54 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,14 +1,13 @@
 sudo: false
 language: php
 php:
+  - 7.0
   - 7.1
-  - 5.6
-  - 5.4
+  - nightly
 matrix:
   fast_finish: true
 before_script:
   - ./scripts/travis/setup.sh
-  - php -i
 script:
   - ./scripts/travis/run-tests.sh
 after_script:

diff --git a/bin/source-optimizer b/bin/source-optimizer
@@ -2,7 +2,7 @@
 <?php
 /**
 * @package   s9e\SourceOptimizer
-* @copyright Copyright (c) 2014-2015 The s9e Authors
+* @copyright Copyright (c) 2014-2017 The s9e Authors
 * @license   http://www.opensource.org/licenses/mit-license.php The MIT License
 */
 namespace s9e\SourceOptimizer;
@@ -41,7 +41,7 @@ class CommandLineRunner
 }
 /**
 * @package   s9e\SourceOptimizer
-* @copyright Copyright (c) 2014-2015 The s9e Authors
+* @copyright Copyright (c) 2014-2017 The s9e Authors
 * @license   http://www.opensource.org/licenses/mit-license.php The MIT License
 */
 namespace s9e\SourceOptimizer;
@@ -118,7 +118,7 @@ abstract class ContextHelper
 }
 /**
 * @package   s9e\SourceOptimizer
-* @copyright Copyright (c) 2014-2015 The s9e Authors
+* @copyright Copyright (c) 2014-2017 The s9e Authors
 * @license   http://www.opensource.org/licenses/mit-license.php The MIT License
 */
 namespace s9e\SourceOptimizer;
@@ -144,7 +144,7 @@ abstract class Helper
 }
 /**
 * @package   s9e\SourceOptimizer
-* @copyright Copyright (c) 2014-2015 The s9e Authors
+* @copyright Copyright (c) 2014-2017 The s9e Authors
 * @license   http://www.opensource.org/licenses/mit-license.php The MIT License
 */
 namespace s9e\SourceOptimizer;
@@ -204,7 +204,7 @@ class Optimizer
 }
 /**
 * @package   s9e\SourceOptimizer
-* @copyright Copyright (c) 2014-2015 The s9e Authors
+* @copyright Copyright (c) 2014-2017 The s9e Authors
 * @license   http://www.opensource.org/licenses/mit-license.php The MIT License
 */
 namespace s9e\SourceOptimizer;
@@ -214,7 +214,7 @@ abstract class Pass
 }
 /**
 * @package   s9e\SourceOptimizer
-* @copyright Copyright (c) 2014-2015 The s9e Authors
+* @copyright Copyright (c) 2014-2017 The s9e Authors
 * @license   http://www.opensource.org/licenses/mit-license.php The MIT License
 */
 namespace s9e\SourceOptimizer;
@@ -426,7 +426,7 @@ class TokenStream implements ArrayAccess,Iterator
 }
 /**
 * @package   s9e\SourceOptimizer
-* @copyright Copyright (c) 2014-2015 The s9e Authors
+* @copyright Copyright (c) 2014-2017 The s9e Authors
 * @license   http://www.opensource.org/licenses/mit-license.php The MIT License
 */
 namespace s9e\SourceOptimizer;
@@ -437,7 +437,7 @@ if(!\class_exists(__NAMESPACE__.'\\CommandLineRunner'))
 CommandLineRunner::run();
 /**
 * @package   s9e\SourceOptimizer
-* @copyright Copyright (c) 2014-2015 The s9e Authors
+* @copyright Copyright (c) 2014-2017 The s9e Authors
 * @license   http://www.opensource.org/licenses/mit-license.php The MIT License
 */
 namespace s9e\SourceOptimizer\Passes;
@@ -471,7 +471,7 @@ class ConcatenateConstantStrings extends Pass
 }
 /**
 * @package   s9e\SourceOptimizer
-* @copyright Copyright (c) 2014-2015 The s9e Authors
+* @copyright Copyright (c) 2014-2017 The s9e Authors
 * @license   http://www.opensource.org/licenses/mit-license.php The MIT License
 */
 namespace s9e\SourceOptimizer\Passes;
@@ -561,7 +561,7 @@ class EnforceFQN extends Pass
 }
 /**
 * @package   s9e\SourceOptimizer
-* @copyright Copyright (c) 2014-2015 The s9e Authors
+* @copyright Copyright (c) 2014-2017 The s9e Authors
 * @license   http://www.opensource.org/licenses/mit-license.php The MIT License
 */
 namespace s9e\SourceOptimizer\Passes;
@@ -647,7 +647,7 @@ class MinifyVars extends Pass
 }
 /**
 * @package   s9e\SourceOptimizer
-* @copyright Copyright (c) 2014-2015 The s9e Authors
+* @copyright Copyright (c) 2014-2017 The s9e Authors
 * @license   http://www.opensource.org/licenses/mit-license.php The MIT License
 */
 namespace s9e\SourceOptimizer\Passes;
@@ -853,7 +853,7 @@ class RemoveBraces extends Pass
 }
 /**
 * @package   s9e\SourceOptimizer
-* @copyright Copyright (c) 2014-2015 The s9e Authors
+* @copyright Copyright (c) 2014-2017 The s9e Authors
 * @license   http://www.opensource.org/licenses/mit-license.php The MIT License
 */
 namespace s9e\SourceOptimizer\Passes;
@@ -930,7 +930,7 @@ class RemoveComments extends Pass
 }
 /**
 * @package   s9e\SourceOptimizer
-* @copyright Copyright (c) 2014-2015 The s9e Authors
+* @copyright Copyright (c) 2014-2017 The s9e Authors
 * @license   http://www.opensource.org/licenses/mit-license.php The MIT License
 */
 namespace s9e\SourceOptimizer\Passes;

diff --git a/composer.json b/composer.json
@@ -1,13 +1,16 @@
 {
 	"name": "s9e/source-optimizer",
-	"version": "0.2",
+	"version": "0.3",
 	"type": "library",
 	"description": "",
 	"homepage": "https://github.com/s9e/SourceOptimizer/",
 	"keywords": ["source","optimizer"],
 	"license": "MIT",
 	"require": {
-		"php": ">=5.4"
+		"php": ">=7.0"
+	},
+	"require-dev": {
+		"phpunit/phpunit": "^6.0"
 	},
 	"autoload": {
 		"psr-4": {

diff --git a/scripts/travis/installComposer.sh b/scripts/travis/installComposer.sh
@@ -3,7 +3,7 @@
 cd $(dirname "$0")
 cd ../..
 
-if [ "$TRAVIS_PHP_VERSION" = "5.6" ]
+if [ "$TRAVIS_PHP_VERSION" = "7.1" ]
 then
 	composer require -q --no-interaction "satooshi/php-coveralls:*"
 fi

diff --git a/scripts/travis/run-tests.sh b/scripts/travis/run-tests.sh
@@ -3,9 +3,9 @@
 cd $(dirname "$0")
 cd ../..
 
-if [ "$TRAVIS_PHP_VERSION" = "5.6" ]
+if [ "$TRAVIS_PHP_VERSION" = "7.1" ]
 then
-	phpunit --coverage-clover /tmp/clover.xml
+	./vendor/bin/phpunit --coverage-clover /tmp/clover.xml
 else
-	phpunit
+	./vendor/bin/phpunit
 fi
diff --git a/scripts/travis/setup.sh b/scripts/travis/setup.sh
@@ -5,12 +5,11 @@ cd $(dirname "$0")
 echo "Installing Composer"
 ./installComposer.sh
 
-if [ "$TRAVIS_PHP_VERSION" = "5.6" ]
+if [ "$TRAVIS_PHP_VERSION" = "7.1" ]
 then
 	echo "Installing Scrutinizer"
 	./installScrutinizer.sh
-elif [ "$TRAVIS_PHP_VERSION" != "hhvm" ] && [ "$TRAVIS_PHP_VERSION" != "nightly" ]
-then
+else
 	echo "Removing XDebug"
 	phpenv config-rm xdebug.ini
 fi
diff --git a/src/CommandLineRunner.php b/src/CommandLineRunner.php
@@ -2,7 +2,7 @@
 
 /**
 * @package   s9e\SourceOptimizer
-* @copyright Copyright (c) 2014-2015 The s9e Authors
+* @copyright Copyright (c) 2014-2017 The s9e Authors
 * @license   http://www.opensource.org/licenses/mit-license.php The MIT License
 */
 namespace s9e\SourceOptimizer;

diff --git a/src/ContextHelper.php b/src/ContextHelper.php
@@ -2,7 +2,7 @@
 
 /**
 * @package   s9e\SourceOptimizer
-* @copyright Copyright (c) 2014-2015 The s9e Authors
+* @copyright Copyright (c) 2014-2017 The s9e Authors
 * @license   http://www.opensource.org/licenses/mit-license.php The MIT License
 */
 namespace s9e\SourceOptimizer;

diff --git a/src/Helper.php b/src/Helper.php
@@ -2,7 +2,7 @@
 
 /**
 * @package   s9e\SourceOptimizer
-* @copyright Copyright (c) 2014-2015 The s9e Authors
+* @copyright Copyright (c) 2014-2017 The s9e Authors
 * @license   http://www.opensource.org/licenses/mit-license.php The MIT License
 */
 namespace s9e\SourceOptimizer;

diff --git a/src/Optimizer.php b/src/Optimizer.php
@@ -2,7 +2,7 @@
 
 /**
 * @package   s9e\SourceOptimizer
-* @copyright Copyright (c) 2014-2015 The s9e Authors
+* @copyright Copyright (c) 2014-2017 The s9e Authors
 * @license   http://www.opensource.org/licenses/mit-license.php The MIT License
 */
 namespace s9e\SourceOptimizer;

diff --git a/src/Pass.php b/src/Pass.php
@@ -2,7 +2,7 @@
 
 /**
 * @package   s9e\SourceOptimizer
-* @copyright Copyright (c) 2014-2015 The s9e Authors
+* @copyright Copyright (c) 2014-2017 The s9e Authors
 * @license   http://www.opensource.org/licenses/mit-license.php The MIT License
 */
 namespace s9e\SourceOptimizer;

diff --git a/src/Passes/ConcatenateConstantStrings.php b/src/Passes/ConcatenateConstantStrings.php
@@ -2,7 +2,7 @@
 
 /**
 * @package   s9e\SourceOptimizer
-* @copyright Copyright (c) 2014-2015 The s9e Authors
+* @copyright Copyright (c) 2014-2017 The s9e Authors
 * @license   http://www.opensource.org/licenses/mit-license.php The MIT License
 */
 namespace s9e\SourceOptimizer\Passes;

diff --git a/src/Passes/EnforceFQN.php b/src/Passes/EnforceFQN.php
@@ -2,7 +2,7 @@
 
 /**
 * @package   s9e\SourceOptimizer
-* @copyright Copyright (c) 2014-2015 The s9e Authors
+* @copyright Copyright (c) 2014-2017 The s9e Authors
 * @license   http://www.opensource.org/licenses/mit-license.php The MIT License
 */
 namespace s9e\SourceOptimizer\Passes;

diff --git a/src/Passes/MinifyVars.php b/src/Passes/MinifyVars.php
@@ -2,7 +2,7 @@
 
 /**
 * @package   s9e\SourceOptimizer
-* @copyright Copyright (c) 2014-2015 The s9e Authors
+* @copyright Copyright (c) 2014-2017 The s9e Authors
 * @license   http://www.opensource.org/licenses/mit-license.php The MIT License
 */
 namespace s9e\SourceOptimizer\Passes;

diff --git a/src/Passes/RemoveBraces.php b/src/Passes/RemoveBraces.php
@@ -2,7 +2,7 @@
 
 /**
 * @package   s9e\SourceOptimizer
-* @copyright Copyright (c) 2014-2015 The s9e Authors
+* @copyright Copyright (c) 2014-2017 The s9e Authors
 * @license   http://www.opensource.org/licenses/mit-license.php The MIT License
 */
 namespace s9e\SourceOptimizer\Passes;

diff --git a/src/Passes/RemoveComments.php b/src/Passes/RemoveComments.php
@@ -2,7 +2,7 @@
 
 /**
 * @package   s9e\SourceOptimizer
-* @copyright Copyright (c) 2014-2015 The s9e Authors
+* @copyright Copyright (c) 2014-2017 The s9e Authors
 * @license   http://www.opensource.org/licenses/mit-license.php The MIT License
 */
 namespace s9e\SourceOptimizer\Passes;

diff --git a/src/Passes/RemoveWhitespace.php b/src/Passes/RemoveWhitespace.php
@@ -2,7 +2,7 @@
 
 /**
 * @package   s9e\SourceOptimizer
-* @copyright Copyright (c) 2014-2015 The s9e Authors
+* @copyright Copyright (c) 2014-2017 The s9e Authors
 * @license   http://www.opensource.org/licenses/mit-license.php The MIT License
 */
 namespace s9e\SourceOptimizer\Passes;

diff --git a/src/TokenStream.php b/src/TokenStream.php
@@ -2,7 +2,7 @@
 
 /**
 * @package   s9e\SourceOptimizer
-* @copyright Copyright (c) 2014-2015 The s9e Authors
+* @copyright Copyright (c) 2014-2017 The s9e Authors
 * @license   http://www.opensource.org/licenses/mit-license.php The MIT License
 */
 namespace s9e\SourceOptimizer;

diff --git a/src/cli.php b/src/cli.php
@@ -2,7 +2,7 @@
 
 /**
 * @package   s9e\SourceOptimizer
-* @copyright Copyright (c) 2014-2015 The s9e Authors
+* @copyright Copyright (c) 2014-2017 The s9e Authors
 * @license   http://www.opensource.org/licenses/mit-license.php The MIT License
 */
 namespace s9e\SourceOptimizer;

diff --git a/tests/ContextHelperTest.php b/tests/ContextHelperTest.php
@@ -2,11 +2,11 @@
 
 namespace s9e\SourceOptimizer\Tests;
 
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use s9e\SourceOptimizer\ContextHelper;
 use s9e\SourceOptimizer\TokenStream;
 
-class ContextHelperTest extends PHPUnit_Framework_TestCase
+class ContextHelperTest extends TestCase
 {
 	/**
 	* @dataProvider getGetFunctionBlocksTests

diff --git a/tests/HelperTest.php b/tests/HelperTest.php
@@ -2,10 +2,10 @@
 
 namespace s9e\SourceOptimizer\Tests;
 
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use s9e\SourceOptimizer\Helper;
 use s9e\SourceOptimizer\TokenStream;
 
-class HelperTest extends PHPUnit_Framework_TestCase
+class HelperTest extends TestCase
 {
 }
diff --git a/tests/OptimizerTest.php b/tests/OptimizerTest.php
@@ -2,13 +2,13 @@
 
 namespace s9e\SourceOptimizer\Tests;
 
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use s9e\SourceOptimizer\Optimizer;
 
 /**
 * @covers s9e\SourceOptimizer\Optimizer
 */
-class OptimizerTest extends PHPUnit_Framework_TestCase
+class OptimizerTest extends TestCase
 {
 	/**
 	* @dataProvider getOptimizeTests

diff --git a/tests/PassTest.php b/tests/PassTest.php
@@ -2,10 +2,10 @@
 
 namespace s9e\SourceOptimizer\Tests;
 
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use s9e\SourceOptimizer\Optimizer;
 
-abstract class PassTest extends PHPUnit_Framework_TestCase
+abstract class PassTest extends TestCase
 {
 	/**
 	* @dataProvider getOptimizeTests

diff --git a/tests/Passes/ConcatenateConstantStringsTest.php b/tests/Passes/ConcatenateConstantStringsTest.php
@@ -2,7 +2,6 @@
 
 namespace s9e\SourceOptimizer\Tests\Passes;
 
-use PHPUnit_Framework_TestCase;
 use s9e\SourceOptimizer\Tests\PassTest;
 
 /**

diff --git a/tests/Passes/EnforceFQNTest.php b/tests/Passes/EnforceFQNTest.php
@@ -2,7 +2,6 @@
 
 namespace s9e\SourceOptimizer\Tests\Passes;
 
-use PHPUnit_Framework_TestCase;
 use s9e\SourceOptimizer\Tests\PassTest;
 
 /**

diff --git a/tests/Passes/MinifyVarsTest.php b/tests/Passes/MinifyVarsTest.php
@@ -2,7 +2,6 @@
 
 namespace s9e\SourceOptimizer\Tests\Passes;
 
-use PHPUnit_Framework_TestCase;
 use s9e\SourceOptimizer\Tests\PassTest;
 
 /**

diff --git a/tests/Passes/RemoveBracesTest.php b/tests/Passes/RemoveBracesTest.php
@@ -2,7 +2,6 @@
 
 namespace s9e\SourceOptimizer\Tests\Passes;
 
-use PHPUnit_Framework_TestCase;
 use s9e\SourceOptimizer\Tests\PassTest;
 
 /**