From 85ec654dc254b817efca708bbfb3a578ea35eaa4 Mon Sep 17 00:00:00 2001 From: KoKsPfLaNzE Date: Tue, 28 Mar 2017 21:31:00 +0200 Subject: [PATCH 01/16] PHPUnit_Framework_TestCase to PHPUnit\Framework\TestCase --- test/ArrayObjectTest.php | 2 +- test/ArrayUtilsTest.php | 2 +- test/ConsoleHelperTest.php | 2 +- test/ErrorHandlerTest.php | 2 +- test/FastPriorityQueueTest.php | 3 ++- test/GlobTest.php | 2 +- test/Guard/ArrayOrTraversableGuardTraitTest.php | 2 +- test/Guard/EmptyGuardTraitTest.php | 2 +- test/Guard/NullGuardTraitTest.php | 2 +- test/MessageTest.php | 3 ++- test/OptionsTest.php | 3 ++- test/ParametersTest.php | 3 ++- test/PriorityListTest.php | 2 +- test/PriorityQueueTest.php | 3 ++- test/SplPriorityQueueTest.php | 3 ++- test/SplQueueTest.php | 3 ++- test/SplStackTest.php | 3 ++- test/StringUtilsTest.php | 2 +- test/StringWrapper/CommonStringWrapperTest.php | 2 +- 19 files changed, 27 insertions(+), 19 deletions(-) diff --git a/test/ArrayObjectTest.php b/test/ArrayObjectTest.php index b09cab7e9..a9bc14e20 100644 --- a/test/ArrayObjectTest.php +++ b/test/ArrayObjectTest.php @@ -9,7 +9,7 @@ namespace ZendTest\Stdlib; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; use Zend\Stdlib\ArrayObject; class ArrayObjectTest extends TestCase diff --git a/test/ArrayUtilsTest.php b/test/ArrayUtilsTest.php index 8db7a8ba3..41b56b098 100644 --- a/test/ArrayUtilsTest.php +++ b/test/ArrayUtilsTest.php @@ -10,7 +10,7 @@ namespace ZendTest\Stdlib; use ArrayObject; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; use stdClass; use Zend\Stdlib\ArrayUtils; use Zend\Stdlib\ArrayUtils\MergeRemoveKey; diff --git a/test/ConsoleHelperTest.php b/test/ConsoleHelperTest.php index ee72f0c1b..276276ef6 100644 --- a/test/ConsoleHelperTest.php +++ b/test/ConsoleHelperTest.php @@ -7,7 +7,7 @@ namespace ZendTest\Stdlib; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; use ReflectionProperty; use Zend\Stdlib\ConsoleHelper; diff --git a/test/ErrorHandlerTest.php b/test/ErrorHandlerTest.php index 077cbd08e..478c044db 100644 --- a/test/ErrorHandlerTest.php +++ b/test/ErrorHandlerTest.php @@ -9,7 +9,7 @@ namespace ZendTest\Stdlib; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; use Zend\Stdlib\ErrorHandler; class ErrorHandlerTest extends TestCase diff --git a/test/FastPriorityQueueTest.php b/test/FastPriorityQueueTest.php index cd149063a..5de19eac9 100644 --- a/test/FastPriorityQueueTest.php +++ b/test/FastPriorityQueueTest.php @@ -9,13 +9,14 @@ namespace ZendTest\Stdlib; +use PHPUnit\Framework\TestCase; use Zend\Stdlib\Exception\InvalidArgumentException; use Zend\Stdlib\FastPriorityQueue; /** * @group Zend_Stdlib */ -class FastPriorityQueueTest extends \PHPUnit_Framework_TestCase +class FastPriorityQueueTest extends TestCase { /** * @var FastPriorityQueue diff --git a/test/GlobTest.php b/test/GlobTest.php index ce25647df..d08f2c3a3 100644 --- a/test/GlobTest.php +++ b/test/GlobTest.php @@ -9,7 +9,7 @@ namespace ZendTest\Stdlib; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; use Zend\Stdlib\Glob; class GlobTest extends TestCase diff --git a/test/Guard/ArrayOrTraversableGuardTraitTest.php b/test/Guard/ArrayOrTraversableGuardTraitTest.php index 313d2f36c..0e426f6fb 100644 --- a/test/Guard/ArrayOrTraversableGuardTraitTest.php +++ b/test/Guard/ArrayOrTraversableGuardTraitTest.php @@ -9,7 +9,7 @@ namespace ZendTest\Stdlib\Guard; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; use ZendTest\Stdlib\TestAsset\GuardedObject; use Zend\Stdlib\ArrayObject; diff --git a/test/Guard/EmptyGuardTraitTest.php b/test/Guard/EmptyGuardTraitTest.php index 01a844065..e2fad93ca 100644 --- a/test/Guard/EmptyGuardTraitTest.php +++ b/test/Guard/EmptyGuardTraitTest.php @@ -9,7 +9,7 @@ namespace ZendTest\Stdlib\Guard; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; use ZendTest\Stdlib\TestAsset\GuardedObject; /** diff --git a/test/Guard/NullGuardTraitTest.php b/test/Guard/NullGuardTraitTest.php index 7c48ad3dd..4a5bba7da 100644 --- a/test/Guard/NullGuardTraitTest.php +++ b/test/Guard/NullGuardTraitTest.php @@ -9,7 +9,7 @@ namespace ZendTest\Stdlib\Guard; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; use ZendTest\Stdlib\TestAsset\GuardedObject; /** diff --git a/test/MessageTest.php b/test/MessageTest.php index 2ed2321b9..25f9bd704 100644 --- a/test/MessageTest.php +++ b/test/MessageTest.php @@ -9,9 +9,10 @@ namespace ZendTest\Stdlib; +use PHPUnit\Framework\TestCase; use Zend\Stdlib\Message; -class MessageTest extends \PHPUnit_Framework_TestCase +class MessageTest extends TestCase { public function testMessageCanSetAndGetContent() { diff --git a/test/OptionsTest.php b/test/OptionsTest.php index c1fb77fef..53a581299 100644 --- a/test/OptionsTest.php +++ b/test/OptionsTest.php @@ -10,13 +10,14 @@ namespace ZendTest\Stdlib; use ArrayObject; +use PHPUnit\Framework\TestCase; use Zend\Stdlib\Exception; use ZendTest\Stdlib\TestAsset\TestOptions; use ZendTest\Stdlib\TestAsset\TestOptionsDerived; use ZendTest\Stdlib\TestAsset\TestOptionsNoStrict; use ZendTest\Stdlib\TestAsset\TestOptionsWithoutGetter; -class OptionsTest extends \PHPUnit_Framework_TestCase +class OptionsTest extends TestCase { public function testConstructionWithArray() { diff --git a/test/ParametersTest.php b/test/ParametersTest.php index bb5ff0973..40b1d69ed 100644 --- a/test/ParametersTest.php +++ b/test/ParametersTest.php @@ -9,9 +9,10 @@ namespace ZendTest\Stdlib; +use PHPUnit\Framework\TestCase; use Zend\Stdlib\Parameters; -class ParametersTest extends \PHPUnit_Framework_TestCase +class ParametersTest extends TestCase { public function testParametersConstructionAndClassStructure() { diff --git a/test/PriorityListTest.php b/test/PriorityListTest.php index 5010a7c18..b9bfcf0a0 100644 --- a/test/PriorityListTest.php +++ b/test/PriorityListTest.php @@ -10,7 +10,7 @@ namespace ZendTest\Stdlib; use Zend\Stdlib\PriorityList; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; class PriorityListTest extends TestCase { diff --git a/test/PriorityQueueTest.php b/test/PriorityQueueTest.php index 889a9327d..4a49eb75d 100644 --- a/test/PriorityQueueTest.php +++ b/test/PriorityQueueTest.php @@ -9,12 +9,13 @@ namespace ZendTest\Stdlib; +use PHPUnit\Framework\TestCase; use Zend\Stdlib\PriorityQueue; /** * @group Zend_Stdlib */ -class PriorityQueueTest extends \PHPUnit_Framework_TestCase +class PriorityQueueTest extends TestCase { /** * @var PriorityQueue diff --git a/test/SplPriorityQueueTest.php b/test/SplPriorityQueueTest.php index eaf135689..301e54799 100644 --- a/test/SplPriorityQueueTest.php +++ b/test/SplPriorityQueueTest.php @@ -9,12 +9,13 @@ namespace ZendTest\Stdlib; +use PHPUnit\Framework\TestCase; use Zend\Stdlib\SplPriorityQueue; /** * @group Zend_Stdlib */ -class SplPriorityQueueTest extends \PHPUnit_Framework_TestCase +class SplPriorityQueueTest extends TestCase { /** * @var SplPriorityQueue diff --git a/test/SplQueueTest.php b/test/SplQueueTest.php index 0520e19cb..b1022b39d 100644 --- a/test/SplQueueTest.php +++ b/test/SplQueueTest.php @@ -9,12 +9,13 @@ namespace ZendTest\Stdlib; +use PHPUnit\Framework\TestCase; use Zend\Stdlib\SplQueue; /** * @group Zend_Stdlib */ -class SplQueueTest extends \PHPUnit_Framework_TestCase +class SplQueueTest extends TestCase { /** * @var SplQueue diff --git a/test/SplStackTest.php b/test/SplStackTest.php index 2e1979ac4..c99730969 100644 --- a/test/SplStackTest.php +++ b/test/SplStackTest.php @@ -9,12 +9,13 @@ namespace ZendTest\Stdlib; +use PHPUnit\Framework\TestCase; use Zend\Stdlib\SplStack; /** * @group Zend_Stdlib */ -class SplStackTest extends \PHPUnit_Framework_TestCase +class SplStackTest extends TestCase { /** * @var SplStack diff --git a/test/StringUtilsTest.php b/test/StringUtilsTest.php index c0fb59392..c24d90a95 100644 --- a/test/StringUtilsTest.php +++ b/test/StringUtilsTest.php @@ -10,7 +10,7 @@ namespace ZendTest\Stdlib; use Exception; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; use Zend\Stdlib\ErrorHandler; use Zend\Stdlib\StringUtils; diff --git a/test/StringWrapper/CommonStringWrapperTest.php b/test/StringWrapper/CommonStringWrapperTest.php index 9c4cb870e..2b4988acb 100644 --- a/test/StringWrapper/CommonStringWrapperTest.php +++ b/test/StringWrapper/CommonStringWrapperTest.php @@ -9,7 +9,7 @@ namespace ZendTest\Stdlib\StringWrapper; -use PHPUnit_Framework_TestCase as TestCase; +use PHPUnit\Framework\TestCase; use Zend\Stdlib\StringWrapper\StringWrapperInterface; abstract class CommonStringWrapperTest extends TestCase From 28b52c9c2baa51f39b518a371e0657753a85b9a1 Mon Sep 17 00:00:00 2001 From: KoKsPfLaNzE Date: Tue, 28 Mar 2017 21:38:46 +0200 Subject: [PATCH 02/16] changed setExpectedException method to expectException, expectExceptionMessage --- test/ArrayObjectTest.php | 15 +++++++------ test/ArrayUtilsTest.php | 5 +++-- test/ErrorHandlerTest.php | 3 ++- test/FastPriorityQueueTest.php | 3 ++- test/GlobTest.php | 3 ++- .../ArrayOrTraversableGuardTraitTest.php | 7 +++--- test/Guard/EmptyGuardTraitTest.php | 7 +++--- test/Guard/NullGuardTraitTest.php | 8 +++---- test/MessageTest.php | 5 +++-- test/OptionsTest.php | 22 ++++++++++--------- .../StringWrapper/CommonStringWrapperTest.php | 6 ++--- 11 files changed, 45 insertions(+), 39 deletions(-) diff --git a/test/ArrayObjectTest.php b/test/ArrayObjectTest.php index a9bc14e20..e4f8c0b64 100644 --- a/test/ArrayObjectTest.php +++ b/test/ArrayObjectTest.php @@ -9,6 +9,7 @@ namespace ZendTest\Stdlib; +use InvalidArgumentException; use PHPUnit\Framework\TestCase; use Zend\Stdlib\ArrayObject; @@ -51,7 +52,7 @@ public function testStdPropList() public function testStdPropListCannotAccessObjectVars() { - $this->setExpectedException('InvalidArgumentException'); + $this->expectException(InvalidArgumentException::class); $ar = new ArrayObject(); $ar->flag; } @@ -156,7 +157,7 @@ public function testExchangeArrayArrayIterator() public function testExchangeArrayStringArgumentFail() { - $this->setExpectedException('InvalidArgumentException'); + $this->expectException(InvalidArgumentException::class); $ar = new ArrayObject(['foo' => 'bar']); $old = $ar->exchangeArray('Bacon'); } @@ -202,7 +203,7 @@ public function testIteratorClass() public function testInvalidIteratorClassThrowsInvalidArgumentException() { - $this->setExpectedException('InvalidArgumentException'); + $this->expectException(InvalidArgumentException::class); $ar = new ArrayObject([], ArrayObject::STD_PROP_LIST, 'InvalidArrayIterator'); } @@ -247,7 +248,7 @@ public function testOffsetExists() public function testOffsetExistsThrowsExceptionOnProtectedProperty() { - $this->setExpectedException('InvalidArgumentException'); + $this->expectException(InvalidArgumentException::class); $ar = new ArrayObject(); isset($ar->protectedProperties); } @@ -266,14 +267,14 @@ public function testOffsetGetOffsetSet() public function testOffsetGetThrowsExceptionOnProtectedProperty() { - $this->setExpectedException('InvalidArgumentException'); + $this->expectException(InvalidArgumentException::class); $ar = new ArrayObject(); $ar->protectedProperties; } public function testOffsetSetThrowsExceptionOnProtectedProperty() { - $this->setExpectedException('InvalidArgumentException'); + $this->expectException(InvalidArgumentException::class); $ar = new ArrayObject(); $ar->protectedProperties = null; } @@ -299,7 +300,7 @@ public function testOffsetUnsetMultidimensional() public function testOffsetUnsetThrowsExceptionOnProtectedProperty() { - $this->setExpectedException('InvalidArgumentException'); + $this->expectException(InvalidArgumentException::class); $ar = new ArrayObject(); unset($ar->protectedProperties); } diff --git a/test/ArrayUtilsTest.php b/test/ArrayUtilsTest.php index 41b56b098..801ef0c9b 100644 --- a/test/ArrayUtilsTest.php +++ b/test/ArrayUtilsTest.php @@ -14,6 +14,7 @@ use stdClass; use Zend\Stdlib\ArrayUtils; use Zend\Stdlib\ArrayUtils\MergeRemoveKey; +use Zend\Stdlib\Exception\InvalidArgumentException; use Zend\Stdlib\Parameters; class ArrayUtilsTest extends TestCase @@ -456,7 +457,7 @@ public function testValidIteratorsReturnArrayRepresentation($test, $expected) */ public function testInvalidIteratorsRaiseInvalidArgumentException($test) { - $this->setExpectedException('Zend\Stdlib\Exception\InvalidArgumentException'); + $this->expectException(InvalidArgumentException::class); $this->assertFalse(ArrayUtils::iteratorToArray($test)); } @@ -513,7 +514,7 @@ public function testFiltersArray($data, $callback, $flag, $result) } /** - * @expectedException \Zend\Stdlib\Exception\InvalidArgumentException + * @expectedException InvalidArgumentException */ public function testInvalidCallableRaiseInvalidArgumentException() { diff --git a/test/ErrorHandlerTest.php b/test/ErrorHandlerTest.php index 478c044db..2a00c64bb 100644 --- a/test/ErrorHandlerTest.php +++ b/test/ErrorHandlerTest.php @@ -9,6 +9,7 @@ namespace ZendTest\Stdlib; +use ErrorException; use PHPUnit\Framework\TestCase; use Zend\Stdlib\ErrorHandler; @@ -75,7 +76,7 @@ public function testThrowCatchedError() ErrorHandler::start(); strpos(); // Invalid argument list - $this->setExpectedException('ErrorException'); + $this->expectException(ErrorException::class); ErrorHandler::stop(true); } diff --git a/test/FastPriorityQueueTest.php b/test/FastPriorityQueueTest.php index 5de19eac9..940b8ad34 100644 --- a/test/FastPriorityQueueTest.php +++ b/test/FastPriorityQueueTest.php @@ -166,7 +166,8 @@ public function testSetExtractFlag() public function testSetInvalidExtractFlag() { - $this->setExpectedException(InvalidArgumentException::class, 'The extract flag specified is not valid'); + $this->expectException(InvalidArgumentException::class); + $this->expectExceptionMessage('The extract flag specified is not valid'); $this->queue->setExtractFlags('foo'); } diff --git a/test/GlobTest.php b/test/GlobTest.php index d08f2c3a3..336b59ac8 100644 --- a/test/GlobTest.php +++ b/test/GlobTest.php @@ -10,6 +10,7 @@ namespace ZendTest\Stdlib; use PHPUnit\Framework\TestCase; +use Zend\Stdlib\Exception\RuntimeException; use Zend\Stdlib\Glob; class GlobTest extends TestCase @@ -34,7 +35,7 @@ public function testNonMatchingGlobReturnsArray() public function testThrowExceptionOnError() { - $this->setExpectedException('Zend\Stdlib\Exception\RuntimeException'); + $this->expectException(RuntimeException::class); // run into a max path lengh error $path = '/' . str_repeat('a', 10000); diff --git a/test/Guard/ArrayOrTraversableGuardTraitTest.php b/test/Guard/ArrayOrTraversableGuardTraitTest.php index 0e426f6fb..13aa330e3 100644 --- a/test/Guard/ArrayOrTraversableGuardTraitTest.php +++ b/test/Guard/ArrayOrTraversableGuardTraitTest.php @@ -10,6 +10,7 @@ namespace ZendTest\Stdlib\Guard; use PHPUnit\Framework\TestCase; +use Zend\Stdlib\Exception\InvalidArgumentException; use ZendTest\Stdlib\TestAsset\GuardedObject; use Zend\Stdlib\ArrayObject; @@ -29,10 +30,8 @@ public function setUp() public function testGuardForArrayOrTraversableThrowsException() { $object = new GuardedObject; - $this->setExpectedException( - 'Zend\Stdlib\Exception\InvalidArgumentException', - 'Argument must be an array or Traversable, [string] given' - ); + $this->expectException(InvalidArgumentException::class); + $this->expectExceptionMessage('Argument must be an array or Traversable, [string] given'); $object->setArrayOrTraversable(''); } diff --git a/test/Guard/EmptyGuardTraitTest.php b/test/Guard/EmptyGuardTraitTest.php index e2fad93ca..f822a44ba 100644 --- a/test/Guard/EmptyGuardTraitTest.php +++ b/test/Guard/EmptyGuardTraitTest.php @@ -10,6 +10,7 @@ namespace ZendTest\Stdlib\Guard; use PHPUnit\Framework\TestCase; +use Zend\Stdlib\Exception\InvalidArgumentException; use ZendTest\Stdlib\TestAsset\GuardedObject; /** @@ -28,10 +29,8 @@ public function setUp() public function testGuardAgainstEmptyThrowsException() { $object = new GuardedObject; - $this->setExpectedException( - 'Zend\Stdlib\Exception\InvalidArgumentException', - 'Argument cannot be empty' - ); + $this->expectException(InvalidArgumentException::class); + $this->expectExceptionMessage('Argument cannot be empty'); $object->setNotEmpty(''); } diff --git a/test/Guard/NullGuardTraitTest.php b/test/Guard/NullGuardTraitTest.php index 4a5bba7da..242b3ca1d 100644 --- a/test/Guard/NullGuardTraitTest.php +++ b/test/Guard/NullGuardTraitTest.php @@ -10,6 +10,7 @@ namespace ZendTest\Stdlib\Guard; use PHPUnit\Framework\TestCase; +use Zend\Stdlib\Exception\InvalidArgumentException; use ZendTest\Stdlib\TestAsset\GuardedObject; /** @@ -28,10 +29,9 @@ public function setUp() public function testGuardAgainstNullThrowsException() { $object = new GuardedObject; - $this->setExpectedException( - 'Zend\Stdlib\Exception\InvalidArgumentException', - 'Argument cannot be null' - ); + $this->expectException(InvalidArgumentException::class); + $this->expectExceptionMessage('Argument cannot be null'); + $object->setNotNull(null); } diff --git a/test/MessageTest.php b/test/MessageTest.php index 25f9bd704..9148d1546 100644 --- a/test/MessageTest.php +++ b/test/MessageTest.php @@ -10,6 +10,7 @@ namespace ZendTest\Stdlib; use PHPUnit\Framework\TestCase; +use Zend\Stdlib\Exception\InvalidArgumentException; use Zend\Stdlib\Message; class MessageTest extends TestCase @@ -49,7 +50,7 @@ public function testMessageThrowsExceptionOnInvalidKeyForMetadataSet() { $message = new Message(); - $this->setExpectedException('Zend\Stdlib\Exception\InvalidArgumentException'); + $this->expectException(InvalidArgumentException::class); $message->setMetadata(new \stdClass()); } @@ -57,7 +58,7 @@ public function testMessageThrowsExceptionOnInvalidKeyForMetadataGet() { $message = new Message(); - $this->setExpectedException('Zend\Stdlib\Exception\InvalidArgumentException'); + $this->expectException(InvalidArgumentException::class); $message->getMetadata(new \stdClass()); } diff --git a/test/OptionsTest.php b/test/OptionsTest.php index 53a581299..dd4ca570e 100644 --- a/test/OptionsTest.php +++ b/test/OptionsTest.php @@ -10,6 +10,8 @@ namespace ZendTest\Stdlib; use ArrayObject; +use BadMethodCallException; +use InvalidArgumentException; use PHPUnit\Framework\TestCase; use Zend\Stdlib\Exception; use ZendTest\Stdlib\TestAsset\TestOptions; @@ -43,7 +45,7 @@ public function testConstructionWithOptions() public function testInvalidFieldThrowsException() { - $this->setExpectedException('BadMethodCallException'); + $this->expectException(BadMethodCallException::class); new TestOptions(['foo' => 'bar']); } @@ -74,7 +76,7 @@ public function testUnsetThrowsInvalidArgumentException() { $options = new TestOptions; - $this->setExpectedException('InvalidArgumentException'); + $this->expectException(InvalidArgumentException::class); unset($options->foobarField); } @@ -83,7 +85,7 @@ public function testGetThrowsBadMethodCallException() { $options = new TestOptions(); - $this->setExpectedException('BadMethodCallException'); + $this->expectException(BadMethodCallException::class); $options->fieldFoobar; } @@ -99,7 +101,7 @@ public function testSetFromArrayAcceptsArray() public function testSetFromArrayThrowsInvalidArgumentException() { - $this->setExpectedException('InvalidArgumentException'); + $this->expectException(InvalidArgumentException::class); $options = new TestOptions; $options->setFromArray('asd'); } @@ -120,8 +122,8 @@ public function testParentProtectedProperty() public function testParentPrivateProperty() { - $this->setExpectedException( - 'Zend\Stdlib\Exception\BadMethodCallException', + $this->expectException(Exception\BadMethodCallException::class); + $this->expectExceptionMessage( 'The option "parent_private" does not have a callable "setParentPrivate" ("setparentprivate")' . ' setter method which must be defined' ); @@ -145,8 +147,8 @@ public function testDerivedProtectedProperty() public function testDerivedPrivateProperty() { - $this->setExpectedException( - 'Zend\Stdlib\Exception\BadMethodCallException', + $this->expectException(Exception\BadMethodCallException::class); + $this->expectExceptionMessage( 'The option "derived_private" does not have a callable "setDerivedPrivate" ("setderivedprivate")' .' setter method which must be defined' ); @@ -156,8 +158,8 @@ public function testDerivedPrivateProperty() public function testExceptionMessageContainsActualUsedSetter() { - $this->setExpectedException( - 'BadMethodCallException', + $this->expectException(BadMethodCallException::class); + $this->expectExceptionMessage( 'The option "foo bar" does not have a callable "setFooBar" ("setfoo bar")' . ' setter method which must be defined' ); diff --git a/test/StringWrapper/CommonStringWrapperTest.php b/test/StringWrapper/CommonStringWrapperTest.php index 2b4988acb..e72c87828 100644 --- a/test/StringWrapper/CommonStringWrapperTest.php +++ b/test/StringWrapper/CommonStringWrapperTest.php @@ -10,6 +10,7 @@ namespace ZendTest\Stdlib\StringWrapper; use PHPUnit\Framework\TestCase; +use Zend\Stdlib\Exception; use Zend\Stdlib\StringWrapper\StringWrapperInterface; abstract class CommonStringWrapperTest extends TestCase @@ -236,9 +237,8 @@ public function testWordWrapInvalidArgument() if (! $wrapper) { $this->fail("Can't instantiate wrapper"); } - - $this->setExpectedException( - 'Zend\Stdlib\Exception\InvalidArgumentException', + $this->expectException(Exception\InvalidArgumentException::class); + $this->expectExceptionMessage( "Cannot force cut when width is zero" ); $wrapper->wordWrap('a', 0, "\n", true); From 2b53f5e12436bb37503eddfe59ad398064efc066 Mon Sep 17 00:00:00 2001 From: KoKsPfLaNzE Date: Tue, 28 Mar 2017 21:47:02 +0200 Subject: [PATCH 03/16] fix "This test did not perform any assertions" --- test/ArrayObjectTest.php | 2 ++ test/OptionsTest.php | 8 +++----- test/PriorityListTest.php | 2 ++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/test/ArrayObjectTest.php b/test/ArrayObjectTest.php index e4f8c0b64..7bea8334f 100644 --- a/test/ArrayObjectTest.php +++ b/test/ArrayObjectTest.php @@ -296,6 +296,8 @@ public function testOffsetUnsetMultidimensional() $ar = new ArrayObject(); $ar['foo'] = ['bar' => ['baz' => 'boo']]; unset($ar['foo']['bar']['baz']); + + $this->assertArrayNotHasKey('baz', $ar['foo']['bar']); } public function testOffsetUnsetThrowsExceptionOnProtectedProperty() diff --git a/test/OptionsTest.php b/test/OptionsTest.php index dd4ca570e..82f0557fa 100644 --- a/test/OptionsTest.php +++ b/test/OptionsTest.php @@ -187,11 +187,9 @@ public function testIssetDoesNotThrowExceptionWhenMatchingGetterDoesNotExist() { $options = new TestOptionsWithoutGetter(); - try { - isset($options->foo); - } catch (Exception\BadMethodCallException $exception) { - $this->fail("Unexpected BadMethodCallException raised"); - } + isset($options->foo); + + $this->addToAssertionCount(1); } /** diff --git a/test/PriorityListTest.php b/test/PriorityListTest.php index b9bfcf0a0..d60ace941 100644 --- a/test/PriorityListTest.php +++ b/test/PriorityListTest.php @@ -68,6 +68,8 @@ public function testRemove() public function testRemovingNonExistentRouteDoesNotYieldError() { $this->list->remove('foo'); + + $this->assertEmpty($this->list); } public function testClear() From 23e09dca7778d5b0cc8e9a33984f8477619c623f Mon Sep 17 00:00:00 2001 From: KoKsPfLaNzE Date: Tue, 28 Mar 2017 21:48:29 +0200 Subject: [PATCH 04/16] @requires PHP 5.4 removed --- test/Guard/ArrayOrTraversableGuardTraitTest.php | 8 -------- test/Guard/EmptyGuardTraitTest.php | 8 -------- test/Guard/NullGuardTraitTest.php | 8 -------- 3 files changed, 24 deletions(-) diff --git a/test/Guard/ArrayOrTraversableGuardTraitTest.php b/test/Guard/ArrayOrTraversableGuardTraitTest.php index 13aa330e3..db16ac75b 100644 --- a/test/Guard/ArrayOrTraversableGuardTraitTest.php +++ b/test/Guard/ArrayOrTraversableGuardTraitTest.php @@ -15,18 +15,10 @@ use Zend\Stdlib\ArrayObject; /** - * @requires PHP 5.4 * @covers Zend\Stdlib\Guard\ArrayOrTraversableGuardTrait */ class ArrayOrTraversableGuardTraitTest extends TestCase { - public function setUp() - { - if (version_compare(PHP_VERSION, '5.4.0', '<')) { - $this->markTestSkipped('Only valid for php >= 5.4'); - } - } - public function testGuardForArrayOrTraversableThrowsException() { $object = new GuardedObject; diff --git a/test/Guard/EmptyGuardTraitTest.php b/test/Guard/EmptyGuardTraitTest.php index f822a44ba..f0889a7c7 100644 --- a/test/Guard/EmptyGuardTraitTest.php +++ b/test/Guard/EmptyGuardTraitTest.php @@ -14,18 +14,10 @@ use ZendTest\Stdlib\TestAsset\GuardedObject; /** - * @requires PHP 5.4 * @covers Zend\Stdlib\Guard\EmptyGuardTrait */ class EmptyGuardTraitTest extends TestCase { - public function setUp() - { - if (version_compare(PHP_VERSION, '5.4.0', '<')) { - $this->markTestSkipped('Only valid for php >= 5.4'); - } - } - public function testGuardAgainstEmptyThrowsException() { $object = new GuardedObject; diff --git a/test/Guard/NullGuardTraitTest.php b/test/Guard/NullGuardTraitTest.php index 242b3ca1d..2d6a774d3 100644 --- a/test/Guard/NullGuardTraitTest.php +++ b/test/Guard/NullGuardTraitTest.php @@ -14,18 +14,10 @@ use ZendTest\Stdlib\TestAsset\GuardedObject; /** - * @requires PHP 5.4 * @covers Zend\Stdlib\Guard\NullGuardTrait */ class NullGuardTraitTest extends TestCase { - public function setUp() - { - if (version_compare(PHP_VERSION, '5.4.0', '<')) { - $this->markTestSkipped('Only valid for php >= 5.4'); - } - } - public function testGuardAgainstNullThrowsException() { $object = new GuardedObject; From 08ab55c67ca6ba3b1044d53a78dd87ef3f9adbbf Mon Sep 17 00:00:00 2001 From: KoKsPfLaNzE Date: Tue, 28 Mar 2017 21:49:34 +0200 Subject: [PATCH 05/16] removed old PHPUnit_Runner_Version case --- test/bootstrap.php | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/test/bootstrap.php b/test/bootstrap.php index 570bf9e43..022faaa73 100644 --- a/test/bootstrap.php +++ b/test/bootstrap.php @@ -10,17 +10,6 @@ */ error_reporting(E_ALL | E_STRICT); -if (class_exists('PHPUnit_Runner_Version', true)) { - $phpUnitVersion = PHPUnit_Runner_Version::id(); - if ('@package_version@' !== $phpUnitVersion && version_compare($phpUnitVersion, '4.0.0', '<')) { - echo 'This version of PHPUnit (' . PHPUnit_Runner_Version::id() . ') is not supported' - . ' in the zend-stdlib unit tests. Supported is version 4.0.0 or higher.' - . ' See also the CONTRIBUTING.md file in the component root.' . PHP_EOL; - exit(1); - } - unset($phpUnitVersion); -} - /** * Setup autoloading */ From aa66d8a1df5dfc99b70fdb542f0575885b90bf3f Mon Sep 17 00:00:00 2001 From: KoKsPfLaNzE Date: Tue, 28 Mar 2017 21:51:01 +0200 Subject: [PATCH 06/16] update composer.json, phpunit version added composer.lock removed composer.lock in gitignore --- .gitignore | 1 - composer.json | 2 +- composer.lock | 1642 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1643 insertions(+), 2 deletions(-) create mode 100644 composer.lock diff --git a/.gitignore b/.gitignore index f146c8613..673fe323d 100644 --- a/.gitignore +++ b/.gitignore @@ -11,7 +11,6 @@ tmp/ zf-mkdoc-theme/ clover.xml -composer.lock coveralls-upload.json phpunit.xml vendor diff --git a/composer.json b/composer.json index 739661199..adb604d3c 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ }, "require-dev": { "athletic/athletic": "~0.1", - "phpunit/PHPUnit": "~4.0", + "phpunit/PHPUnit": "^6.0.10 || ^5.7.17", "squizlabs/php_codesniffer": "^2.6.2" }, "extra": { diff --git a/composer.lock b/composer.lock new file mode 100644 index 000000000..5ff72f363 --- /dev/null +++ b/composer.lock @@ -0,0 +1,1642 @@ +{ + "_readme": [ + "This file locks the dependencies of your project to a known state", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "This file is @generated automatically" + ], + "content-hash": "4212b61edc53c41e55313d29925c629a", + "packages": [], + "packages-dev": [ + { + "name": "athletic/athletic", + "version": "v0.1.8", + "source": { + "type": "git", + "url": "https://github.com/polyfractal/athletic.git", + "reference": "51fe4b6e5298dd8af187825a4e57745898e37f0e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/polyfractal/athletic/zipball/51fe4b6e5298dd8af187825a4e57745898e37f0e", + "reference": "51fe4b6e5298dd8af187825a4e57745898e37f0e", + "shasum": "" + }, + "require": { + "nategood/commando": "0.2.1", + "php": ">=5.3.9", + "pimple/pimple": ">=1.0,<3.0", + "zeptech/annotations": "1.1.*" + }, + "require-dev": { + "mikey179/vfsstream": "1.2.*", + "mockery/mockery": "0.8.*", + "phpunit/phpunit": "~4.0", + "satooshi/php-coveralls": "0.6.*" + }, + "bin": [ + "bin/athletic" + ], + "type": "library", + "autoload": { + "psr-0": { + "Athletic": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Zachary Tong" + } + ], + "description": "PHP Benchmarking Framework", + "keywords": [ + "benchmark", + "benchmarking", + "profiling" + ], + "time": "2014-06-03T18:32:22+00:00" + }, + { + "name": "doctrine/instantiator", + "version": "1.0.5", + "source": { + "type": "git", + "url": "https://github.com/doctrine/instantiator.git", + "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d", + "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d", + "shasum": "" + }, + "require": { + "php": ">=5.3,<8.0-DEV" + }, + "require-dev": { + "athletic/athletic": "~0.1.8", + "ext-pdo": "*", + "ext-phar": "*", + "phpunit/phpunit": "~4.0", + "squizlabs/php_codesniffer": "~2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com", + "homepage": "http://ocramius.github.com/" + } + ], + "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", + "homepage": "https://github.com/doctrine/instantiator", + "keywords": [ + "constructor", + "instantiate" + ], + "time": "2015-06-14T21:17:01+00:00" + }, + { + "name": "kevinlebrun/colors.php", + "version": "0.2.0", + "source": { + "type": "git", + "url": "https://github.com/kevinlebrun/colors.php.git", + "reference": "b13d23b9365ece519abc0eaa77cd3061c5810d30" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/kevinlebrun/colors.php/zipball/b13d23b9365ece519abc0eaa77cd3061c5810d30", + "reference": "b13d23b9365ece519abc0eaa77cd3061c5810d30", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "autoload": { + "psr-0": { + "Colors": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Kevin Le Brun", + "email": "lebrun.k@gmail.com", + "homepage": "http://kevinlebrun.fr", + "role": "developer" + } + ], + "description": "Colors for PHP CLI scripts", + "homepage": "https://github.com/kevinlebrun/colors.php", + "keywords": [ + "cli", + "color", + "colors", + "console", + "shell" + ], + "time": "2012-03-25T18:18:10+00:00" + }, + { + "name": "myclabs/deep-copy", + "version": "1.6.0", + "source": { + "type": "git", + "url": "https://github.com/myclabs/DeepCopy.git", + "reference": "5a5a9fc8025a08d8919be87d6884d5a92520cefe" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/5a5a9fc8025a08d8919be87d6884d5a92520cefe", + "reference": "5a5a9fc8025a08d8919be87d6884d5a92520cefe", + "shasum": "" + }, + "require": { + "php": ">=5.4.0" + }, + "require-dev": { + "doctrine/collections": "1.*", + "phpunit/phpunit": "~4.1" + }, + "type": "library", + "autoload": { + "psr-4": { + "DeepCopy\\": "src/DeepCopy/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Create deep copies (clones) of your objects", + "homepage": "https://github.com/myclabs/DeepCopy", + "keywords": [ + "clone", + "copy", + "duplicate", + "object", + "object graph" + ], + "time": "2017-01-26T22:05:40+00:00" + }, + { + "name": "nategood/commando", + "version": "0.2.1", + "source": { + "type": "git", + "url": "https://github.com/nategood/commando.git", + "reference": "b8e475d08a6ff1c0f2b89391e777c4e71fc1a6e1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nategood/commando/zipball/b8e475d08a6ff1c0f2b89391e777c4e71fc1a6e1", + "reference": "b8e475d08a6ff1c0f2b89391e777c4e71fc1a6e1", + "shasum": "" + }, + "require": { + "kevinlebrun/colors.php": "0.2.*", + "php": ">=5.3" + }, + "type": "library", + "autoload": { + "psr-0": { + "Commando": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nate Good", + "email": "me@nategood.com", + "homepage": "http://nategood.com" + } + ], + "description": "PHP CLI Commando Style", + "homepage": "http://github.com/nategood/commando", + "keywords": [ + "automation", + "cli", + "command", + "command line", + "command line interface", + "scripting" + ], + "time": "2012-10-07T15:35:37+00:00" + }, + { + "name": "phpdocumentor/reflection-common", + "version": "1.0", + "source": { + "type": "git", + "url": "https://github.com/phpDocumentor/ReflectionCommon.git", + "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c", + "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c", + "shasum": "" + }, + "require": { + "php": ">=5.5" + }, + "require-dev": { + "phpunit/phpunit": "^4.6" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "phpDocumentor\\Reflection\\": [ + "src" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jaap van Otterdijk", + "email": "opensource@ijaap.nl" + } + ], + "description": "Common reflection classes used by phpdocumentor to reflect the code structure", + "homepage": "http://www.phpdoc.org", + "keywords": [ + "FQSEN", + "phpDocumentor", + "phpdoc", + "reflection", + "static analysis" + ], + "time": "2015-12-27T11:43:31+00:00" + }, + { + "name": "phpdocumentor/reflection-docblock", + "version": "3.1.1", + "source": { + "type": "git", + "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", + "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/8331b5efe816ae05461b7ca1e721c01b46bafb3e", + "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e", + "shasum": "" + }, + "require": { + "php": ">=5.5", + "phpdocumentor/reflection-common": "^1.0@dev", + "phpdocumentor/type-resolver": "^0.2.0", + "webmozart/assert": "^1.0" + }, + "require-dev": { + "mockery/mockery": "^0.9.4", + "phpunit/phpunit": "^4.4" + }, + "type": "library", + "autoload": { + "psr-4": { + "phpDocumentor\\Reflection\\": [ + "src/" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Mike van Riel", + "email": "me@mikevanriel.com" + } + ], + "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", + "time": "2016-09-30T07:12:33+00:00" + }, + { + "name": "phpdocumentor/type-resolver", + "version": "0.2.1", + "source": { + "type": "git", + "url": "https://github.com/phpDocumentor/TypeResolver.git", + "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb", + "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb", + "shasum": "" + }, + "require": { + "php": ">=5.5", + "phpdocumentor/reflection-common": "^1.0" + }, + "require-dev": { + "mockery/mockery": "^0.9.4", + "phpunit/phpunit": "^5.2||^4.8.24" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "phpDocumentor\\Reflection\\": [ + "src/" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Mike van Riel", + "email": "me@mikevanriel.com" + } + ], + "time": "2016-11-25T06:54:22+00:00" + }, + { + "name": "phpspec/prophecy", + "version": "v1.7.0", + "source": { + "type": "git", + "url": "https://github.com/phpspec/prophecy.git", + "reference": "93d39f1f7f9326d746203c7c056f300f7f126073" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/93d39f1f7f9326d746203c7c056f300f7f126073", + "reference": "93d39f1f7f9326d746203c7c056f300f7f126073", + "shasum": "" + }, + "require": { + "doctrine/instantiator": "^1.0.2", + "php": "^5.3|^7.0", + "phpdocumentor/reflection-docblock": "^2.0|^3.0.2", + "sebastian/comparator": "^1.1|^2.0", + "sebastian/recursion-context": "^1.0|^2.0|^3.0" + }, + "require-dev": { + "phpspec/phpspec": "^2.5|^3.2", + "phpunit/phpunit": "^4.8 || ^5.6.5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.6.x-dev" + } + }, + "autoload": { + "psr-0": { + "Prophecy\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Konstantin Kudryashov", + "email": "ever.zet@gmail.com", + "homepage": "http://everzet.com" + }, + { + "name": "Marcello Duarte", + "email": "marcello.duarte@gmail.com" + } + ], + "description": "Highly opinionated mocking framework for PHP 5.3+", + "homepage": "https://github.com/phpspec/prophecy", + "keywords": [ + "Double", + "Dummy", + "fake", + "mock", + "spy", + "stub" + ], + "time": "2017-03-02T20:05:34+00:00" + }, + { + "name": "phpunit/php-code-coverage", + "version": "4.0.7", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-code-coverage.git", + "reference": "09e2277d14ea467e5a984010f501343ef29ffc69" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/09e2277d14ea467e5a984010f501343ef29ffc69", + "reference": "09e2277d14ea467e5a984010f501343ef29ffc69", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-xmlwriter": "*", + "php": "^5.6 || ^7.0", + "phpunit/php-file-iterator": "^1.3", + "phpunit/php-text-template": "^1.2", + "phpunit/php-token-stream": "^1.4.2 || ^2.0", + "sebastian/code-unit-reverse-lookup": "^1.0", + "sebastian/environment": "^1.3.2 || ^2.0", + "sebastian/version": "^1.0 || ^2.0" + }, + "require-dev": { + "ext-xdebug": "^2.1.4", + "phpunit/phpunit": "^5.7" + }, + "suggest": { + "ext-xdebug": "^2.5.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", + "homepage": "https://github.com/sebastianbergmann/php-code-coverage", + "keywords": [ + "coverage", + "testing", + "xunit" + ], + "time": "2017-03-01T09:12:17+00:00" + }, + { + "name": "phpunit/php-file-iterator", + "version": "1.4.2", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-file-iterator.git", + "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3cc8f69b3028d0f96a9078e6295d86e9bf019be5", + "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "FilterIterator implementation that filters files based on a list of suffixes.", + "homepage": "https://github.com/sebastianbergmann/php-file-iterator/", + "keywords": [ + "filesystem", + "iterator" + ], + "time": "2016-10-03T07:40:28+00:00" + }, + { + "name": "phpunit/php-text-template", + "version": "1.2.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-text-template.git", + "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686", + "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Simple template engine.", + "homepage": "https://github.com/sebastianbergmann/php-text-template/", + "keywords": [ + "template" + ], + "time": "2015-06-21T13:50:34+00:00" + }, + { + "name": "phpunit/php-timer", + "version": "1.0.9", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-timer.git", + "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f", + "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f", + "shasum": "" + }, + "require": { + "php": "^5.3.3 || ^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Utility class for timing", + "homepage": "https://github.com/sebastianbergmann/php-timer/", + "keywords": [ + "timer" + ], + "time": "2017-02-26T11:10:40+00:00" + }, + { + "name": "phpunit/php-token-stream", + "version": "1.4.11", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-token-stream.git", + "reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/e03f8f67534427a787e21a385a67ec3ca6978ea7", + "reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7", + "shasum": "" + }, + "require": { + "ext-tokenizer": "*", + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Wrapper around PHP's tokenizer extension.", + "homepage": "https://github.com/sebastianbergmann/php-token-stream/", + "keywords": [ + "tokenizer" + ], + "time": "2017-02-27T10:12:30+00:00" + }, + { + "name": "phpunit/phpunit", + "version": "5.7.17", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/phpunit.git", + "reference": "68752b665d3875f9a38a357e3ecb35c79f8673bf" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/68752b665d3875f9a38a357e3ecb35c79f8673bf", + "reference": "68752b665d3875f9a38a357e3ecb35c79f8673bf", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-json": "*", + "ext-libxml": "*", + "ext-mbstring": "*", + "ext-xml": "*", + "myclabs/deep-copy": "~1.3", + "php": "^5.6 || ^7.0", + "phpspec/prophecy": "^1.6.2", + "phpunit/php-code-coverage": "^4.0.4", + "phpunit/php-file-iterator": "~1.4", + "phpunit/php-text-template": "~1.2", + "phpunit/php-timer": "^1.0.6", + "phpunit/phpunit-mock-objects": "^3.2", + "sebastian/comparator": "^1.2.4", + "sebastian/diff": "~1.2", + "sebastian/environment": "^1.3.4 || ^2.0", + "sebastian/exporter": "~2.0", + "sebastian/global-state": "^1.1", + "sebastian/object-enumerator": "~2.0", + "sebastian/resource-operations": "~1.0", + "sebastian/version": "~1.0.3|~2.0", + "symfony/yaml": "~2.1|~3.0" + }, + "conflict": { + "phpdocumentor/reflection-docblock": "3.0.2" + }, + "require-dev": { + "ext-pdo": "*" + }, + "suggest": { + "ext-xdebug": "*", + "phpunit/php-invoker": "~1.1" + }, + "bin": [ + "phpunit" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.7.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "The PHP Unit Testing framework.", + "homepage": "https://phpunit.de/", + "keywords": [ + "phpunit", + "testing", + "xunit" + ], + "time": "2017-03-19T16:52:12+00:00" + }, + { + "name": "phpunit/phpunit-mock-objects", + "version": "3.4.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", + "reference": "3ab72b65b39b491e0c011e2e09bb2206c2aa8e24" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/3ab72b65b39b491e0c011e2e09bb2206c2aa8e24", + "reference": "3ab72b65b39b491e0c011e2e09bb2206c2aa8e24", + "shasum": "" + }, + "require": { + "doctrine/instantiator": "^1.0.2", + "php": "^5.6 || ^7.0", + "phpunit/php-text-template": "^1.2", + "sebastian/exporter": "^1.2 || ^2.0" + }, + "conflict": { + "phpunit/phpunit": "<5.4.0" + }, + "require-dev": { + "phpunit/phpunit": "^5.4" + }, + "suggest": { + "ext-soap": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.2.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Mock Object library for PHPUnit", + "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/", + "keywords": [ + "mock", + "xunit" + ], + "time": "2016-12-08T20:27:08+00:00" + }, + { + "name": "pimple/pimple", + "version": "v2.1.1", + "source": { + "type": "git", + "url": "https://github.com/silexphp/Pimple.git", + "reference": "ea22fb2880faf7b7b0e17c9809c6fe25b071fd76" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/silexphp/Pimple/zipball/ea22fb2880faf7b7b0e17c9809c6fe25b071fd76", + "reference": "ea22fb2880faf7b7b0e17c9809c6fe25b071fd76", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.1.x-dev" + } + }, + "autoload": { + "psr-0": { + "Pimple": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "Pimple is a simple Dependency Injection Container for PHP 5.3", + "homepage": "http://pimple.sensiolabs.org", + "keywords": [ + "container", + "dependency injection" + ], + "time": "2014-07-24T07:10:08+00:00" + }, + { + "name": "sebastian/code-unit-reverse-lookup", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", + "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18", + "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^5.7 || ^6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Looks up which function or method a line of code belongs to", + "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", + "time": "2017-03-04T06:30:41+00:00" + }, + { + "name": "sebastian/comparator", + "version": "1.2.4", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/comparator.git", + "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2b7424b55f5047b47ac6e5ccb20b2aea4011d9be", + "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "sebastian/diff": "~1.2", + "sebastian/exporter": "~1.2 || ~2.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.2.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@2bepublished.at" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides the functionality to compare PHP values for equality", + "homepage": "http://www.github.com/sebastianbergmann/comparator", + "keywords": [ + "comparator", + "compare", + "equality" + ], + "time": "2017-01-29T09:50:25+00:00" + }, + { + "name": "sebastian/diff", + "version": "1.4.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/diff.git", + "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e", + "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.8" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Kore Nordmann", + "email": "mail@kore-nordmann.de" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Diff implementation", + "homepage": "https://github.com/sebastianbergmann/diff", + "keywords": [ + "diff" + ], + "time": "2015-12-08T07:14:41+00:00" + }, + { + "name": "sebastian/environment", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/environment.git", + "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/5795ffe5dc5b02460c3e34222fee8cbe245d8fac", + "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^5.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides functionality to handle HHVM/PHP environments", + "homepage": "http://www.github.com/sebastianbergmann/environment", + "keywords": [ + "Xdebug", + "environment", + "hhvm" + ], + "time": "2016-11-26T07:53:53+00:00" + }, + { + "name": "sebastian/exporter", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/exporter.git", + "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4", + "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "sebastian/recursion-context": "~2.0" + }, + "require-dev": { + "ext-mbstring": "*", + "phpunit/phpunit": "~4.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@2bepublished.at" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" + } + ], + "description": "Provides the functionality to export PHP variables for visualization", + "homepage": "http://www.github.com/sebastianbergmann/exporter", + "keywords": [ + "export", + "exporter" + ], + "time": "2016-11-19T08:54:04+00:00" + }, + { + "name": "sebastian/global-state", + "version": "1.1.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/global-state.git", + "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4", + "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.2" + }, + "suggest": { + "ext-uopz": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Snapshotting of global state", + "homepage": "http://www.github.com/sebastianbergmann/global-state", + "keywords": [ + "global state" + ], + "time": "2015-10-12T03:26:01+00:00" + }, + { + "name": "sebastian/object-enumerator", + "version": "2.0.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/object-enumerator.git", + "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/1311872ac850040a79c3c058bea3e22d0f09cbb7", + "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7", + "shasum": "" + }, + "require": { + "php": ">=5.6", + "sebastian/recursion-context": "~2.0" + }, + "require-dev": { + "phpunit/phpunit": "~5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Traverses array structures and object graphs to enumerate all referenced objects", + "homepage": "https://github.com/sebastianbergmann/object-enumerator/", + "time": "2017-02-18T15:18:39+00:00" + }, + { + "name": "sebastian/recursion-context", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/recursion-context.git", + "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/2c3ba150cbec723aa057506e73a8d33bdb286c9a", + "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" + } + ], + "description": "Provides functionality to recursively process PHP variables", + "homepage": "http://www.github.com/sebastianbergmann/recursion-context", + "time": "2016-11-19T07:33:16+00:00" + }, + { + "name": "sebastian/resource-operations", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/resource-operations.git", + "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52", + "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52", + "shasum": "" + }, + "require": { + "php": ">=5.6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides a list of PHP built-in functions that operate on resources", + "homepage": "https://www.github.com/sebastianbergmann/resource-operations", + "time": "2015-07-28T20:34:47+00:00" + }, + { + "name": "sebastian/version", + "version": "2.0.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/version.git", + "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019", + "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019", + "shasum": "" + }, + "require": { + "php": ">=5.6" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library that helps with managing the version number of Git-hosted PHP projects", + "homepage": "https://github.com/sebastianbergmann/version", + "time": "2016-10-03T07:35:21+00:00" + }, + { + "name": "squizlabs/php_codesniffer", + "version": "2.8.1", + "source": { + "type": "git", + "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", + "reference": "d7cf0d894e8aa4c73712ee4a331cc1eaa37cdc7d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/d7cf0d894e8aa4c73712ee4a331cc1eaa37cdc7d", + "reference": "d7cf0d894e8aa4c73712ee4a331cc1eaa37cdc7d", + "shasum": "" + }, + "require": { + "ext-simplexml": "*", + "ext-tokenizer": "*", + "ext-xmlwriter": "*", + "php": ">=5.1.2" + }, + "require-dev": { + "phpunit/phpunit": "~4.0" + }, + "bin": [ + "scripts/phpcs", + "scripts/phpcbf" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.x-dev" + } + }, + "autoload": { + "classmap": [ + "CodeSniffer.php", + "CodeSniffer/CLI.php", + "CodeSniffer/Exception.php", + "CodeSniffer/File.php", + "CodeSniffer/Fixer.php", + "CodeSniffer/Report.php", + "CodeSniffer/Reporting.php", + "CodeSniffer/Sniff.php", + "CodeSniffer/Tokens.php", + "CodeSniffer/Reports/", + "CodeSniffer/Tokenizers/", + "CodeSniffer/DocGenerators/", + "CodeSniffer/Standards/AbstractPatternSniff.php", + "CodeSniffer/Standards/AbstractScopeSniff.php", + "CodeSniffer/Standards/AbstractVariableSniff.php", + "CodeSniffer/Standards/IncorrectPatternException.php", + "CodeSniffer/Standards/Generic/Sniffs/", + "CodeSniffer/Standards/MySource/Sniffs/", + "CodeSniffer/Standards/PEAR/Sniffs/", + "CodeSniffer/Standards/PSR1/Sniffs/", + "CodeSniffer/Standards/PSR2/Sniffs/", + "CodeSniffer/Standards/Squiz/Sniffs/", + "CodeSniffer/Standards/Zend/Sniffs/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Greg Sherwood", + "role": "lead" + } + ], + "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", + "homepage": "http://www.squizlabs.com/php-codesniffer", + "keywords": [ + "phpcs", + "standards" + ], + "time": "2017-03-01T22:17:45+00:00" + }, + { + "name": "symfony/yaml", + "version": "v3.2.6", + "source": { + "type": "git", + "url": "https://github.com/symfony/yaml.git", + "reference": "093e416ad096355149e265ea2e4cc1f9ee40ab1a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/yaml/zipball/093e416ad096355149e265ea2e4cc1f9ee40ab1a", + "reference": "093e416ad096355149e265ea2e4cc1f9ee40ab1a", + "shasum": "" + }, + "require": { + "php": ">=5.5.9" + }, + "require-dev": { + "symfony/console": "~2.8|~3.0" + }, + "suggest": { + "symfony/console": "For validating YAML files using the lint command" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.2-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Yaml\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Yaml Component", + "homepage": "https://symfony.com", + "time": "2017-03-07T16:47:02+00:00" + }, + { + "name": "webmozart/assert", + "version": "1.2.0", + "source": { + "type": "git", + "url": "https://github.com/webmozart/assert.git", + "reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/webmozart/assert/zipball/2db61e59ff05fe5126d152bd0655c9ea113e550f", + "reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f", + "shasum": "" + }, + "require": { + "php": "^5.3.3 || ^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.6", + "sebastian/version": "^1.0.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.3-dev" + } + }, + "autoload": { + "psr-4": { + "Webmozart\\Assert\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Bernhard Schussek", + "email": "bschussek@gmail.com" + } + ], + "description": "Assertions to validate method input/output with nice error messages.", + "keywords": [ + "assert", + "check", + "validate" + ], + "time": "2016-11-23T20:04:58+00:00" + }, + { + "name": "zeptech/annotations", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://github.com/pgraham/php-annotations.git", + "reference": "9cd042daa9ace184d04b49f0605edf73f19a9c71" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/pgraham/php-annotations/zipball/9cd042daa9ace184d04b49f0605edf73f19a9c71", + "reference": "9cd042daa9ace184d04b49f0605edf73f19a9c71", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "autoload": { + "psr-0": { + "zpt\\anno": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD" + ], + "authors": [ + { + "name": "Philip Graham", + "email": "philip@zeptech.ca" + } + ], + "description": "DOC Block annotation parsing for PHP", + "homepage": "https://github.com/pgraham/php-annotations", + "keywords": [ + "annotations" + ], + "time": "2013-05-29T02:35:23+00:00" + } + ], + "aliases": [], + "minimum-stability": "stable", + "stability-flags": [], + "prefer-stable": false, + "prefer-lowest": false, + "platform": { + "php": "^5.6 || ^7.0" + }, + "platform-dev": [] +} From 6fbe191857ad633348f9a4a7592a8bbbc0d314ed Mon Sep 17 00:00:00 2001 From: KoKsPfLaNzE Date: Tue, 28 Mar 2017 21:54:24 +0200 Subject: [PATCH 07/16] update travis build --- .travis.yml | 42 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 36 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index b1790f185..0f8794fc3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,9 @@ cache: env: global: + - COMPOSER_ARGS="--no-interaction" + - COVERAGE_DEPS="satooshi/php-coveralls" + - LEGACY_DEPS="phpunit/phpunit" - SITE_URL: https://zendframework.github.io/zend-stdlib - GH_USER_NAME: "Matthew Weier O'Phinney" - GH_USER_EMAIL: matthew@weierophinney.net @@ -26,13 +29,35 @@ matrix: include: - php: 5.6 env: + - DEPS=lowest + - php: 5.6 + env: + - DEPS=locked - TEST_COVERAGE=true - DEPLOY_DOCS="$(if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then echo -n 'true' ; else echo -n 'false' ; fi)" - PATH="$HOME/.local/bin:$PATH" + - php: 5.6 + env: + - DEPS=latest + - php: 7 + env: + - DEPS=lowest + - php: 7 + env: + - DEPS=locked + - CHECK_CS=true - php: 7 env: - - CS_CHECK=true - - php: hhvm + - DEPS=latest + - php: hhvm + env: + - DEPS=lowest + - php: hhvm + env: + - DEPS=locked + - php: hhvm + env: + - DEPS=latest allow_failures: - php: hhvm @@ -41,12 +66,17 @@ notifications: email: false before_install: - - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi - - composer self-update - - if [[ $TEST_COVERAGE == 'true' ]]; then composer require --dev --no-update satooshi/php-coveralls ; fi + - travis_retry composer self-update + - if [[ $TRAVIS_PHP_VERSION != "hhvm" && $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini ; fi install: - - travis_retry composer install --no-interaction --ignore-platform-reqs + - travis_retry composer install $COMPOSER_ARGS + - if [[ $TRAVIS_PHP_VERSION =~ ^5.6 ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi + - if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi + - if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi + - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi + - stty cols 120 + - COLUMNS=120 composer show script: - if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; fi From bd68a5d36a0e97bfc3a943e6f08628a587921fd6 Mon Sep 17 00:00:00 2001 From: KoKsPfLaNzE Date: Tue, 28 Mar 2017 21:54:48 +0200 Subject: [PATCH 08/16] added php 7.1 in travis --- .travis.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.travis.yml b/.travis.yml index 0f8794fc3..9483c500b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,6 +49,15 @@ matrix: - php: 7 env: - DEPS=latest + - php: 7.1 + env: + - DEPS=lowest + - php: 7.1 + env: + - DEPS=locked + - php: 7.1 + env: + - DEPS=latest - php: hhvm env: - DEPS=lowest From 0c2dd2c48a5e17f15f55000cda09b15fc2e13b3b Mon Sep 17 00:00:00 2001 From: KoKsPfLaNzE Date: Thu, 24 Aug 2017 00:38:53 +0200 Subject: [PATCH 09/16] updated composer.json and composer.lock with latest dependencies also added composer.lock in .gitattributes --- .gitattributes | 1 + composer.json | 2 +- composer.lock | 508 +++++++++++++++++++++++++++++++------------------ 3 files changed, 324 insertions(+), 187 deletions(-) diff --git a/.gitattributes b/.gitattributes index 7325c6902..2df781e39 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4,5 +4,6 @@ .gitattributes export-ignore .gitignore export-ignore .travis.yml export-ignore +.composer.lock export-ignore .php_cs export-ignore phpunit.xml.dist export-ignore diff --git a/composer.json b/composer.json index adb604d3c..610c7af63 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ }, "require-dev": { "athletic/athletic": "~0.1", - "phpunit/PHPUnit": "^6.0.10 || ^5.7.17", + "phpunit/PHPUnit": "^5.7.21 || ^6.3", "squizlabs/php_codesniffer": "^2.6.2" }, "extra": { diff --git a/composer.lock b/composer.lock index 5ff72f363..e9a08b6a8 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "4212b61edc53c41e55313d29925c629a", + "content-hash": "366dafd42ce8f0ce09c2757106b90ec9", "packages": [], "packages-dev": [ { @@ -61,32 +61,32 @@ }, { "name": "doctrine/instantiator", - "version": "1.0.5", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d" + "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d", - "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda", + "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda", "shasum": "" }, "require": { - "php": ">=5.3,<8.0-DEV" + "php": "^7.1" }, "require-dev": { "athletic/athletic": "~0.1.8", "ext-pdo": "*", "ext-phar": "*", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "~2.0" + "phpunit/phpunit": "^6.2.3", + "squizlabs/php_codesniffer": "^3.0.2" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.2.x-dev" } }, "autoload": { @@ -111,7 +111,7 @@ "constructor", "instantiate" ], - "time": "2015-06-14T21:17:01+00:00" + "time": "2017-07-22T11:58:36+00:00" }, { "name": "kevinlebrun/colors.php", @@ -161,16 +161,16 @@ }, { "name": "myclabs/deep-copy", - "version": "1.6.0", + "version": "1.6.1", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "5a5a9fc8025a08d8919be87d6884d5a92520cefe" + "reference": "8e6e04167378abf1ddb4d3522d8755c5fd90d102" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/5a5a9fc8025a08d8919be87d6884d5a92520cefe", - "reference": "5a5a9fc8025a08d8919be87d6884d5a92520cefe", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/8e6e04167378abf1ddb4d3522d8755c5fd90d102", + "reference": "8e6e04167378abf1ddb4d3522d8755c5fd90d102", "shasum": "" }, "require": { @@ -199,7 +199,7 @@ "object", "object graph" ], - "time": "2017-01-26T22:05:40+00:00" + "time": "2017-04-12T18:52:22+00:00" }, { "name": "nategood/commando", @@ -248,6 +248,108 @@ ], "time": "2012-10-07T15:35:37+00:00" }, + { + "name": "phar-io/manifest", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/phar-io/manifest.git", + "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phar-io/manifest/zipball/2df402786ab5368a0169091f61a7c1e0eb6852d0", + "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-phar": "*", + "phar-io/version": "^1.0.1", + "php": "^5.6 || ^7.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + }, + { + "name": "Sebastian Heuer", + "email": "sebastian@phpeople.de", + "role": "Developer" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "Developer" + } + ], + "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", + "time": "2017-03-05T18:14:27+00:00" + }, + { + "name": "phar-io/version", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/phar-io/version.git", + "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phar-io/version/zipball/a70c0ced4be299a63d32fa96d9281d03e94041df", + "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + }, + { + "name": "Sebastian Heuer", + "email": "sebastian@phpeople.de", + "role": "Developer" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "Developer" + } + ], + "description": "Library for handling version information and constraints", + "time": "2017-03-05T17:38:23+00:00" + }, { "name": "phpdocumentor/reflection-common", "version": "1.0", @@ -304,22 +406,22 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "3.1.1", + "version": "3.2.2", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e" + "reference": "4aada1f93c72c35e22fb1383b47fee43b8f1d157" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/8331b5efe816ae05461b7ca1e721c01b46bafb3e", - "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/4aada1f93c72c35e22fb1383b47fee43b8f1d157", + "reference": "4aada1f93c72c35e22fb1383b47fee43b8f1d157", "shasum": "" }, "require": { "php": ">=5.5", "phpdocumentor/reflection-common": "^1.0@dev", - "phpdocumentor/type-resolver": "^0.2.0", + "phpdocumentor/type-resolver": "^0.3.0", "webmozart/assert": "^1.0" }, "require-dev": { @@ -345,24 +447,24 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2016-09-30T07:12:33+00:00" + "time": "2017-08-08T06:39:58+00:00" }, { "name": "phpdocumentor/type-resolver", - "version": "0.2.1", + "version": "0.3.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb" + "reference": "fb3933512008d8162b3cdf9e18dba9309b7c3773" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb", - "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/fb3933512008d8162b3cdf9e18dba9309b7c3773", + "reference": "fb3933512008d8162b3cdf9e18dba9309b7c3773", "shasum": "" }, "require": { - "php": ">=5.5", + "php": "^5.5 || ^7.0", "phpdocumentor/reflection-common": "^1.0" }, "require-dev": { @@ -392,7 +494,7 @@ "email": "me@mikevanriel.com" } ], - "time": "2016-11-25T06:54:22+00:00" + "time": "2017-06-03T08:32:36+00:00" }, { "name": "phpspec/prophecy", @@ -459,40 +561,41 @@ }, { "name": "phpunit/php-code-coverage", - "version": "4.0.7", + "version": "5.2.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "09e2277d14ea467e5a984010f501343ef29ffc69" + "reference": "8ed1902a57849e117b5651fc1a5c48110946c06b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/09e2277d14ea467e5a984010f501343ef29ffc69", - "reference": "09e2277d14ea467e5a984010f501343ef29ffc69", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/8ed1902a57849e117b5651fc1a5c48110946c06b", + "reference": "8ed1902a57849e117b5651fc1a5c48110946c06b", "shasum": "" }, "require": { "ext-dom": "*", "ext-xmlwriter": "*", - "php": "^5.6 || ^7.0", - "phpunit/php-file-iterator": "^1.3", - "phpunit/php-text-template": "^1.2", - "phpunit/php-token-stream": "^1.4.2 || ^2.0", - "sebastian/code-unit-reverse-lookup": "^1.0", - "sebastian/environment": "^1.3.2 || ^2.0", - "sebastian/version": "^1.0 || ^2.0" + "php": "^7.0", + "phpunit/php-file-iterator": "^1.4.2", + "phpunit/php-text-template": "^1.2.1", + "phpunit/php-token-stream": "^1.4.11 || ^2.0", + "sebastian/code-unit-reverse-lookup": "^1.0.1", + "sebastian/environment": "^3.0", + "sebastian/version": "^2.0.1", + "theseer/tokenizer": "^1.1" }, "require-dev": { - "ext-xdebug": "^2.1.4", - "phpunit/phpunit": "^5.7" + "ext-xdebug": "^2.5", + "phpunit/phpunit": "^6.0" }, "suggest": { - "ext-xdebug": "^2.5.1" + "ext-xdebug": "^2.5.5" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0.x-dev" + "dev-master": "5.2.x-dev" } }, "autoload": { @@ -518,7 +621,7 @@ "testing", "xunit" ], - "time": "2017-03-01T09:12:17+00:00" + "time": "2017-08-03T12:40:43+00:00" }, { "name": "phpunit/php-file-iterator", @@ -659,29 +762,29 @@ }, { "name": "phpunit/php-token-stream", - "version": "1.4.11", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7" + "reference": "9a02332089ac48e704c70f6cefed30c224e3c0b0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/e03f8f67534427a787e21a385a67ec3ca6978ea7", - "reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/9a02332089ac48e704c70f6cefed30c224e3c0b0", + "reference": "9a02332089ac48e704c70f6cefed30c224e3c0b0", "shasum": "" }, "require": { "ext-tokenizer": "*", - "php": ">=5.3.3" + "php": "^7.0" }, "require-dev": { - "phpunit/phpunit": "~4.2" + "phpunit/phpunit": "^6.2.4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "2.0-dev" } }, "autoload": { @@ -704,20 +807,20 @@ "keywords": [ "tokenizer" ], - "time": "2017-02-27T10:12:30+00:00" + "time": "2017-08-20T05:47:52+00:00" }, { "name": "phpunit/phpunit", - "version": "5.7.17", + "version": "6.3.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "68752b665d3875f9a38a357e3ecb35c79f8673bf" + "reference": "9501bab711403a1ab5b8378a8adb4ec3db3debdb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/68752b665d3875f9a38a357e3ecb35c79f8673bf", - "reference": "68752b665d3875f9a38a357e3ecb35c79f8673bf", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9501bab711403a1ab5b8378a8adb4ec3db3debdb", + "reference": "9501bab711403a1ab5b8378a8adb4ec3db3debdb", "shasum": "" }, "require": { @@ -726,33 +829,35 @@ "ext-libxml": "*", "ext-mbstring": "*", "ext-xml": "*", - "myclabs/deep-copy": "~1.3", - "php": "^5.6 || ^7.0", - "phpspec/prophecy": "^1.6.2", - "phpunit/php-code-coverage": "^4.0.4", - "phpunit/php-file-iterator": "~1.4", - "phpunit/php-text-template": "~1.2", - "phpunit/php-timer": "^1.0.6", - "phpunit/phpunit-mock-objects": "^3.2", - "sebastian/comparator": "^1.2.4", - "sebastian/diff": "~1.2", - "sebastian/environment": "^1.3.4 || ^2.0", - "sebastian/exporter": "~2.0", - "sebastian/global-state": "^1.1", - "sebastian/object-enumerator": "~2.0", - "sebastian/resource-operations": "~1.0", - "sebastian/version": "~1.0.3|~2.0", - "symfony/yaml": "~2.1|~3.0" + "myclabs/deep-copy": "^1.6.1", + "phar-io/manifest": "^1.0.1", + "phar-io/version": "^1.0", + "php": "^7.0", + "phpspec/prophecy": "^1.7", + "phpunit/php-code-coverage": "^5.2.2", + "phpunit/php-file-iterator": "^1.4.2", + "phpunit/php-text-template": "^1.2.1", + "phpunit/php-timer": "^1.0.9", + "phpunit/phpunit-mock-objects": "^4.0.3", + "sebastian/comparator": "^2.0.2", + "sebastian/diff": "^2.0", + "sebastian/environment": "^3.1", + "sebastian/exporter": "^3.1", + "sebastian/global-state": "^2.0", + "sebastian/object-enumerator": "^3.0.3", + "sebastian/resource-operations": "^1.0", + "sebastian/version": "^2.0.1" }, "conflict": { - "phpdocumentor/reflection-docblock": "3.0.2" + "phpdocumentor/reflection-docblock": "3.0.2", + "phpunit/dbunit": "<3.0" }, "require-dev": { "ext-pdo": "*" }, "suggest": { "ext-xdebug": "*", - "phpunit/php-invoker": "~1.1" + "phpunit/php-invoker": "^1.1" }, "bin": [ "phpunit" @@ -760,7 +865,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "5.7.x-dev" + "dev-master": "6.3.x-dev" } }, "autoload": { @@ -786,33 +891,33 @@ "testing", "xunit" ], - "time": "2017-03-19T16:52:12+00:00" + "time": "2017-08-04T05:20:39+00:00" }, { "name": "phpunit/phpunit-mock-objects", - "version": "3.4.3", + "version": "4.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "3ab72b65b39b491e0c011e2e09bb2206c2aa8e24" + "reference": "2f789b59ab89669015ad984afa350c4ec577ade0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/3ab72b65b39b491e0c011e2e09bb2206c2aa8e24", - "reference": "3ab72b65b39b491e0c011e2e09bb2206c2aa8e24", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/2f789b59ab89669015ad984afa350c4ec577ade0", + "reference": "2f789b59ab89669015ad984afa350c4ec577ade0", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.0.2", - "php": "^5.6 || ^7.0", - "phpunit/php-text-template": "^1.2", - "sebastian/exporter": "^1.2 || ^2.0" + "doctrine/instantiator": "^1.0.5", + "php": "^7.0", + "phpunit/php-text-template": "^1.2.1", + "sebastian/exporter": "^3.0" }, "conflict": { - "phpunit/phpunit": "<5.4.0" + "phpunit/phpunit": "<6.0" }, "require-dev": { - "phpunit/phpunit": "^5.4" + "phpunit/phpunit": "^6.0" }, "suggest": { "ext-soap": "*" @@ -820,7 +925,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2.x-dev" + "dev-master": "4.0.x-dev" } }, "autoload": { @@ -845,7 +950,7 @@ "mock", "xunit" ], - "time": "2016-12-08T20:27:08+00:00" + "time": "2017-08-03T14:08:16+00:00" }, { "name": "pimple/pimple", @@ -940,30 +1045,30 @@ }, { "name": "sebastian/comparator", - "version": "1.2.4", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be" + "reference": "ae068fede81d06e7bb9bb46a367210a3d3e1fe6a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2b7424b55f5047b47ac6e5ccb20b2aea4011d9be", - "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/ae068fede81d06e7bb9bb46a367210a3d3e1fe6a", + "reference": "ae068fede81d06e7bb9bb46a367210a3d3e1fe6a", "shasum": "" }, "require": { - "php": ">=5.3.3", - "sebastian/diff": "~1.2", - "sebastian/exporter": "~1.2 || ~2.0" + "php": "^7.0", + "sebastian/diff": "^2.0", + "sebastian/exporter": "^3.0" }, "require-dev": { - "phpunit/phpunit": "~4.4" + "phpunit/phpunit": "^6.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { @@ -1000,32 +1105,32 @@ "compare", "equality" ], - "time": "2017-01-29T09:50:25+00:00" + "time": "2017-08-03T07:14:59+00:00" }, { "name": "sebastian/diff", - "version": "1.4.1", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e" + "reference": "347c1d8b49c5c3ee30c7040ea6fc446790e6bddd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e", - "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/347c1d8b49c5c3ee30c7040ea6fc446790e6bddd", + "reference": "347c1d8b49c5c3ee30c7040ea6fc446790e6bddd", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": "^7.0" }, "require-dev": { - "phpunit/phpunit": "~4.8" + "phpunit/phpunit": "^6.2" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "2.0-dev" } }, "autoload": { @@ -1052,32 +1157,32 @@ "keywords": [ "diff" ], - "time": "2015-12-08T07:14:41+00:00" + "time": "2017-08-03T08:09:46+00:00" }, { "name": "sebastian/environment", - "version": "2.0.0", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac" + "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/5795ffe5dc5b02460c3e34222fee8cbe245d8fac", - "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/cd0871b3975fb7fc44d11314fd1ee20925fce4f5", + "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5", "shasum": "" }, "require": { - "php": "^5.6 || ^7.0" + "php": "^7.0" }, "require-dev": { - "phpunit/phpunit": "^5.0" + "phpunit/phpunit": "^6.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "3.1.x-dev" } }, "autoload": { @@ -1102,34 +1207,34 @@ "environment", "hhvm" ], - "time": "2016-11-26T07:53:53+00:00" + "time": "2017-07-01T08:51:00+00:00" }, { "name": "sebastian/exporter", - "version": "2.0.0", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4" + "reference": "234199f4528de6d12aaa58b612e98f7d36adb937" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4", - "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/234199f4528de6d12aaa58b612e98f7d36adb937", + "reference": "234199f4528de6d12aaa58b612e98f7d36adb937", "shasum": "" }, "require": { - "php": ">=5.3.3", - "sebastian/recursion-context": "~2.0" + "php": "^7.0", + "sebastian/recursion-context": "^3.0" }, "require-dev": { "ext-mbstring": "*", - "phpunit/phpunit": "~4.4" + "phpunit/phpunit": "^6.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "3.1.x-dev" } }, "autoload": { @@ -1169,27 +1274,27 @@ "export", "exporter" ], - "time": "2016-11-19T08:54:04+00:00" + "time": "2017-04-03T13:19:02+00:00" }, { "name": "sebastian/global-state", - "version": "1.1.1", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4" + "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4", - "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4", + "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": "^7.0" }, "require-dev": { - "phpunit/phpunit": "~4.2" + "phpunit/phpunit": "^6.0" }, "suggest": { "ext-uopz": "*" @@ -1197,7 +1302,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "2.0-dev" } }, "autoload": { @@ -1220,33 +1325,34 @@ "keywords": [ "global state" ], - "time": "2015-10-12T03:26:01+00:00" + "time": "2017-04-27T15:39:26+00:00" }, { "name": "sebastian/object-enumerator", - "version": "2.0.1", + "version": "3.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/object-enumerator.git", - "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7" + "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/1311872ac850040a79c3c058bea3e22d0f09cbb7", - "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7", + "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/7cfd9e65d11ffb5af41198476395774d4c8a84c5", + "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5", "shasum": "" }, "require": { - "php": ">=5.6", - "sebastian/recursion-context": "~2.0" + "php": "^7.0", + "sebastian/object-reflector": "^1.1.1", + "sebastian/recursion-context": "^3.0" }, "require-dev": { - "phpunit/phpunit": "~5" + "phpunit/phpunit": "^6.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "3.0.x-dev" } }, "autoload": { @@ -1266,32 +1372,77 @@ ], "description": "Traverses array structures and object graphs to enumerate all referenced objects", "homepage": "https://github.com/sebastianbergmann/object-enumerator/", - "time": "2017-02-18T15:18:39+00:00" + "time": "2017-08-03T12:35:26+00:00" + }, + { + "name": "sebastian/object-reflector", + "version": "1.1.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/object-reflector.git", + "reference": "773f97c67f28de00d397be301821b06708fca0be" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/773f97c67f28de00d397be301821b06708fca0be", + "reference": "773f97c67f28de00d397be301821b06708fca0be", + "shasum": "" + }, + "require": { + "php": "^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Allows reflection of object attributes, including inherited and non-public ones", + "homepage": "https://github.com/sebastianbergmann/object-reflector/", + "time": "2017-03-29T09:07:27+00:00" }, { "name": "sebastian/recursion-context", - "version": "2.0.0", + "version": "3.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a" + "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/2c3ba150cbec723aa057506e73a8d33bdb286c9a", - "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8", + "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": "^7.0" }, "require-dev": { - "phpunit/phpunit": "~4.4" + "phpunit/phpunit": "^6.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "3.0.x-dev" } }, "autoload": { @@ -1319,7 +1470,7 @@ ], "description": "Provides functionality to recursively process PHP variables", "homepage": "http://www.github.com/sebastianbergmann/recursion-context", - "time": "2016-11-19T07:33:16+00:00" + "time": "2017-03-03T06:23:57+00:00" }, { "name": "sebastian/resource-operations", @@ -1408,16 +1559,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "2.8.1", + "version": "2.9.1", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "d7cf0d894e8aa4c73712ee4a331cc1eaa37cdc7d" + "reference": "dcbed1074f8244661eecddfc2a675430d8d33f62" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/d7cf0d894e8aa4c73712ee4a331cc1eaa37cdc7d", - "reference": "d7cf0d894e8aa4c73712ee4a331cc1eaa37cdc7d", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/dcbed1074f8244661eecddfc2a675430d8d33f62", + "reference": "dcbed1074f8244661eecddfc2a675430d8d33f62", "shasum": "" }, "require": { @@ -1482,62 +1633,47 @@ "phpcs", "standards" ], - "time": "2017-03-01T22:17:45+00:00" + "time": "2017-05-22T02:43:20+00:00" }, { - "name": "symfony/yaml", - "version": "v3.2.6", + "name": "theseer/tokenizer", + "version": "1.1.0", "source": { "type": "git", - "url": "https://github.com/symfony/yaml.git", - "reference": "093e416ad096355149e265ea2e4cc1f9ee40ab1a" + "url": "https://github.com/theseer/tokenizer.git", + "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/093e416ad096355149e265ea2e4cc1f9ee40ab1a", - "reference": "093e416ad096355149e265ea2e4cc1f9ee40ab1a", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/cb2f008f3f05af2893a87208fe6a6c4985483f8b", + "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b", "shasum": "" }, "require": { - "php": ">=5.5.9" - }, - "require-dev": { - "symfony/console": "~2.8|~3.0" - }, - "suggest": { - "symfony/console": "For validating YAML files using the lint command" + "ext-dom": "*", + "ext-tokenizer": "*", + "ext-xmlwriter": "*", + "php": "^7.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.2-dev" - } - }, "autoload": { - "psr-4": { - "Symfony\\Component\\Yaml\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" + "classmap": [ + "src/" ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" } ], - "description": "Symfony Yaml Component", - "homepage": "https://symfony.com", - "time": "2017-03-07T16:47:02+00:00" + "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", + "time": "2017-04-07T12:08:54+00:00" }, { "name": "webmozart/assert", From 09d463b68d011b832e19fdd4b980ab8f3d36c963 Mon Sep 17 00:00:00 2001 From: KoKsPfLaNzE Date: Thu, 24 Aug 2017 00:39:40 +0200 Subject: [PATCH 10/16] updated travis build like maintainer template added php 7.2 and removed old parts, which now handle the zfbot --- .travis.yml | 45 ++++++++++++--------------------------------- 1 file changed, 12 insertions(+), 33 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9483c500b..26fa7c8d0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,27 +2,15 @@ sudo: false language: php -branches: - except: - - /^release-.*$/ - - /^ghgfk-.*$/ - cache: directories: - $HOME/.composer/cache - - $HOME/.local - - zf-mkdoc-theme env: global: - COMPOSER_ARGS="--no-interaction" - COVERAGE_DEPS="satooshi/php-coveralls" - LEGACY_DEPS="phpunit/phpunit" - - SITE_URL: https://zendframework.github.io/zend-stdlib - - GH_USER_NAME: "Matthew Weier O'Phinney" - - GH_USER_EMAIL: matthew@weierophinney.net - - GH_REF: github.com/zendframework/zend-stdlib.git - - secure: "l+YU9Igd9IUA60PE+iC4AZt2hHY9hpsSB7S2jck9fjPm0+15UCGk2G1qg5hCi+FlPslXhk6wOLLDPc40BiCrwH+m5CP9cIdkGTuNc9rVF9S5IiRLkOVxeTcdE+JRm7hZ2NBgxEiTuBLs5RlN39o41zPDFllgnJv69UmmUIMHuG3NwJJiRE9NA2EMIhZwx3UT/Zqq94MzAbYXi2xspoQ53Z/rfvVSJK6tdARp31q4NWvlYsc2YVcEWv+j3VY5luMSCMVQVNBIuXdd0hYpGt2o3H6S9azzcKRQB7saoAT/tiAEj5121tv3j3cKNQQMzI4xv7RrtQEiAhumeU3AsVDyqBmqqUQNwpnWH0RZdRry4jUKJgx0TK0yZH8ewdz6DhktBqS+c2a/FzfO3yc+LeuIy3i73NezNwCgwviOBYbWPAo4LqKtJ7gdTbVVdJaUeCtKTZ1b1k4MtaxjZjz0IK5+rxJsZ1DQF5fhJIzkjXqEEON2mHQu/qE+I7ow4Jvfs0T+KYJW6Yf5qFzBkrTUNjV60rmawaEjgxgMvtwN+MvcQ/X2OWkdjdzqzQIDdjssdRu9IBPU/G2uqzS8POL9o1j8H3NE430Tsbg+jiENlqmU+ra5wuRrmTBToli1kpgl9LyhgvjGokxAB+mwwKv7FiIQtBmSgEvsD112eSYl3HVWpdE=" matrix: fast_finish: true @@ -33,9 +21,6 @@ matrix: - php: 5.6 env: - DEPS=locked - - TEST_COVERAGE=true - - DEPLOY_DOCS="$(if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then echo -n 'true' ; else echo -n 'false' ; fi)" - - PATH="$HOME/.local/bin:$PATH" - php: 5.6 env: - DEPS=latest @@ -46,6 +31,7 @@ matrix: env: - DEPS=locked - CHECK_CS=true + - TEST_COVERAGE=true - php: 7 env: - DEPS=latest @@ -58,43 +44,36 @@ matrix: - php: 7.1 env: - DEPS=latest - - php: hhvm + - php: 7.2 env: - DEPS=lowest - - php: hhvm + - php: 7.2 env: - DEPS=locked - - php: hhvm + - php: 7.2 env: - DEPS=latest allow_failures: - - php: hhvm - -notifications: - irc: "irc.freenode.org#zftalk.dev" - email: false + - php: 7.2 before_install: + - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi - travis_retry composer self-update - - if [[ $TRAVIS_PHP_VERSION != "hhvm" && $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini ; fi install: - - travis_retry composer install $COMPOSER_ARGS + - travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs - if [[ $TRAVIS_PHP_VERSION =~ ^5.6 ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi - if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi - if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi - - stty cols 120 - - COLUMNS=120 composer show + - stty cols 120 && composer show script: - - if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; fi - - if [[ $TEST_COVERAGE != 'true' ]]; then composer test ; fi + - if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; else composer test ; fi - if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi - - if [[ $DEPLOY_DOCS == "true" && "$TRAVIS_TEST_RESULT" == "0" ]]; then wget -O theme-installer.sh "https://raw.githubusercontent.com/zendframework/zf-mkdoc-theme/master/theme-installer.sh" ; chmod 755 theme-installer.sh ; ./theme-installer.sh ; fi - -after_success: - - if [[ $DEPLOY_DOCS == "true" ]]; then echo "Preparing to build and deploy documentation" ; ./zf-mkdoc-theme/deploy.sh ; echo "Completed deploying documentation" ; fi after_script: - if [[ $TEST_COVERAGE == 'true' ]]; then composer upload-coverage ; fi + +notifications: + email: false \ No newline at end of file From 88dbbd479119987809db95c9c394e8e0866c6520 Mon Sep 17 00:00:00 2001 From: KoKsPfLaNzE Date: Thu, 24 Aug 2017 00:45:53 +0200 Subject: [PATCH 11/16] added doctrine/instantiator to LEGACY_DEPS --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 26fa7c8d0..bb143f7e9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ env: global: - COMPOSER_ARGS="--no-interaction" - COVERAGE_DEPS="satooshi/php-coveralls" - - LEGACY_DEPS="phpunit/phpunit" + - LEGACY_DEPS="phpunit/phpunit doctrine/instantiator" matrix: fast_finish: true From 84b1afae2fc799ec3a1e66a542e762e86b3b4658 Mon Sep 17 00:00:00 2001 From: KoKsPfLaNzE Date: Thu, 24 Aug 2017 00:50:19 +0200 Subject: [PATCH 12/16] LEGACY_DEPS added for PHP56 and PHP70 --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index bb143f7e9..255810e20 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,8 @@ env: global: - COMPOSER_ARGS="--no-interaction" - COVERAGE_DEPS="satooshi/php-coveralls" - - LEGACY_DEPS="phpunit/phpunit doctrine/instantiator" + - LEGACY_DEPS_PHP_56="phpunit/phpunit" + - LEGACY_DEPS_PHP_70="doctrine/instantiator" matrix: fast_finish: true @@ -62,7 +63,8 @@ before_install: install: - travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs - - if [[ $TRAVIS_PHP_VERSION =~ ^5.6 ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi + - if [[ $TRAVIS_PHP_VERSION =~ ^5.6 ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS_PHP_56 ; fi + - if [[ $TRAVIS_PHP_VERSION =~ ^7.0 ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS_PHP_70 ; fi - if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi - if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi From 856ab79e336d555361c1d0c85d69e9f4209f6d1d Mon Sep 17 00:00:00 2001 From: KoKsPfLaNzE Date: Thu, 24 Aug 2017 00:57:34 +0200 Subject: [PATCH 13/16] check if php7 updated --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 255810e20..9ef65c439 100644 --- a/.travis.yml +++ b/.travis.yml @@ -64,7 +64,7 @@ before_install: install: - travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs - if [[ $TRAVIS_PHP_VERSION =~ ^5.6 ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS_PHP_56 ; fi - - if [[ $TRAVIS_PHP_VERSION =~ ^7.0 ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS_PHP_70 ; fi + - if [[ "$TRAVIS_PHP_VERSION" = "7.0" ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS_PHP_70 ; fi - if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi - if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi From b1a817d3de6bbf671cab8be4f26dc238ec1a801a Mon Sep 17 00:00:00 2001 From: KoKsPfLaNzE Date: Thu, 24 Aug 2017 01:16:00 +0200 Subject: [PATCH 14/16] removed php70 legacy components --- .travis.yml | 6 ++---- composer.lock | 23 +++++++++++++---------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9ef65c439..26fa7c8d0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,8 +10,7 @@ env: global: - COMPOSER_ARGS="--no-interaction" - COVERAGE_DEPS="satooshi/php-coveralls" - - LEGACY_DEPS_PHP_56="phpunit/phpunit" - - LEGACY_DEPS_PHP_70="doctrine/instantiator" + - LEGACY_DEPS="phpunit/phpunit" matrix: fast_finish: true @@ -63,8 +62,7 @@ before_install: install: - travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs - - if [[ $TRAVIS_PHP_VERSION =~ ^5.6 ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS_PHP_56 ; fi - - if [[ "$TRAVIS_PHP_VERSION" = "7.0" ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS_PHP_70 ; fi + - if [[ $TRAVIS_PHP_VERSION =~ ^5.6 ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi - if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi - if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi diff --git a/composer.lock b/composer.lock index e9a08b6a8..5d8ff0ac7 100644 --- a/composer.lock +++ b/composer.lock @@ -61,32 +61,32 @@ }, { "name": "doctrine/instantiator", - "version": "1.1.0", + "version": "1.0.5", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda" + "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda", - "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d", + "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d", "shasum": "" }, "require": { - "php": "^7.1" + "php": ">=5.3,<8.0-DEV" }, "require-dev": { "athletic/athletic": "~0.1.8", "ext-pdo": "*", "ext-phar": "*", - "phpunit/phpunit": "^6.2.3", - "squizlabs/php_codesniffer": "^3.0.2" + "phpunit/phpunit": "~4.0", + "squizlabs/php_codesniffer": "~2.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2.x-dev" + "dev-master": "1.0.x-dev" } }, "autoload": { @@ -111,7 +111,7 @@ "constructor", "instantiate" ], - "time": "2017-07-22T11:58:36+00:00" + "time": "2015-06-14T21:17:01+00:00" }, { "name": "kevinlebrun/colors.php", @@ -1774,5 +1774,8 @@ "platform": { "php": "^5.6 || ^7.0" }, - "platform-dev": [] + "platform-dev": [], + "platform-overrides": { + "php": "7.0.21" + } } From 3930b2f753270246b010c9bebcb2fcab0d355404 Mon Sep 17 00:00:00 2001 From: Oliver Date: Thu, 24 Aug 2017 09:48:41 +0200 Subject: [PATCH 15/16] added new line --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 26fa7c8d0..be3a54a4a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -76,4 +76,5 @@ after_script: - if [[ $TEST_COVERAGE == 'true' ]]; then composer upload-coverage ; fi notifications: - email: false \ No newline at end of file + email: false + From c17be41898d4b2623e8b0f0af4d6e67fadc5e451 Mon Sep 17 00:00:00 2001 From: Oliver Date: Thu, 24 Aug 2017 10:38:37 +0200 Subject: [PATCH 16/16] use method call expectException --- test/ArrayUtilsTest.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/test/ArrayUtilsTest.php b/test/ArrayUtilsTest.php index 801ef0c9b..907503ac3 100644 --- a/test/ArrayUtilsTest.php +++ b/test/ArrayUtilsTest.php @@ -513,11 +513,9 @@ public function testFiltersArray($data, $callback, $flag, $result) $this->assertEquals($result, ArrayUtils::filter($data, $callback, $flag)); } - /** - * @expectedException InvalidArgumentException - */ public function testInvalidCallableRaiseInvalidArgumentException() { + $this->expectException(InvalidArgumentException::class); ArrayUtils::filter([], "INVALID"); } }