diff --git a/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/ReportValidatorTest.php b/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/ReportValidatorTest.php index d7dcf50620550..ac141fae4be66 100644 --- a/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/ReportValidatorTest.php +++ b/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/ReportValidatorTest.php @@ -79,9 +79,9 @@ protected function setUp() * @dataProvider errorDataProvider * @param string $reportName * @param array $result - * @param \PHPUnit_Framework_MockObject_Stub $queryReturnStub + * @param \PHPUnit\Framework\MockObject\Stub $queryReturnStub */ - public function testValidate($reportName, $result, \PHPUnit_Framework_MockObject_Stub $queryReturnStub) + public function testValidate($reportName, $result, \PHPUnit\Framework\MockObject\Stub $queryReturnStub) { $connectionName = 'testConnection'; $this->queryFactoryMock->expects($this->once()) diff --git a/app/code/Magento/Checkout/Test/Unit/Controller/Index/IndexTest.php b/app/code/Magento/Checkout/Test/Unit/Controller/Index/IndexTest.php index 04723c5894f8f..b7ff79fc3c200 100644 --- a/app/code/Magento/Checkout/Test/Unit/Controller/Index/IndexTest.php +++ b/app/code/Magento/Checkout/Test/Unit/Controller/Index/IndexTest.php @@ -10,8 +10,8 @@ use Magento\Customer\Model\Session; use Magento\Framework\App\Request\Http; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; -use PHPUnit_Framework_MockObject_Builder_InvocationMocker as InvocationMocker; -use PHPUnit_Framework_MockObject_Matcher_InvokedCount as InvokedCount; +use PHPUnit\Framework\MockObject\Builder\InvocationMocker as InvocationMocker; +use PHPUnit\Framework\MockObject\Matcher\InvokedCount as InvokedCount; use PHPUnit_Framework_MockObject_MockObject as MockObject; use Magento\Checkout\Helper\Data; use Magento\Quote\Model\Quote; diff --git a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigShow/ValueProcessorTest.php b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigShow/ValueProcessorTest.php index cf758553e876d..07dcc65493a85 100644 --- a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigShow/ValueProcessorTest.php +++ b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigShow/ValueProcessorTest.php @@ -73,15 +73,15 @@ protected function setUp() /** * @param bool $hasBackendModel - * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsGetBackendModel - * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsCreate - * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsGetValue - * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsSetPath - * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsSetScope - * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsSetScopeId - * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsSetValue - * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsAfterLoad - * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsSerialize + * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsGetBackendModel + * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsCreate + * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsGetValue + * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsSetPath + * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsSetScope + * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsSetScopeId + * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsSetValue + * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsAfterLoad + * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsSerialize * @param string $expectsValue * @param string $className * @param string $value diff --git a/app/code/Magento/Config/Test/Unit/Model/Config/Structure/ElementVisibilityCompositeTest.php b/app/code/Magento/Config/Test/Unit/Model/Config/Structure/ElementVisibilityCompositeTest.php index b779c29c93155..d2a89a8abc7fa 100644 --- a/app/code/Magento/Config/Test/Unit/Model/Config/Structure/ElementVisibilityCompositeTest.php +++ b/app/code/Magento/Config/Test/Unit/Model/Config/Structure/ElementVisibilityCompositeTest.php @@ -51,9 +51,9 @@ public function testException() } /** - * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $firstExpects + * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $firstExpects * @param bool $firstResult - * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $secondExpects + * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $secondExpects * @param bool $secondResult * @param bool $expectedResult * @dataProvider visibilityDataProvider @@ -74,9 +74,9 @@ public function testDisabled($firstExpects, $firstResult, $secondExpects, $secon } /** - * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $firstExpects + * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $firstExpects * @param bool $firstResult - * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $secondExpects + * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $secondExpects * @param bool $secondResult * @param bool $expectedResult * @dataProvider visibilityDataProvider diff --git a/app/code/Magento/Developer/Test/Unit/Console/Command/DevTestsRunCommandTest.php b/app/code/Magento/Developer/Test/Unit/Console/Command/DevTestsRunCommandTest.php index 862cdc336b803..dcd79cc0521a0 100644 --- a/app/code/Magento/Developer/Test/Unit/Console/Command/DevTestsRunCommandTest.php +++ b/app/code/Magento/Developer/Test/Unit/Console/Command/DevTestsRunCommandTest.php @@ -4,50 +4,101 @@ * See COPYING.txt for license details. */ -namespace Magento\Developer\Test\Unit\Console\Command; +// @codingStandardsIgnoreStart -use Magento\Developer\Console\Command\DevTestsRunCommand; -use Symfony\Component\Console\Tester\CommandTester; +namespace Magento\Developer\Console\Command { + use Symfony\Component\Console\Tester\CommandTester; -/** - * Class DevTestsRunCommandTest - * - * Tests dev:tests:run command. Only tests error case because DevTestsRunCommand calls phpunit with - * passthru, so there is no good way to mock out running the tests. - */ -class DevTestsRunCommandTest extends \PHPUnit\Framework\TestCase -{ + $devTestsRunCommandTestPassthruReturnVar = null; /** - * @var DevTestsRunCommand + * Mock for PHP builtin passthtru function + * + * @param string $command + * @param int|null $return_var + * @return void + * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ - private $command; - - protected function setUp() + function passthru($command, &$return_var = null) { - $this->command = new DevTestsRunCommand(); + global $devTestsRunCommandTestPassthruReturnVar; + $return_var = $devTestsRunCommandTestPassthruReturnVar; } - public function testExecuteBadType() + /** + * Class DevTestsRunCommandTest + * + * Tests dev:tests:run command. Only tests error case because DevTestsRunCommand calls phpunit with + * passthru, so there is no good way to mock out running the tests. + */ + class DevTestsRunCommandTest extends \PHPUnit\Framework\TestCase { - $commandTester = new CommandTester($this->command); - $commandTester->execute([DevTestsRunCommand::INPUT_ARG_TYPE => 'bad']); - $this->assertContains('Invalid type: "bad"', $commandTester->getDisplay()); - } - public function testPassArgumentsToPHPUnit() - { - $commandTester = new CommandTester($this->command); - $commandTester->execute( - [ - DevTestsRunCommand::INPUT_ARG_TYPE => 'unit', - '-' . DevTestsRunCommand::INPUT_OPT_COMMAND_ARGUMENTS_SHORT => '--list-suites', - ] - ); - $this->assertContains( - 'phpunit --list-suites', - $commandTester->getDisplay(), - 'Parameters should be passed to PHPUnit' - ); + /** + * @var DevTestsRunCommand + */ + private $command; + + protected function setUp() + { + $this->command = new DevTestsRunCommand(); + } + + public function testExecuteBadType() + { + $commandTester = new CommandTester($this->command); + $commandTester->execute([DevTestsRunCommand::INPUT_ARG_TYPE => 'bad']); + $this->assertContains('Invalid type: "bad"', $commandTester->getDisplay()); + } + + public function testPassArgumentsToPHPUnit() + { + global $devTestsRunCommandTestPassthruReturnVar; + + $devTestsRunCommandTestPassthruReturnVar = 0; + + $commandTester = new CommandTester($this->command); + $commandTester->execute( + [ + DevTestsRunCommand::INPUT_ARG_TYPE => 'unit', + '-' . DevTestsRunCommand::INPUT_OPT_COMMAND_ARGUMENTS_SHORT => '--list-suites', + ] + ); + $this->assertContains( + 'phpunit --list-suites', + $commandTester->getDisplay(), + 'Parameters should be passed to PHPUnit' + ); + $this->assertContains( + 'PASSED (', + $commandTester->getDisplay(), + 'PHPUnit runs should have passed' + ); + } + + public function testPassArgumentsToPHPUnitNegative() + { + global $devTestsRunCommandTestPassthruReturnVar; + + $devTestsRunCommandTestPassthruReturnVar = 255; + + $commandTester = new CommandTester($this->command); + $commandTester->execute( + [ + DevTestsRunCommand::INPUT_ARG_TYPE => 'unit', + '-' . DevTestsRunCommand::INPUT_OPT_COMMAND_ARGUMENTS_SHORT => '--list-suites', + ] + ); + $this->assertContains( + 'phpunit --list-suites', + $commandTester->getDisplay(), + 'Parameters should be passed to PHPUnit' + ); + $this->assertContains( + 'FAILED - ', + $commandTester->getDisplay(), + 'PHPUnit runs should have passed' + ); + } } } diff --git a/app/code/Magento/Downloadable/Test/Unit/Ui/DataProvider/Product/Form/Modifier/Data/LinksTest.php b/app/code/Magento/Downloadable/Test/Unit/Ui/DataProvider/Product/Form/Modifier/Data/LinksTest.php index dd8e8ff38e931..93e691c931603 100644 --- a/app/code/Magento/Downloadable/Test/Unit/Ui/DataProvider/Product/Form/Modifier/Data/LinksTest.php +++ b/app/code/Magento/Downloadable/Test/Unit/Ui/DataProvider/Product/Form/Modifier/Data/LinksTest.php @@ -98,8 +98,8 @@ protected function setUp() /** * @param int|null $id * @param string $typeId - * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectedGetTitle - * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectedGetValue + * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectedGetTitle + * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectedGetValue * @return void * @dataProvider getLinksTitleDataProvider */ diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml index d8514ca77f9c2..da553b7823da9 100644 --- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml +++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml @@ -79,7 +79,7 @@ if (isset($methodsForms[$code])) { $block->setMethodFormTemplate($code, $methodsForms[$code]); } - ?> + ?>
1) : ?> getOrderIds();

- escapeHtml(__('Not all items were included.')); ?> + escapeHtml(__('Not all items were included.')); ?> escapeHtml(__('For details, see')); ?> escapeHtml(__('Failed to Order')); ?> diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/success.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/success.phtml index 57c4afaee6541..0fe046800a80d 100644 --- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/success.phtml +++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/success.phtml @@ -24,9 +24,9 @@ escapeHtml(__('Ship to:')); ?> - escapeHtml( - $block->getCheckoutData()->formatOrderShippingAddress($shippingAddress) - ); ?> + escapeHtml( + $block->getCheckoutData()->formatOrderShippingAddress($shippingAddress) + ); ?> diff --git a/app/code/Magento/Persistent/Test/Unit/Observer/CheckExpirePersistentQuoteObserverTest.php b/app/code/Magento/Persistent/Test/Unit/Observer/CheckExpirePersistentQuoteObserverTest.php index 8cad0b9f2dd89..46dda1be365d4 100644 --- a/app/code/Magento/Persistent/Test/Unit/Observer/CheckExpirePersistentQuoteObserverTest.php +++ b/app/code/Magento/Persistent/Test/Unit/Observer/CheckExpirePersistentQuoteObserverTest.php @@ -113,18 +113,18 @@ public function testExecuteWhenPersistentIsNotEnabled() * * @param string $refererUri * @param string $requestUri - * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expireCounter - * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $dispatchCounter - * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $setCustomerIdCounter + * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expireCounter + * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $dispatchCounter + * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $setCustomerIdCounter * @return void * @dataProvider requestDataProvider */ public function testExecuteWhenPersistentIsEnabled( string $refererUri, string $requestUri, - \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expireCounter, - \PHPUnit_Framework_MockObject_Matcher_InvokedCount $dispatchCounter, - \PHPUnit_Framework_MockObject_Matcher_InvokedCount $setCustomerIdCounter + \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expireCounter, + \PHPUnit\Framework\MockObject\Matcher\InvokedCount $dispatchCounter, + \PHPUnit\Framework\MockObject\Matcher\InvokedCount $setCustomerIdCounter ): void { $this->persistentHelperMock ->expects($this->once()) diff --git a/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Order/CollectionTest.php b/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Order/CollectionTest.php index bf58e214ef4a6..3ad9827c7f462 100644 --- a/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Order/CollectionTest.php +++ b/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Order/CollectionTest.php @@ -202,7 +202,7 @@ public function testCheckIsLive() * @param int $useAggregatedData * @param string $mainTable * @param int $isFilter - * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $getIfNullSqlResult + * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $getIfNullSqlResult * @dataProvider useAggregatedDataDataProvider * @return void */ @@ -309,7 +309,7 @@ public function testAddItemCountExpr() * @param int $isFilter * @param int $useAggregatedData * @param string $mainTable - * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $getIfNullSqlResult + * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $getIfNullSqlResult * @dataProvider totalsDataProvider * @return void */ diff --git a/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Report/Product/ViewedTest.php b/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Report/Product/ViewedTest.php index 17e13f9d64bd7..df9f0d2139221 100644 --- a/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Report/Product/ViewedTest.php +++ b/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Report/Product/ViewedTest.php @@ -190,8 +190,8 @@ function ($arg) { /** * @param mixed $from * @param mixed $to - * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $truncateCount - * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $deleteCount + * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $truncateCount + * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $deleteCount * @dataProvider intervalsDataProvider * @return void */ diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/AbstractSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/AbstractSenderTest.php index afb76c982d7c2..2297d6aa711cf 100644 --- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/AbstractSenderTest.php +++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/AbstractSenderTest.php @@ -168,8 +168,8 @@ public function stepIdentityContainerInit($identityMockClassName) * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $sendCopyToExpects */ protected function stepSend( - \PHPUnit_Framework_MockObject_Matcher_InvokedCount $sendExpects, - \PHPUnit_Framework_MockObject_Matcher_InvokedCount $sendCopyToExpects + \PHPUnit\Framework\MockObject\Matcher\InvokedCount $sendExpects, + \PHPUnit\Framework\MockObject\Matcher\InvokedCount $sendCopyToExpects ) { $senderMock = $this->createPartialMock(\Magento\Sales\Model\Order\Email\Sender::class, ['send', 'sendCopyTo']); $senderMock->expects($sendExpects) diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml index da37433758aeb..c69d453fb81d5 100644 --- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml +++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml @@ -17,7 +17,7 @@ getCode(); $_counter++; - ?> + ?>

1) : ?> =0.1.11", "magento/zendframework1": "~1.14.0", "monolog/monolog": "^1.17", "oyejorge/less.php": "~1.7.0", "pelago/emogrifier": "^2.0.0", "php-amqplib/php-amqplib": "~2.7.0", - "phpseclib/mcrypt_compat": "1.0.4", + "phpseclib/mcrypt_compat": "1.0.5", "phpseclib/phpseclib": "2.0.*", "ramsey/uuid": "~3.7.3", - "symfony/console": "~4.0.0", - "symfony/event-dispatcher": "~4.0.0", - "symfony/process": "~4.0.0", + "symfony/console": "~4.1.0", + "symfony/event-dispatcher": "~4.1.0", + "symfony/process": "~4.1.0", "tedivm/jshrink": "~1.3.0", "tubalmartin/cssmin": "4.1.1", "webonyx/graphql-php": "^0.11.1", @@ -81,13 +81,13 @@ "zendframework/zend-view": "~2.10.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "~2.10.0", + "friendsofphp/php-cs-fixer": "~2.12.0", "lusitanian/oauth": "~0.8.10", "pdepend/pdepend": "2.5.2", "phpmd/phpmd": "@stable", - "phpunit/phpunit": "~6.2.0", + "phpunit/phpunit": "~6.5.0", "sebastian/phpcpd": "~3.0.0", - "squizlabs/php_codesniffer": "3.2.2" + "squizlabs/php_codesniffer": "3.3.0" }, "replace": { "magento/module-marketplace": "*", diff --git a/composer.lock b/composer.lock index b104cf2929ba7..0966aee19489e 100644 --- a/composer.lock +++ b/composer.lock @@ -1,23 +1,23 @@ { "_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", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "daacd8800615d44aa1af0ac06c1ecc46", + "content-hash": "c6ae2be0f066e566e8280b2954aad257", "packages": [ { "name": "braintree/braintree_php", - "version": "3.28.0", + "version": "3.34.0", "source": { "type": "git", "url": "https://github.com/braintree/braintree_php.git", - "reference": "f8ab5ca7b3397536de622fc9640e5b257fc33e71" + "reference": "fd55c466d0d0088c67705d7ba0b3876d9767bfda" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/braintree/braintree_php/zipball/f8ab5ca7b3397536de622fc9640e5b257fc33e71", - "reference": "f8ab5ca7b3397536de622fc9640e5b257fc33e71", + "url": "https://api.github.com/repos/braintree/braintree_php/zipball/fd55c466d0d0088c67705d7ba0b3876d9767bfda", + "reference": "fd55c466d0d0088c67705d7ba0b3876d9767bfda", "shasum": "" }, "require": { @@ -51,7 +51,7 @@ } ], "description": "Braintree PHP Client Library", - "time": "2018-02-08T23:03:34+00:00" + "time": "2018-05-21T18:14:47+00:00" }, { "name": "colinmollenhour/cache-backend-file", @@ -88,16 +88,16 @@ }, { "name": "colinmollenhour/cache-backend-redis", - "version": "1.10.4", + "version": "1.10.5", "source": { "type": "git", "url": "https://github.com/colinmollenhour/Cm_Cache_Backend_Redis.git", - "reference": "6bf0a4b7a3f8dc4a6255fad5b6e42213253d9972" + "reference": "91d949e28d939e607484a4bbf9307cff5afa689b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/colinmollenhour/Cm_Cache_Backend_Redis/zipball/6bf0a4b7a3f8dc4a6255fad5b6e42213253d9972", - "reference": "6bf0a4b7a3f8dc4a6255fad5b6e42213253d9972", + "url": "https://api.github.com/repos/colinmollenhour/Cm_Cache_Backend_Redis/zipball/91d949e28d939e607484a4bbf9307cff5afa689b", + "reference": "91d949e28d939e607484a4bbf9307cff5afa689b", "shasum": "" }, "require": { @@ -120,20 +120,20 @@ ], "description": "Zend_Cache backend using Redis with full support for tags.", "homepage": "https://github.com/colinmollenhour/Cm_Cache_Backend_Redis", - "time": "2017-10-05T20:50:44+00:00" + "time": "2018-05-15T16:02:25+00:00" }, { "name": "colinmollenhour/credis", - "version": "1.9.1", + "version": "1.10.0", "source": { "type": "git", "url": "https://github.com/colinmollenhour/credis.git", - "reference": "049ccfb2c680e4dfa6adcfa97f2f29d086919abd" + "reference": "8ab6db707c821055f9856b8cf76d5f44beb6fd8a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/colinmollenhour/credis/zipball/049ccfb2c680e4dfa6adcfa97f2f29d086919abd", - "reference": "049ccfb2c680e4dfa6adcfa97f2f29d086919abd", + "url": "https://api.github.com/repos/colinmollenhour/credis/zipball/8ab6db707c821055f9856b8cf76d5f44beb6fd8a", + "reference": "8ab6db707c821055f9856b8cf76d5f44beb6fd8a", "shasum": "" }, "require": { @@ -160,20 +160,20 @@ ], "description": "Credis is a lightweight interface to the Redis key-value store which wraps the phpredis library when available for better performance.", "homepage": "https://github.com/colinmollenhour/credis", - "time": "2017-10-05T20:28:58+00:00" + "time": "2018-05-07T14:45:04+00:00" }, { "name": "colinmollenhour/php-redis-session-abstract", - "version": "v1.3.8", + "version": "v1.4.0", "source": { "type": "git", "url": "https://github.com/colinmollenhour/php-redis-session-abstract.git", - "reference": "9f69f5c1be512d5ff168e731e7fa29ab2905d847" + "reference": "4cb15d557f58f45ad257cbcce3c12511e6deb5bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/colinmollenhour/php-redis-session-abstract/zipball/9f69f5c1be512d5ff168e731e7fa29ab2905d847", - "reference": "9f69f5c1be512d5ff168e731e7fa29ab2905d847", + "url": "https://api.github.com/repos/colinmollenhour/php-redis-session-abstract/zipball/4cb15d557f58f45ad257cbcce3c12511e6deb5bc", + "reference": "4cb15d557f58f45ad257cbcce3c12511e6deb5bc", "shasum": "" }, "require": { @@ -197,7 +197,7 @@ ], "description": "A Redis-based session handler with optimistic locking", "homepage": "https://github.com/colinmollenhour/php-redis-session-abstract", - "time": "2018-01-08T14:53:13+00:00" + "time": "2018-03-29T15:54:15+00:00" }, { "name": "composer/ca-bundle", @@ -257,16 +257,16 @@ }, { "name": "composer/composer", - "version": "1.6.4", + "version": "1.6.5", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "86ad51e8a3c64c9782446aae740a61fc6faa2522" + "reference": "b184a92419cc9a9c4c6a09db555a94d441cb11c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/86ad51e8a3c64c9782446aae740a61fc6faa2522", - "reference": "86ad51e8a3c64c9782446aae740a61fc6faa2522", + "url": "https://api.github.com/repos/composer/composer/zipball/b184a92419cc9a9c4c6a09db555a94d441cb11c9", + "reference": "b184a92419cc9a9c4c6a09db555a94d441cb11c9", "shasum": "" }, "require": { @@ -284,6 +284,9 @@ "symfony/finder": "^2.7 || ^3.0 || ^4.0", "symfony/process": "^2.7 || ^3.0 || ^4.0" }, + "conflict": { + "symfony/console": "2.8.38" + }, "require-dev": { "phpunit/phpunit": "^4.8.35 || ^5.7", "phpunit/phpunit-mock-objects": "^2.3 || ^3.0" @@ -330,7 +333,7 @@ "dependency", "package" ], - "time": "2018-04-13T10:04:24+00:00" + "time": "2018-05-04T09:44:59+00:00" }, { "name": "composer/semver", @@ -396,16 +399,16 @@ }, { "name": "composer/spdx-licenses", - "version": "1.3.0", + "version": "1.4.0", "source": { "type": "git", "url": "https://github.com/composer/spdx-licenses.git", - "reference": "7e111c50db92fa2ced140f5ba23b4e261bc77a30" + "reference": "cb17687e9f936acd7e7245ad3890f953770dec1b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/7e111c50db92fa2ced140f5ba23b4e261bc77a30", - "reference": "7e111c50db92fa2ced140f5ba23b4e261bc77a30", + "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/cb17687e9f936acd7e7245ad3890f953770dec1b", + "reference": "cb17687e9f936acd7e7245ad3890f953770dec1b", "shasum": "" }, "require": { @@ -453,7 +456,7 @@ "spdx", "validator" ], - "time": "2018-01-31T13:17:27+00:00" + "time": "2018-04-30T10:33:04+00:00" }, { "name": "container-interop/container-interop", @@ -710,22 +713,22 @@ }, { "name": "magento/composer", - "version": "1.3.0", + "version": "1.4.0", "source": { "type": "git", "url": "https://github.com/magento/composer.git", - "reference": "38fdaa51967cd3dbed85cf695b6a70e3c2ff8a92" + "reference": "6fb9eb3dd72a5e70aa53983f132f8e1883e79978" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/magento/composer/zipball/38fdaa51967cd3dbed85cf695b6a70e3c2ff8a92", - "reference": "38fdaa51967cd3dbed85cf695b6a70e3c2ff8a92", + "url": "https://api.github.com/repos/magento/composer/zipball/6fb9eb3dd72a5e70aa53983f132f8e1883e79978", + "reference": "6fb9eb3dd72a5e70aa53983f132f8e1883e79978", "shasum": "" }, "require": { "composer/composer": "^1.6", "php": "~7.1.3|~7.2.0", - "symfony/console": "~4.0.0" + "symfony/console": "~4.0.0 || ~4.1.0" }, "require-dev": { "phpunit/phpunit": "~7.0.0" @@ -742,7 +745,7 @@ "AFL-3.0" ], "description": "Magento composer library helps to instantiate Composer application and run composer commands.", - "time": "2018-03-26T16:19:52+00:00" + "time": "2018-06-29T18:46:51+00:00" }, { "name": "magento/magento-composer-installer", @@ -1022,16 +1025,16 @@ }, { "name": "paragonie/random_compat", - "version": "v2.0.12", + "version": "v2.0.15", "source": { "type": "git", "url": "https://github.com/paragonie/random_compat.git", - "reference": "258c89a6b97de7dfaf5b8c7607d0478e236b04fb" + "reference": "10bcb46e8f3d365170f6de9d05245aa066b81f09" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/258c89a6b97de7dfaf5b8c7607d0478e236b04fb", - "reference": "258c89a6b97de7dfaf5b8c7607d0478e236b04fb", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/10bcb46e8f3d365170f6de9d05245aa066b81f09", + "reference": "10bcb46e8f3d365170f6de9d05245aa066b81f09", "shasum": "" }, "require": { @@ -1063,10 +1066,11 @@ "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7", "keywords": [ "csprng", + "polyfill", "pseudorandom", "random" ], - "time": "2018-04-04T21:24:14+00:00" + "time": "2018-06-08T15:26:40+00:00" }, { "name": "pelago/emogrifier", @@ -1210,21 +1214,21 @@ }, { "name": "phpseclib/mcrypt_compat", - "version": "1.0.4", + "version": "1.0.5", "source": { "type": "git", "url": "https://github.com/phpseclib/mcrypt_compat.git", - "reference": "034ee0e920c70b589196d0bb0a7e8babae5fce08" + "reference": "9646c46c7286284bd6c774b0c02f172fa302b879" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpseclib/mcrypt_compat/zipball/034ee0e920c70b589196d0bb0a7e8babae5fce08", - "reference": "034ee0e920c70b589196d0bb0a7e8babae5fce08", + "url": "https://api.github.com/repos/phpseclib/mcrypt_compat/zipball/9646c46c7286284bd6c774b0c02f172fa302b879", + "reference": "9646c46c7286284bd6c774b0c02f172fa302b879", "shasum": "" }, "require": { "php": ">=5.3.3", - "phpseclib/phpseclib": "~2.0" + "phpseclib/phpseclib": ">=2.0.10 <3.0.0" }, "require-dev": { "phpunit/phpunit": "^4.8.35|^5.7|^6.0" @@ -1255,7 +1259,7 @@ "encryption", "mcrypt" ], - "time": "2018-01-13T23:07:52+00:00" + "time": "2018-04-15T18:49:21+00:00" }, { "name": "phpseclib/phpseclib", @@ -1577,16 +1581,16 @@ }, { "name": "react/promise", - "version": "v2.5.1", + "version": "v2.7.0", "source": { "type": "git", "url": "https://github.com/reactphp/promise.git", - "reference": "62785ae604c8d69725d693eb370e1d67e94c4053" + "reference": "f4edc2581617431aea50430749db55cc3fc031b3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/reactphp/promise/zipball/62785ae604c8d69725d693eb370e1d67e94c4053", - "reference": "62785ae604c8d69725d693eb370e1d67e94c4053", + "url": "https://api.github.com/repos/reactphp/promise/zipball/f4edc2581617431aea50430749db55cc3fc031b3", + "reference": "f4edc2581617431aea50430749db55cc3fc031b3", "shasum": "" }, "require": { @@ -1619,7 +1623,7 @@ "promise", "promises" ], - "time": "2017-03-25T12:08:31+00:00" + "time": "2018-06-13T15:59:06+00:00" }, { "name": "seld/cli-prompt", @@ -1764,16 +1768,16 @@ }, { "name": "symfony/console", - "version": "v4.0.8", + "version": "v4.1.1", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "aad9a6fe47319f22748fd764f52d3a7ca6fa6b64" + "reference": "70591cda56b4b47c55776ac78e157c4bb6c8b43f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/aad9a6fe47319f22748fd764f52d3a7ca6fa6b64", - "reference": "aad9a6fe47319f22748fd764f52d3a7ca6fa6b64", + "url": "https://api.github.com/repos/symfony/console/zipball/70591cda56b4b47c55776ac78e157c4bb6c8b43f", + "reference": "70591cda56b4b47c55776ac78e157c4bb6c8b43f", "shasum": "" }, "require": { @@ -1793,7 +1797,7 @@ "symfony/process": "~3.4|~4.0" }, "suggest": { - "psr/log": "For using the console logger", + "psr/log-implementation": "For using the console logger", "symfony/event-dispatcher": "", "symfony/lock": "", "symfony/process": "" @@ -1801,7 +1805,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -1828,20 +1832,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2018-04-03T05:24:00+00:00" + "time": "2018-05-31T10:17:53+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v4.0.8", + "version": "v4.1.1", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "63353a71073faf08f62caab4e6889b06a787f07b" + "reference": "2391ed210a239868e7256eb6921b1bd83f3087b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/63353a71073faf08f62caab4e6889b06a787f07b", - "reference": "63353a71073faf08f62caab4e6889b06a787f07b", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/2391ed210a239868e7256eb6921b1bd83f3087b5", + "reference": "2391ed210a239868e7256eb6921b1bd83f3087b5", "shasum": "" }, "require": { @@ -1864,7 +1868,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -1891,29 +1895,30 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2018-04-06T07:35:43+00:00" + "time": "2018-04-06T07:35:57+00:00" }, { "name": "symfony/filesystem", - "version": "v4.0.8", + "version": "v4.1.1", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "5d2d655b2c72fc4d9bf7e9bf14f72a447b940f21" + "reference": "562bf7005b55fd80d26b582d28e3e10f2dd5ae9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/5d2d655b2c72fc4d9bf7e9bf14f72a447b940f21", - "reference": "5d2d655b2c72fc4d9bf7e9bf14f72a447b940f21", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/562bf7005b55fd80d26b582d28e3e10f2dd5ae9c", + "reference": "562bf7005b55fd80d26b582d28e3e10f2dd5ae9c", "shasum": "" }, "require": { - "php": "^7.1.3" + "php": "^7.1.3", + "symfony/polyfill-ctype": "~1.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -1940,20 +1945,20 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2018-02-22T10:50:29+00:00" + "time": "2018-05-30T07:26:09+00:00" }, { "name": "symfony/finder", - "version": "v4.0.8", + "version": "v4.1.1", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "ca27c02b7a3fef4828c998c2ff9ba7aae1641c49" + "reference": "84714b8417d19e4ba02ea78a41a975b3efaafddb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/ca27c02b7a3fef4828c998c2ff9ba7aae1641c49", - "reference": "ca27c02b7a3fef4828c998c2ff9ba7aae1641c49", + "url": "https://api.github.com/repos/symfony/finder/zipball/84714b8417d19e4ba02ea78a41a975b3efaafddb", + "reference": "84714b8417d19e4ba02ea78a41a975b3efaafddb", "shasum": "" }, "require": { @@ -1962,7 +1967,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -1989,20 +1994,75 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2018-04-04T05:10:37+00:00" + "time": "2018-06-19T21:38:16+00:00" + }, + { + "name": "symfony/polyfill-ctype", + "version": "v1.8.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-ctype.git", + "reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/7cc359f1b7b80fc25ed7796be7d96adc9b354bae", + "reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.8-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Ctype\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + }, + { + "name": "Gert de Pagter", + "email": "BackEndTea@gmail.com" + } + ], + "description": "Symfony polyfill for ctype functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "ctype", + "polyfill", + "portable" + ], + "time": "2018-04-30T19:57:29+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.7.0", + "version": "v1.8.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b" + "reference": "3296adf6a6454a050679cde90f95350ad604b171" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/78be803ce01e55d3491c1397cf1c64beb9c1b63b", - "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/3296adf6a6454a050679cde90f95350ad604b171", + "reference": "3296adf6a6454a050679cde90f95350ad604b171", "shasum": "" }, "require": { @@ -2014,7 +2074,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.7-dev" + "dev-master": "1.8-dev" } }, "autoload": { @@ -2048,20 +2108,20 @@ "portable", "shim" ], - "time": "2018-01-30T19:27:44+00:00" + "time": "2018-04-26T10:06:28+00:00" }, { "name": "symfony/process", - "version": "v4.0.8", + "version": "v4.1.1", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "d7dc1ee5dfe9f732cb1bba7310f5b99f2b7a6d25" + "reference": "1d1677391ecf00d1c5b9482d6050c0c27aa3ac3a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/d7dc1ee5dfe9f732cb1bba7310f5b99f2b7a6d25", - "reference": "d7dc1ee5dfe9f732cb1bba7310f5b99f2b7a6d25", + "url": "https://api.github.com/repos/symfony/process/zipball/1d1677391ecf00d1c5b9482d6050c0c27aa3ac3a", + "reference": "1d1677391ecf00d1c5b9482d6050c0c27aa3ac3a", "shasum": "" }, "require": { @@ -2070,7 +2130,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -2097,7 +2157,7 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2018-04-03T05:24:00+00:00" + "time": "2018-05-31T10:17:53+00:00" }, { "name": "tedivm/jshrink", @@ -2145,6 +2205,52 @@ ], "time": "2017-12-08T00:59:56+00:00" }, + { + "name": "true/punycode", + "version": "v2.1.1", + "source": { + "type": "git", + "url": "https://github.com/true/php-punycode.git", + "reference": "a4d0c11a36dd7f4e7cd7096076cab6d3378a071e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/true/php-punycode/zipball/a4d0c11a36dd7f4e7cd7096076cab6d3378a071e", + "reference": "a4d0c11a36dd7f4e7cd7096076cab6d3378a071e", + "shasum": "" + }, + "require": { + "php": ">=5.3.0", + "symfony/polyfill-mbstring": "^1.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.7", + "squizlabs/php_codesniffer": "~2.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "TrueBV\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Renan Gonçalves", + "email": "renan.saddam@gmail.com" + } + ], + "description": "A Bootstring encoding of Unicode for Internationalized Domain Names in Applications (IDNA)", + "homepage": "https://github.com/true/php-punycode", + "keywords": [ + "idna", + "punycode" + ], + "time": "2016-11-16T10:37:54+00:00" + }, { "name": "tubalmartin/cssmin", "version": "v4.1.1", @@ -2200,16 +2306,16 @@ }, { "name": "webonyx/graphql-php", - "version": "v0.11.5", + "version": "v0.11.6", "source": { "type": "git", "url": "https://github.com/webonyx/graphql-php.git", - "reference": "b97cad0f4a50131c85d9224e8e36ebbcf1c6b425" + "reference": "f438a726cd523bc584e78d866eca270165c42fd5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/b97cad0f4a50131c85d9224e8e36ebbcf1c6b425", - "reference": "b97cad0f4a50131c85d9224e8e36ebbcf1c6b425", + "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/f438a726cd523bc584e78d866eca270165c42fd5", + "reference": "f438a726cd523bc584e78d866eca270165c42fd5", "shasum": "" }, "require": { @@ -2235,7 +2341,7 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD" + "MIT" ], "description": "A PHP port of GraphQL reference implementation", "homepage": "https://github.com/webonyx/graphql-php", @@ -2243,33 +2349,33 @@ "api", "graphql" ], - "time": "2017-12-12T09:03:21+00:00" + "time": "2018-04-17T10:34:43+00:00" }, { "name": "zendframework/zend-captcha", - "version": "2.7.1", + "version": "2.8.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-captcha.git", - "reference": "2d56293a5ae3e45e7c8ee7030aa8b305768d8014" + "reference": "37e9b6a4f632a9399eecbf2e5e325ad89083f87b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-captcha/zipball/2d56293a5ae3e45e7c8ee7030aa8b305768d8014", - "reference": "2d56293a5ae3e45e7c8ee7030aa8b305768d8014", + "url": "https://api.github.com/repos/zendframework/zend-captcha/zipball/37e9b6a4f632a9399eecbf2e5e325ad89083f87b", + "reference": "37e9b6a4f632a9399eecbf2e5e325ad89083f87b", "shasum": "" }, "require": { "php": "^5.6 || ^7.0", - "zendframework/zend-math": "^2.6 || ^3.0", - "zendframework/zend-stdlib": "^2.7 || ^3.0" + "zendframework/zend-math": "^2.7 || ^3.0", + "zendframework/zend-stdlib": "^2.7.7 || ^3.1" }, "require-dev": { - "phpunit/phpunit": "~4.8", + "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2", "zendframework/zend-coding-standard": "~1.0.0", - "zendframework/zend-session": "^2.6", + "zendframework/zend-session": "^2.8", "zendframework/zend-text": "^2.6", - "zendframework/zend-validator": "^2.6", + "zendframework/zend-validator": "^2.10.1", "zendframework/zendservice-recaptcha": "^3.0" }, "suggest": { @@ -2282,8 +2388,8 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev", - "dev-develop": "2.8-dev" + "dev-master": "2.8.x-dev", + "dev-develop": "2.9.x-dev" } }, "autoload": { @@ -2295,12 +2401,13 @@ "license": [ "BSD-3-Clause" ], - "homepage": "https://github.com/zendframework/zend-captcha", + "description": "Generate and validate CAPTCHAs using Figlets, images, ReCaptcha, and more", "keywords": [ + "ZendFramework", "captcha", - "zf2" + "zf" ], - "time": "2017-02-23T08:09:44+00:00" + "time": "2018-04-24T17:24:10+00:00" }, { "name": "zendframework/zend-code", @@ -2621,16 +2728,16 @@ }, { "name": "zendframework/zend-diactoros", - "version": "1.7.1", + "version": "1.8.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-diactoros.git", - "reference": "bf26aff803a11c5cc8eb7c4878a702c403ec67f1" + "reference": "11c9c1835e60eef6f9234377a480fcec096ebd9e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/bf26aff803a11c5cc8eb7c4878a702c403ec67f1", - "reference": "bf26aff803a11c5cc8eb7c4878a702c403ec67f1", + "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/11c9c1835e60eef6f9234377a480fcec096ebd9e", + "reference": "11c9c1835e60eef6f9234377a480fcec096ebd9e", "shasum": "" }, "require": { @@ -2649,11 +2756,22 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.7.x-dev", - "dev-develop": "1.8.x-dev" + "dev-master": "1.8.x-dev", + "dev-develop": "1.9.x-dev", + "dev-release-2.0": "2.0.x-dev" } }, "autoload": { + "files": [ + "src/functions/create_uploaded_file.php", + "src/functions/marshal_headers_from_sapi.php", + "src/functions/marshal_method_from_sapi.php", + "src/functions/marshal_protocol_version_from_sapi.php", + "src/functions/marshal_uri_from_sapi.php", + "src/functions/normalize_server.php", + "src/functions/normalize_uploaded_files.php", + "src/functions/parse_cookie_header.php" + ], "psr-4": { "Zend\\Diactoros\\": "src/" } @@ -2669,34 +2787,34 @@ "psr", "psr-7" ], - "time": "2018-02-26T15:44:50+00:00" + "time": "2018-06-27T18:52:43+00:00" }, { "name": "zendframework/zend-escaper", - "version": "2.5.2", + "version": "2.6.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-escaper.git", - "reference": "2dcd14b61a72d8b8e27d579c6344e12c26141d4e" + "reference": "31d8aafae982f9568287cb4dce987e6aff8fd074" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-escaper/zipball/2dcd14b61a72d8b8e27d579c6344e12c26141d4e", - "reference": "2dcd14b61a72d8b8e27d579c6344e12c26141d4e", + "url": "https://api.github.com/repos/zendframework/zend-escaper/zipball/31d8aafae982f9568287cb4dce987e6aff8fd074", + "reference": "31d8aafae982f9568287cb4dce987e6aff8fd074", "shasum": "" }, "require": { - "php": ">=5.5" + "php": "^5.6 || ^7.0" }, "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0" + "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2", + "zendframework/zend-coding-standard": "~1.0.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.5-dev", - "dev-develop": "2.6-dev" + "dev-master": "2.6.x-dev", + "dev-develop": "2.7.x-dev" } }, "autoload": { @@ -2708,12 +2826,13 @@ "license": [ "BSD-3-Clause" ], - "homepage": "https://github.com/zendframework/zend-escaper", + "description": "Securely and safely escape HTML, HTML attributes, JavaScript, CSS, and URLs", "keywords": [ + "ZendFramework", "escaper", - "zf2" + "zf" ], - "time": "2016-06-30T19:48:38+00:00" + "time": "2018-04-25T15:48:53+00:00" }, { "name": "zendframework/zend-eventmanager", @@ -2764,16 +2883,16 @@ }, { "name": "zendframework/zend-feed", - "version": "2.9.0", + "version": "2.10.2", "source": { "type": "git", "url": "https://github.com/zendframework/zend-feed.git", - "reference": "abe88686124d492e0a2a84656f15e5482bfbe030" + "reference": "5253f949f4ad999086ab9b408908b6c6776f24db" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-feed/zipball/abe88686124d492e0a2a84656f15e5482bfbe030", - "reference": "abe88686124d492e0a2a84656f15e5482bfbe030", + "url": "https://api.github.com/repos/zendframework/zend-feed/zipball/5253f949f4ad999086ab9b408908b6c6776f24db", + "reference": "5253f949f4ad999086ab9b408908b6c6776f24db", "shasum": "" }, "require": { @@ -2802,8 +2921,8 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.9-dev", - "dev-develop": "2.10-dev" + "dev-master": "2.10.x-dev", + "dev-develop": "2.11.x-dev" } }, "autoload": { @@ -2821,7 +2940,7 @@ "feed", "zf" ], - "time": "2017-12-04T17:59:38+00:00" + "time": "2018-06-18T20:14:01+00:00" }, { "name": "zendframework/zend-filter", @@ -2888,16 +3007,16 @@ }, { "name": "zendframework/zend-form", - "version": "2.11.0", + "version": "2.12.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-form.git", - "reference": "b68a9f07d93381613b68817091d0505ca94d3363" + "reference": "565fb4f4bb3e0dbeea0173c923c4a8be77de9441" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-form/zipball/b68a9f07d93381613b68817091d0505ca94d3363", - "reference": "b68a9f07d93381613b68817091d0505ca94d3363", + "url": "https://api.github.com/repos/zendframework/zend-form/zipball/565fb4f4bb3e0dbeea0173c923c4a8be77de9441", + "reference": "565fb4f4bb3e0dbeea0173c923c4a8be77de9441", "shasum": "" }, "require": { @@ -2936,8 +3055,8 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.11.x-dev", - "dev-develop": "2.12.x-dev" + "dev-master": "2.12.x-dev", + "dev-develop": "2.13.x-dev" }, "zf": { "component": "Zend\\Form", @@ -2962,20 +3081,20 @@ "form", "zf" ], - "time": "2017-12-06T21:09:08+00:00" + "time": "2018-05-16T18:49:44+00:00" }, { "name": "zendframework/zend-http", - "version": "2.7.0", + "version": "2.8.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-http.git", - "reference": "78aa510c0ea64bfb2aa234f50c4f232c9531acfa" + "reference": "f48b276ffa11b48dd1ae3c6bc306d6ed7958ef51" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-http/zipball/78aa510c0ea64bfb2aa234f50c4f232c9531acfa", - "reference": "78aa510c0ea64bfb2aa234f50c4f232c9531acfa", + "url": "https://api.github.com/repos/zendframework/zend-http/zipball/f48b276ffa11b48dd1ae3c6bc306d6ed7958ef51", + "reference": "f48b276ffa11b48dd1ae3c6bc306d6ed7958ef51", "shasum": "" }, "require": { @@ -2986,15 +3105,18 @@ "zendframework/zend-validator": "^2.10.1" }, "require-dev": { - "phpunit/phpunit": "^6.4.1 || ^5.7.15", + "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.3", "zendframework/zend-coding-standard": "~1.0.0", "zendframework/zend-config": "^3.1 || ^2.6" }, + "suggest": { + "paragonie/certainty": "For automated management of cacert.pem" + }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev", - "dev-develop": "2.8-dev" + "dev-master": "2.8.x-dev", + "dev-develop": "2.9.x-dev" } }, "autoload": { @@ -3006,8 +3128,7 @@ "license": [ "BSD-3-Clause" ], - "description": "provides an easy interface for performing Hyper-Text Transfer Protocol (HTTP) requests", - "homepage": "https://github.com/zendframework/zend-http", + "description": "Provides an easy interface for performing Hyper-Text Transfer Protocol (HTTP) requests", "keywords": [ "ZendFramework", "http", @@ -3015,7 +3136,7 @@ "zend", "zf" ], - "time": "2017-10-13T12:06:24+00:00" + "time": "2018-04-26T21:04:50+00:00" }, { "name": "zendframework/zend-hydrator", @@ -3077,24 +3198,24 @@ }, { "name": "zendframework/zend-i18n", - "version": "2.7.4", + "version": "2.9.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-i18n.git", - "reference": "d3431e29cc00c2a1c6704e601d4371dbf24f6a31" + "reference": "6d69af5a04e1a4de7250043cb1322f077a0cdb7f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-i18n/zipball/d3431e29cc00c2a1c6704e601d4371dbf24f6a31", - "reference": "d3431e29cc00c2a1c6704e601d4371dbf24f6a31", + "url": "https://api.github.com/repos/zendframework/zend-i18n/zipball/6d69af5a04e1a4de7250043cb1322f077a0cdb7f", + "reference": "6d69af5a04e1a4de7250043cb1322f077a0cdb7f", "shasum": "" }, "require": { - "php": "^7.0 || ^5.6", + "php": "^5.6 || ^7.0", "zendframework/zend-stdlib": "^2.7 || ^3.0" }, "require-dev": { - "phpunit/phpunit": "^6.0.8 || ^5.7.15", + "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2", "zendframework/zend-cache": "^2.6.1", "zendframework/zend-coding-standard": "~1.0.0", "zendframework/zend-config": "^2.6", @@ -3118,8 +3239,8 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev", - "dev-develop": "2.8-dev" + "dev-master": "2.9.x-dev", + "dev-develop": "2.10.x-dev" }, "zf": { "component": "Zend\\I18n", @@ -3135,25 +3256,26 @@ "license": [ "BSD-3-Clause" ], - "homepage": "https://github.com/zendframework/zend-i18n", + "description": "Provide translations for your application, and filter and validate internationalized values", "keywords": [ + "ZendFramework", "i18n", - "zf2" + "zf" ], - "time": "2017-05-17T17:00:12+00:00" + "time": "2018-05-16T16:39:13+00:00" }, { "name": "zendframework/zend-inputfilter", - "version": "2.8.1", + "version": "2.8.2", "source": { "type": "git", "url": "https://github.com/zendframework/zend-inputfilter.git", - "reference": "55d1430db559e9781b147e73c2c0ce6635d8efe2" + "reference": "3f02179e014d9ef0faccda2ad6c65d38adc338d8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-inputfilter/zipball/55d1430db559e9781b147e73c2c0ce6635d8efe2", - "reference": "55d1430db559e9781b147e73c2c0ce6635d8efe2", + "url": "https://api.github.com/repos/zendframework/zend-inputfilter/zipball/3f02179e014d9ef0faccda2ad6c65d38adc338d8", + "reference": "3f02179e014d9ef0faccda2ad6c65d38adc338d8", "shasum": "" }, "require": { @@ -3193,7 +3315,7 @@ "inputfilter", "zf" ], - "time": "2018-01-22T19:41:18+00:00" + "time": "2018-05-14T17:38:03+00:00" }, { "name": "zendframework/zend-json", @@ -3252,30 +3374,30 @@ }, { "name": "zendframework/zend-loader", - "version": "2.5.1", + "version": "2.6.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-loader.git", - "reference": "c5fd2f071bde071f4363def7dea8dec7393e135c" + "reference": "78f11749ea340f6ca316bca5958eef80b38f9b6c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-loader/zipball/c5fd2f071bde071f4363def7dea8dec7393e135c", - "reference": "c5fd2f071bde071f4363def7dea8dec7393e135c", + "url": "https://api.github.com/repos/zendframework/zend-loader/zipball/78f11749ea340f6ca316bca5958eef80b38f9b6c", + "reference": "78f11749ea340f6ca316bca5958eef80b38f9b6c", "shasum": "" }, "require": { - "php": ">=5.3.23" + "php": "^5.6 || ^7.0" }, "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0" + "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4", + "zendframework/zend-coding-standard": "~1.0.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.5-dev", - "dev-develop": "2.6-dev" + "dev-master": "2.6.x-dev", + "dev-develop": "2.7.x-dev" } }, "autoload": { @@ -3287,12 +3409,13 @@ "license": [ "BSD-3-Clause" ], - "homepage": "https://github.com/zendframework/zend-loader", + "description": "Autoloading and plugin loading strategies", "keywords": [ + "ZendFramework", "loader", - "zf2" + "zf" ], - "time": "2015-06-03T14:05:47+00:00" + "time": "2018-04-30T15:20:54+00:00" }, { "name": "zendframework/zend-log", @@ -3367,43 +3490,43 @@ }, { "name": "zendframework/zend-mail", - "version": "2.9.0", + "version": "2.10.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-mail.git", - "reference": "067248425f285dec0bdb74256a8f67f9092f115e" + "reference": "d7beb63d5f7144a21ac100072c453e63860cdab8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-mail/zipball/067248425f285dec0bdb74256a8f67f9092f115e", - "reference": "067248425f285dec0bdb74256a8f67f9092f115e", + "url": "https://api.github.com/repos/zendframework/zend-mail/zipball/d7beb63d5f7144a21ac100072c453e63860cdab8", + "reference": "d7beb63d5f7144a21ac100072c453e63860cdab8", "shasum": "" }, "require": { "ext-iconv": "*", - "php": "^7.1", + "php": "^5.6 || ^7.0", + "true/punycode": "^2.1", "zendframework/zend-loader": "^2.5", "zendframework/zend-mime": "^2.5", "zendframework/zend-stdlib": "^2.7 || ^3.0", "zendframework/zend-validator": "^2.10.2" }, "require-dev": { - "phpunit/phpunit": "^6.0.8 || ^5.7.15", + "phpunit/phpunit": "^5.7.25 || ^6.4.4 || ^7.1.4", "zendframework/zend-coding-standard": "~1.0.0", "zendframework/zend-config": "^2.6", - "zendframework/zend-crypt": "^2.6", - "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3" + "zendframework/zend-crypt": "^2.6 || ^3.0", + "zendframework/zend-servicemanager": "^2.7.10 || ^3.3.1" }, "suggest": { - "ext-intl": "Handle IDN in AddressList hostnames", "zendframework/zend-crypt": "Crammd5 support in SMTP Auth", - "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3 when using SMTP to deliver messages" + "zendframework/zend-servicemanager": "^2.7.10 || ^3.3.1 when using SMTP to deliver messages" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.8-dev", - "dev-develop": "2.9-dev" + "dev-master": "2.10.x-dev", + "dev-develop": "2.11.x-dev" }, "zf": { "component": "Zend\\Mail", @@ -3419,13 +3542,13 @@ "license": [ "BSD-3-Clause" ], - "description": "provides generalized functionality to compose and send both text and MIME-compliant multipart e-mail messages", - "homepage": "https://github.com/zendframework/zend-mail", + "description": "Provides generalized functionality to compose and send both text and MIME-compliant multipart e-mail messages", "keywords": [ + "ZendFramework", "mail", - "zf2" + "zf" ], - "time": "2018-03-01T18:57:00+00:00" + "time": "2018-06-07T13:37:07+00:00" }, { "name": "zendframework/zend-math", @@ -3479,16 +3602,16 @@ }, { "name": "zendframework/zend-mime", - "version": "2.7.0", + "version": "2.7.1", "source": { "type": "git", "url": "https://github.com/zendframework/zend-mime.git", - "reference": "5db38e92f8a6c7c5e25c8afce6e2d0bd49340c5f" + "reference": "52ae5fa9f12845cae749271034a2d594f0e4c6f2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-mime/zipball/5db38e92f8a6c7c5e25c8afce6e2d0bd49340c5f", - "reference": "5db38e92f8a6c7c5e25c8afce6e2d0bd49340c5f", + "url": "https://api.github.com/repos/zendframework/zend-mime/zipball/52ae5fa9f12845cae749271034a2d594f0e4c6f2", + "reference": "52ae5fa9f12845cae749271034a2d594f0e4c6f2", "shasum": "" }, "require": { @@ -3526,7 +3649,7 @@ "mime", "zf" ], - "time": "2017-11-28T15:02:22+00:00" + "time": "2018-05-14T19:02:50+00:00" }, { "name": "zendframework/zend-modulemanager", @@ -3590,26 +3713,27 @@ }, { "name": "zendframework/zend-mvc", - "version": "2.7.13", + "version": "2.7.15", "source": { "type": "git", "url": "https://github.com/zendframework/zend-mvc.git", - "reference": "9dcaaad145254d023d3cd3559bf29e430f2884b2" + "reference": "a8d45689d37a9e4ff4b75ea0b7478fa3d4f9c089" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-mvc/zipball/9dcaaad145254d023d3cd3559bf29e430f2884b2", - "reference": "9dcaaad145254d023d3cd3559bf29e430f2884b2", + "url": "https://api.github.com/repos/zendframework/zend-mvc/zipball/a8d45689d37a9e4ff4b75ea0b7478fa3d4f9c089", + "reference": "a8d45689d37a9e4ff4b75ea0b7478fa3d4f9c089", "shasum": "" }, "require": { "container-interop/container-interop": "^1.1", "php": "^5.5 || ^7.0", - "zendframework/zend-eventmanager": "^2.6.2 || ^3.0", - "zendframework/zend-form": "^2.8.2", - "zendframework/zend-hydrator": "^1.1 || ^2.1", + "zendframework/zend-console": "^2.7", + "zendframework/zend-eventmanager": "^2.6.4 || ^3.0", + "zendframework/zend-form": "^2.11", + "zendframework/zend-hydrator": "^1.1 || ^2.4", "zendframework/zend-psr7bridge": "^0.2", - "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", + "zendframework/zend-servicemanager": "^2.7.10 || ^3.0.3", "zendframework/zend-stdlib": "^2.7.5 || ^3.0" }, "replace": { @@ -3617,30 +3741,29 @@ }, "require-dev": { "friendsofphp/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "^4.5", + "phpunit/phpunit": "^4.8.36", + "sebastian/comparator": "^1.2.4", "sebastian/version": "^1.0.4", - "zendframework/zend-authentication": "^2.5.3", - "zendframework/zend-cache": "^2.6.1", - "zendframework/zend-console": "^2.6", + "zendframework/zend-authentication": "^2.6", + "zendframework/zend-cache": "^2.8", "zendframework/zend-di": "^2.6", - "zendframework/zend-filter": "^2.6.1", - "zendframework/zend-http": "^2.5.4", - "zendframework/zend-i18n": "^2.6", - "zendframework/zend-inputfilter": "^2.6", + "zendframework/zend-filter": "^2.8", + "zendframework/zend-http": "^2.8", + "zendframework/zend-i18n": "^2.8", + "zendframework/zend-inputfilter": "^2.8", "zendframework/zend-json": "^2.6.1", - "zendframework/zend-log": "^2.7.1", - "zendframework/zend-modulemanager": "^2.7.1", - "zendframework/zend-serializer": "^2.6.1", - "zendframework/zend-session": "^2.6.2", - "zendframework/zend-text": "^2.6", - "zendframework/zend-uri": "^2.5", - "zendframework/zend-validator": "^2.6", - "zendframework/zend-view": "^2.6.3" + "zendframework/zend-log": "^2.9.3", + "zendframework/zend-modulemanager": "^2.8", + "zendframework/zend-serializer": "^2.8", + "zendframework/zend-session": "^2.8.1", + "zendframework/zend-text": "^2.7", + "zendframework/zend-uri": "^2.6", + "zendframework/zend-validator": "^2.10", + "zendframework/zend-view": "^2.9" }, "suggest": { "zendframework/zend-authentication": "Zend\\Authentication component for Identity plugin", "zendframework/zend-config": "Zend\\Config component", - "zendframework/zend-console": "Zend\\Console component", "zendframework/zend-di": "Zend\\Di component", "zendframework/zend-filter": "Zend\\Filter component", "zendframework/zend-http": "Zend\\Http component", @@ -3665,6 +3788,9 @@ } }, "autoload": { + "files": [ + "src/autoload.php" + ], "psr-4": { "Zend\\Mvc\\": "src/" } @@ -3678,7 +3804,7 @@ "mvc", "zf2" ], - "time": "2017-12-14T22:44:10+00:00" + "time": "2018-05-03T13:13:41+00:00" }, { "name": "zendframework/zend-psr7bridge", @@ -3731,16 +3857,16 @@ }, { "name": "zendframework/zend-serializer", - "version": "2.8.1", + "version": "2.9.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-serializer.git", - "reference": "7ac42b9a47e9cb23895173a3096bc3b3fb7ac580" + "reference": "0172690db48d8935edaf625c4cba38b79719892c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-serializer/zipball/7ac42b9a47e9cb23895173a3096bc3b3fb7ac580", - "reference": "7ac42b9a47e9cb23895173a3096bc3b3fb7ac580", + "url": "https://api.github.com/repos/zendframework/zend-serializer/zipball/0172690db48d8935edaf625c4cba38b79719892c", + "reference": "0172690db48d8935edaf625c4cba38b79719892c", "shasum": "" }, "require": { @@ -3749,10 +3875,9 @@ "zendframework/zend-stdlib": "^2.7 || ^3.0" }, "require-dev": { - "doctrine/instantiator": "1.0.*", - "phpunit/phpunit": "^5.5", + "phpunit/phpunit": "^5.7.25 || ^6.4.4", "zendframework/zend-coding-standard": "~1.0.0", - "zendframework/zend-math": "^2.6", + "zendframework/zend-math": "^2.6 || ^3.0", "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3" }, "suggest": { @@ -3762,8 +3887,8 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.8-dev", - "dev-develop": "2.9-dev" + "dev-master": "2.9.x-dev", + "dev-develop": "2.10.x-dev" }, "zf": { "component": "Zend\\Serializer", @@ -3780,25 +3905,25 @@ "BSD-3-Clause" ], "description": "provides an adapter based interface to simply generate storable representation of PHP types by different facilities, and recover", - "homepage": "https://github.com/zendframework/zend-serializer", "keywords": [ + "ZendFramework", "serializer", - "zf2" + "zf" ], - "time": "2017-11-20T22:21:04+00:00" + "time": "2018-05-14T18:45:18+00:00" }, { "name": "zendframework/zend-server", - "version": "2.7.0", + "version": "2.8.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-server.git", - "reference": "7cb617ca3e9b24579f544a244ee79ae61f480914" + "reference": "23a2e9a5599c83c05da831cb7c649e8a7809595e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-server/zipball/7cb617ca3e9b24579f544a244ee79ae61f480914", - "reference": "7cb617ca3e9b24579f544a244ee79ae61f480914", + "url": "https://api.github.com/repos/zendframework/zend-server/zipball/23a2e9a5599c83c05da831cb7c649e8a7809595e", + "reference": "23a2e9a5599c83c05da831cb7c649e8a7809595e", "shasum": "" }, "require": { @@ -3807,14 +3932,14 @@ "zendframework/zend-stdlib": "^2.5 || ^3.0" }, "require-dev": { - "phpunit/phpunit": "^4.8", - "squizlabs/php_codesniffer": "^2.3.1" + "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4", + "zendframework/zend-coding-standard": "~1.0.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev", - "dev-develop": "2.8-dev" + "dev-master": "2.8.x-dev", + "dev-develop": "2.9.x-dev" } }, "autoload": { @@ -3826,25 +3951,26 @@ "license": [ "BSD-3-Clause" ], - "homepage": "https://github.com/zendframework/zend-server", + "description": "Create Reflection-based RPC servers", "keywords": [ + "ZendFramework", "server", - "zf2" + "zf" ], - "time": "2016-06-20T22:27:55+00:00" + "time": "2018-04-30T22:21:28+00:00" }, { "name": "zendframework/zend-servicemanager", - "version": "2.7.10", + "version": "2.7.11", "source": { "type": "git", "url": "https://github.com/zendframework/zend-servicemanager.git", - "reference": "ba7069c94c9af93122be9fa31cddd37f7707d5b4" + "reference": "99ec9ed5d0f15aed9876433c74c2709eb933d4c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-servicemanager/zipball/ba7069c94c9af93122be9fa31cddd37f7707d5b4", - "reference": "ba7069c94c9af93122be9fa31cddd37f7707d5b4", + "url": "https://api.github.com/repos/zendframework/zend-servicemanager/zipball/99ec9ed5d0f15aed9876433c74c2709eb933d4c7", + "reference": "99ec9ed5d0f15aed9876433c74c2709eb933d4c7", "shasum": "" }, "require": { @@ -3883,7 +4009,7 @@ "servicemanager", "zf2" ], - "time": "2017-12-05T16:27:36+00:00" + "time": "2018-06-22T14:49:54+00:00" }, { "name": "zendframework/zend-session", @@ -4066,33 +4192,33 @@ }, { "name": "zendframework/zend-text", - "version": "2.6.0", + "version": "2.7.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-text.git", - "reference": "07ad9388e4d4f12620ad37b52a5b0e4ee7845f92" + "reference": "ca987dd4594f5f9508771fccd82c89bc7fbb39ac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-text/zipball/07ad9388e4d4f12620ad37b52a5b0e4ee7845f92", - "reference": "07ad9388e4d4f12620ad37b52a5b0e4ee7845f92", + "url": "https://api.github.com/repos/zendframework/zend-text/zipball/ca987dd4594f5f9508771fccd82c89bc7fbb39ac", + "reference": "ca987dd4594f5f9508771fccd82c89bc7fbb39ac", "shasum": "" }, "require": { - "php": "^5.5 || ^7.0", + "php": "^5.6 || ^7.0", "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", "zendframework/zend-stdlib": "^2.7 || ^3.0" }, "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0", + "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4", + "zendframework/zend-coding-standard": "~1.0.0", "zendframework/zend-config": "^2.6" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.6-dev", - "dev-develop": "2.7-dev" + "dev-master": "2.7.x-dev", + "dev-develop": "2.8.x-dev" } }, "autoload": { @@ -4104,34 +4230,35 @@ "license": [ "BSD-3-Clause" ], - "homepage": "https://github.com/zendframework/zend-text", + "description": "Create FIGlets and text-based tables", "keywords": [ + "ZendFramework", "text", - "zf2" + "zf" ], - "time": "2016-02-08T19:03:52+00:00" + "time": "2018-04-30T14:55:10+00:00" }, { "name": "zendframework/zend-uri", - "version": "2.6.0", + "version": "2.6.1", "source": { "type": "git", "url": "https://github.com/zendframework/zend-uri.git", - "reference": "fb998b9487ea8c5f4aaac0e536190709bdd5353b" + "reference": "3b6463645c6766f78ce537c70cb4fdabee1e725f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-uri/zipball/fb998b9487ea8c5f4aaac0e536190709bdd5353b", - "reference": "fb998b9487ea8c5f4aaac0e536190709bdd5353b", + "url": "https://api.github.com/repos/zendframework/zend-uri/zipball/3b6463645c6766f78ce537c70cb4fdabee1e725f", + "reference": "3b6463645c6766f78ce537c70cb4fdabee1e725f", "shasum": "" }, "require": { "php": "^5.6 || ^7.0", "zendframework/zend-escaper": "^2.5", - "zendframework/zend-validator": "^2.5" + "zendframework/zend-validator": "^2.10" }, "require-dev": { - "phpunit/phpunit": "^6.2.1 || ^5.7.15", + "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4", "zendframework/zend-coding-standard": "~1.0.0" }, "type": "library", @@ -4150,13 +4277,13 @@ "license": [ "BSD-3-Clause" ], - "description": "a component that aids in manipulating and validating » Uniform Resource Identifiers (URIs)", - "homepage": "https://github.com/zendframework/zend-uri", + "description": "A component that aids in manipulating and validating » Uniform Resource Identifiers (URIs)", "keywords": [ + "ZendFramework", "uri", - "zf2" + "zf" ], - "time": "2018-04-10T17:08:10+00:00" + "time": "2018-04-30T13:40:08+00:00" }, { "name": "zendframework/zend-validator", @@ -4318,6 +4445,50 @@ } ], "packages-dev": [ + { + "name": "composer/xdebug-handler", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://github.com/composer/xdebug-handler.git", + "reference": "c919dc6c62e221fc6406f861ea13433c0aa24f08" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/c919dc6c62e221fc6406f861ea13433c0aa24f08", + "reference": "c919dc6c62e221fc6406f861ea13433c0aa24f08", + "shasum": "" + }, + "require": { + "php": "^5.3.2 || ^7.0", + "psr/log": "^1.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5" + }, + "type": "library", + "autoload": { + "psr-4": { + "Composer\\XdebugHandler\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "John Stevenson", + "email": "john-stevenson@blueyonder.co.uk" + } + ], + "description": "Restarts a process without xdebug.", + "keywords": [ + "Xdebug", + "performance" + ], + "time": "2018-04-11T15:42:36+00:00" + }, { "name": "doctrine/annotations", "version": "v1.6.0", @@ -4496,25 +4667,26 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v2.10.5", + "version": "v2.12.1", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "e49993dfb9b96ec8b8d9964c4627599b050a6e99" + "reference": "beef6cbe6dec7205edcd143842a49f9a691859a6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/e49993dfb9b96ec8b8d9964c4627599b050a6e99", - "reference": "e49993dfb9b96ec8b8d9964c4627599b050a6e99", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/beef6cbe6dec7205edcd143842a49f9a691859a6", + "reference": "beef6cbe6dec7205edcd143842a49f9a691859a6", "shasum": "" }, "require": { "composer/semver": "^1.4", + "composer/xdebug-handler": "^1.0", "doctrine/annotations": "^1.2", "ext-json": "*", "ext-tokenizer": "*", "php": "^5.6 || >=7.0 <7.3", - "php-cs-fixer/diff": "^1.2", + "php-cs-fixer/diff": "^1.3", "symfony/console": "^3.2 || ^4.0", "symfony/event-dispatcher": "^3.0 || ^4.0", "symfony/filesystem": "^3.0 || ^4.0", @@ -4531,16 +4703,20 @@ "require-dev": { "johnkary/phpunit-speedtrap": "^1.1 || ^2.0 || ^3.0", "justinrainbow/json-schema": "^5.0", - "keradus/cli-executor": "^1.0", + "keradus/cli-executor": "^1.1", "mikey179/vfsstream": "^1.6", - "php-coveralls/php-coveralls": "^2.0", + "php-coveralls/php-coveralls": "^2.1", "php-cs-fixer/accessible-object": "^1.0", - "phpunit/phpunit": "^5.7.23 || ^6.4.3", - "phpunitgoodpractices/traits": "^1.3.1", - "symfony/phpunit-bridge": "^3.2.2 || ^4.0" + "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.0.1", + "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.0.1", + "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1", + "phpunitgoodpractices/traits": "^1.5", + "symfony/phpunit-bridge": "^4.0" }, "suggest": { "ext-mbstring": "For handling non-UTF8 characters in cache signature.", + "php-cs-fixer/phpunit-constraint-isidenticalstring": "For IsIdenticalString constraint.", + "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "For XmlMatchesXsd constraint.", "symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible." }, "bin": [ @@ -4556,7 +4732,6 @@ "tests/Test/AbstractIntegrationCaseFactory.php", "tests/Test/AbstractIntegrationTestCase.php", "tests/Test/Assert/AssertTokensTrait.php", - "tests/Test/Constraint/SameStringsConstraint.php", "tests/Test/IntegrationCase.php", "tests/Test/IntegrationCaseFactory.php", "tests/Test/IntegrationCaseFactoryInterface.php", @@ -4579,20 +4754,20 @@ } ], "description": "A tool to automatically fix PHP code style", - "time": "2018-03-20T18:07:08+00:00" + "time": "2018-06-10T08:26:56+00:00" }, { "name": "lusitanian/oauth", - "version": "v0.8.10", + "version": "v0.8.11", "source": { "type": "git", "url": "https://github.com/Lusitanian/PHPoAuthLib.git", - "reference": "09f4af38f17db6938253f4d1b171d537913ac1ed" + "reference": "fc11a53db4b66da555a6a11fce294f574a8374f9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Lusitanian/PHPoAuthLib/zipball/09f4af38f17db6938253f4d1b171d537913ac1ed", - "reference": "09f4af38f17db6938253f4d1b171d537913ac1ed", + "url": "https://api.github.com/repos/Lusitanian/PHPoAuthLib/zipball/fc11a53db4b66da555a6a11fce294f574a8374f9", + "reference": "fc11a53db4b66da555a6a11fce294f574a8374f9", "shasum": "" }, "require": { @@ -4646,29 +4821,32 @@ "oauth", "security" ], - "time": "2016-07-12T22:15:40+00:00" + "time": "2018-02-14T22:37:14+00:00" }, { "name": "myclabs/deep-copy", - "version": "1.7.0", + "version": "1.8.1", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e" + "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e", - "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8", + "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8", "shasum": "" }, "require": { - "php": "^5.6 || ^7.0" + "php": "^7.1" + }, + "replace": { + "myclabs/deep-copy": "self.version" }, "require-dev": { "doctrine/collections": "^1.0", "doctrine/common": "^2.6", - "phpunit/phpunit": "^4.1" + "phpunit/phpunit": "^7.1" }, "type": "library", "autoload": { @@ -4691,7 +4869,7 @@ "object", "object graph" ], - "time": "2017-10-19T19:58:43+00:00" + "time": "2018-06-11T23:09:50+00:00" }, { "name": "pdepend/pdepend", @@ -5106,23 +5284,23 @@ }, { "name": "phpspec/prophecy", - "version": "1.7.5", + "version": "1.7.6", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "dfd6be44111a7c41c2e884a336cc4f461b3b2401" + "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/dfd6be44111a7c41c2e884a336cc4f461b3b2401", - "reference": "dfd6be44111a7c41c2e884a336cc4f461b3b2401", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/33a7e3c4fda54e912ff6338c48823bd5c0f0b712", + "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712", "shasum": "" }, "require": { "doctrine/instantiator": "^1.0.2", "php": "^5.3|^7.0", "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0", - "sebastian/comparator": "^1.1|^2.0", + "sebastian/comparator": "^1.1|^2.0|^3.0", "sebastian/recursion-context": "^1.0|^2.0|^3.0" }, "require-dev": { @@ -5165,7 +5343,7 @@ "spy", "stub" ], - "time": "2018-02-19T10:16:54+00:00" + "time": "2018-04-18T13:57:24+00:00" }, { "name": "phpunit/php-code-coverage", @@ -5418,16 +5596,16 @@ }, { "name": "phpunit/phpunit", - "version": "6.2.4", + "version": "6.5.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "ff3a76a58ac293657808aefd58c8aaf05945f4d9" + "reference": "4f21a3c6b97c42952fd5c2837bb354ec0199b97b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ff3a76a58ac293657808aefd58c8aaf05945f4d9", - "reference": "ff3a76a58ac293657808aefd58c8aaf05945f4d9", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4f21a3c6b97c42952fd5c2837bb354ec0199b97b", + "reference": "4f21a3c6b97c42952fd5c2837bb354ec0199b97b", "shasum": "" }, "require": { @@ -5436,24 +5614,24 @@ "ext-libxml": "*", "ext-mbstring": "*", "ext-xml": "*", - "myclabs/deep-copy": "^1.3", + "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", - "phpunit/php-file-iterator": "^1.4", - "phpunit/php-text-template": "^1.2", - "phpunit/php-timer": "^1.0.6", - "phpunit/phpunit-mock-objects": "^4.0", - "sebastian/comparator": "^2.0", - "sebastian/diff": "^1.4.3", - "sebastian/environment": "^3.0.2", + "phpunit/php-code-coverage": "^5.3", + "phpunit/php-file-iterator": "^1.4.3", + "phpunit/php-text-template": "^1.2.1", + "phpunit/php-timer": "^1.0.9", + "phpunit/phpunit-mock-objects": "^5.0.5", + "sebastian/comparator": "^2.1", + "sebastian/diff": "^2.0", + "sebastian/environment": "^3.1", "sebastian/exporter": "^3.1", - "sebastian/global-state": "^1.1 || ^2.0", - "sebastian/object-enumerator": "^3.0.2", + "sebastian/global-state": "^2.0", + "sebastian/object-enumerator": "^3.0.3", "sebastian/resource-operations": "^1.0", - "sebastian/version": "^2.0" + "sebastian/version": "^2.0.1" }, "conflict": { "phpdocumentor/reflection-docblock": "3.0.2", @@ -5472,7 +5650,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "6.2.x-dev" + "dev-master": "6.5.x-dev" } }, "autoload": { @@ -5498,33 +5676,33 @@ "testing", "xunit" ], - "time": "2017-08-03T13:59:28+00:00" + "time": "2018-04-10T11:38:34+00:00" }, { "name": "phpunit/phpunit-mock-objects", - "version": "4.0.4", + "version": "5.0.7", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "2f789b59ab89669015ad984afa350c4ec577ade0" + "reference": "3eaf040f20154d27d6da59ca2c6e28ac8fd56dce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/2f789b59ab89669015ad984afa350c4ec577ade0", - "reference": "2f789b59ab89669015ad984afa350c4ec577ade0", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/3eaf040f20154d27d6da59ca2c6e28ac8fd56dce", + "reference": "3eaf040f20154d27d6da59ca2c6e28ac8fd56dce", "shasum": "" }, "require": { "doctrine/instantiator": "^1.0.5", "php": "^7.0", "phpunit/php-text-template": "^1.2.1", - "sebastian/exporter": "^3.0" + "sebastian/exporter": "^3.1" }, "conflict": { "phpunit/phpunit": "<6.0" }, "require-dev": { - "phpunit/phpunit": "^6.0" + "phpunit/phpunit": "^6.5" }, "suggest": { "ext-soap": "*" @@ -5532,7 +5710,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0.x-dev" + "dev-master": "5.0.x-dev" } }, "autoload": { @@ -5547,7 +5725,7 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", + "email": "sebastian@phpunit.de", "role": "lead" } ], @@ -5557,7 +5735,7 @@ "mock", "xunit" ], - "time": "2017-08-03T14:08:16+00:00" + "time": "2018-05-29T13:50:43+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -5606,30 +5784,30 @@ }, { "name": "sebastian/comparator", - "version": "2.0.0", + "version": "2.1.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "20f84f468cb67efee293246e6a09619b891f55f0" + "reference": "34369daee48eafb2651bea869b4b15d75ccc35f9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/20f84f468cb67efee293246e6a09619b891f55f0", - "reference": "20f84f468cb67efee293246e6a09619b891f55f0", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/34369daee48eafb2651bea869b4b15d75ccc35f9", + "reference": "34369daee48eafb2651bea869b4b15d75ccc35f9", "shasum": "" }, "require": { "php": "^7.0", - "sebastian/diff": "^1.2", - "sebastian/exporter": "^3.0" + "sebastian/diff": "^2.0 || ^3.0", + "sebastian/exporter": "^3.1" }, "require-dev": { - "phpunit/phpunit": "^6.0" + "phpunit/phpunit": "^6.4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "2.1.x-dev" } }, "autoload": { @@ -5660,38 +5838,38 @@ } ], "description": "Provides the functionality to compare PHP values for equality", - "homepage": "http://www.github.com/sebastianbergmann/comparator", + "homepage": "https://github.com/sebastianbergmann/comparator", "keywords": [ "comparator", "compare", "equality" ], - "time": "2017-03-03T06:26:08+00:00" + "time": "2018-02-01T13:46:46+00:00" }, { "name": "sebastian/diff", - "version": "1.4.3", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4" + "reference": "347c1d8b49c5c3ee30c7040ea6fc446790e6bddd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/7f066a26a962dbe58ddea9f72a4e82874a3975a4", - "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/347c1d8b49c5c3ee30c7040ea6fc446790e6bddd", + "reference": "347c1d8b49c5c3ee30c7040ea6fc446790e6bddd", "shasum": "" }, "require": { - "php": "^5.3.3 || ^7.0" + "php": "^7.0" }, "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" + "phpunit/phpunit": "^6.2" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "2.0-dev" } }, "autoload": { @@ -5718,7 +5896,7 @@ "keywords": [ "diff" ], - "time": "2017-05-22T07:24:03+00:00" + "time": "2017-08-03T08:09:46+00:00" }, { "name": "sebastian/environment", @@ -6209,16 +6387,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.2.2", + "version": "3.3.0", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "d7c00c3000ac0ce79c96fcbfef86b49a71158cd1" + "reference": "d86873af43b4aa9d1f39a3601cc0cfcf02b25266" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/d7c00c3000ac0ce79c96fcbfef86b49a71158cd1", - "reference": "d7c00c3000ac0ce79c96fcbfef86b49a71158cd1", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/d86873af43b4aa9d1f39a3601cc0cfcf02b25266", + "reference": "d86873af43b4aa9d1f39a3601cc0cfcf02b25266", "shasum": "" }, "require": { @@ -6228,7 +6406,7 @@ "php": ">=5.4.0" }, "require-dev": { - "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0" + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0" }, "bin": [ "bin/phpcs", @@ -6256,25 +6434,26 @@ "phpcs", "standards" ], - "time": "2017-12-19T21:44:46+00:00" + "time": "2018-06-06T23:58:19+00:00" }, { "name": "symfony/config", - "version": "v4.0.8", + "version": "v4.1.1", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "7c19370ab04e9ac05b74a504198e165f5ccf6dd8" + "reference": "e57e7b573df9d0eaa8c0152768c708ee7ea2b8e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/7c19370ab04e9ac05b74a504198e165f5ccf6dd8", - "reference": "7c19370ab04e9ac05b74a504198e165f5ccf6dd8", + "url": "https://api.github.com/repos/symfony/config/zipball/e57e7b573df9d0eaa8c0152768c708ee7ea2b8e5", + "reference": "e57e7b573df9d0eaa8c0152768c708ee7ea2b8e5", "shasum": "" }, "require": { "php": "^7.1.3", - "symfony/filesystem": "~3.4|~4.0" + "symfony/filesystem": "~3.4|~4.0", + "symfony/polyfill-ctype": "~1.8" }, "conflict": { "symfony/finder": "<3.4" @@ -6291,7 +6470,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -6318,20 +6497,20 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "time": "2018-03-19T22:35:49+00:00" + "time": "2018-06-20T11:15:17+00:00" }, { "name": "symfony/dependency-injection", - "version": "v4.0.8", + "version": "v4.1.1", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "9f1cea656afc5512c6f5e58d61fcea12acee113e" + "reference": "e761828a85d7dfc00b927f94ccbe1851ce0b6535" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/9f1cea656afc5512c6f5e58d61fcea12acee113e", - "reference": "9f1cea656afc5512c6f5e58d61fcea12acee113e", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/e761828a85d7dfc00b927f94ccbe1851ce0b6535", + "reference": "e761828a85d7dfc00b927f94ccbe1851ce0b6535", "shasum": "" }, "require": { @@ -6339,7 +6518,7 @@ "psr/container": "^1.0" }, "conflict": { - "symfony/config": "<3.4", + "symfony/config": "<4.1.1", "symfony/finder": "<3.4", "symfony/proxy-manager-bridge": "<3.4", "symfony/yaml": "<3.4" @@ -6348,7 +6527,7 @@ "psr/container-implementation": "1.0" }, "require-dev": { - "symfony/config": "~3.4|~4.0", + "symfony/config": "~4.1", "symfony/expression-language": "~3.4|~4.0", "symfony/yaml": "~3.4|~4.0" }, @@ -6362,7 +6541,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -6389,20 +6568,20 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "https://symfony.com", - "time": "2018-04-02T09:52:41+00:00" + "time": "2018-06-25T11:12:43+00:00" }, { "name": "symfony/options-resolver", - "version": "v4.0.8", + "version": "v4.1.1", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "371532a2cfe932f7a3766dd4c45364566def1dd0" + "reference": "45cdcc8a96ef92b43a50723e6d1f5f83096e8cef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/371532a2cfe932f7a3766dd4c45364566def1dd0", - "reference": "371532a2cfe932f7a3766dd4c45364566def1dd0", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/45cdcc8a96ef92b43a50723e6d1f5f83096e8cef", + "reference": "45cdcc8a96ef92b43a50723e6d1f5f83096e8cef", "shasum": "" }, "require": { @@ -6411,7 +6590,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -6443,20 +6622,20 @@ "configuration", "options" ], - "time": "2018-01-18T22:19:33+00:00" + "time": "2018-05-31T10:17:53+00:00" }, { "name": "symfony/polyfill-php70", - "version": "v1.7.0", + "version": "v1.8.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php70.git", - "reference": "3532bfcd8f933a7816f3a0a59682fc404776600f" + "reference": "77454693d8f10dd23bb24955cffd2d82db1007a6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/3532bfcd8f933a7816f3a0a59682fc404776600f", - "reference": "3532bfcd8f933a7816f3a0a59682fc404776600f", + "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/77454693d8f10dd23bb24955cffd2d82db1007a6", + "reference": "77454693d8f10dd23bb24955cffd2d82db1007a6", "shasum": "" }, "require": { @@ -6466,7 +6645,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.7-dev" + "dev-master": "1.8-dev" } }, "autoload": { @@ -6502,20 +6681,20 @@ "portable", "shim" ], - "time": "2018-01-30T19:27:44+00:00" + "time": "2018-04-26T10:06:28+00:00" }, { "name": "symfony/polyfill-php72", - "version": "v1.7.0", + "version": "v1.8.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "8eca20c8a369e069d4f4c2ac9895144112867422" + "reference": "a4576e282d782ad82397f3e4ec1df8e0f0cafb46" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/8eca20c8a369e069d4f4c2ac9895144112867422", - "reference": "8eca20c8a369e069d4f4c2ac9895144112867422", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/a4576e282d782ad82397f3e4ec1df8e0f0cafb46", + "reference": "a4576e282d782ad82397f3e4ec1df8e0f0cafb46", "shasum": "" }, "require": { @@ -6524,7 +6703,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.7-dev" + "dev-master": "1.8-dev" } }, "autoload": { @@ -6557,20 +6736,20 @@ "portable", "shim" ], - "time": "2018-01-31T17:43:24+00:00" + "time": "2018-04-26T10:06:28+00:00" }, { "name": "symfony/stopwatch", - "version": "v4.0.8", + "version": "v4.1.1", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", - "reference": "6795ffa2f8eebedac77f045aa62c0c10b2763042" + "reference": "07463bbbbbfe119045a24c4a516f92ebd2752784" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/6795ffa2f8eebedac77f045aa62c0c10b2763042", - "reference": "6795ffa2f8eebedac77f045aa62c0c10b2763042", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/07463bbbbbfe119045a24c4a516f92ebd2752784", + "reference": "07463bbbbbfe119045a24c4a516f92ebd2752784", "shasum": "" }, "require": { @@ -6579,7 +6758,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -6606,7 +6785,7 @@ ], "description": "Symfony Stopwatch Component", "homepage": "https://symfony.com", - "time": "2018-02-19T16:50:22+00:00" + "time": "2018-02-19T16:51:42+00:00" }, { "name": "theseer/fdomdocument", diff --git a/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Event/TransactionTest.php b/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Event/TransactionTest.php index 5bb273b4e2781..feb1c0bf61c16 100644 --- a/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Event/TransactionTest.php +++ b/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Event/TransactionTest.php @@ -30,7 +30,7 @@ protected function setUp() { $this->_eventManager = $this->getMockBuilder(\Magento\TestFramework\EventManager::class) ->setMethods(['fireEvent']) - ->setConstructorArgs([[]]) + ->disableOriginalConstructor() ->getMock(); $this->_adapter = @@ -69,9 +69,9 @@ protected function _imitateTransactionStartRequest($eventName) /** * Setup expectations for "transaction start" use case * - * @param \PHPUnit_Framework_MockObject_Matcher_Invocation $invocationMatcher + * @param \PHPUnit\Framework\MockObject\Matcher\Invocation $invocationMatcher */ - protected function _expectTransactionStart(\PHPUnit_Framework_MockObject_Matcher_Invocation $invocationMatcher) + protected function _expectTransactionStart(\PHPUnit\Framework\MockObject\Matcher\Invocation $invocationMatcher) { $this->_eventManager->expects($invocationMatcher)->method('fireEvent')->with('startTransaction'); $this->_adapter->expects($this->once())->method('beginTransaction'); @@ -103,9 +103,9 @@ protected function _imitateTransactionRollbackRequest($eventName) /** * Setup expectations for "transaction rollback" use case * - * @param \PHPUnit_Framework_MockObject_Matcher_Invocation $invocationMatcher + * @param \PHPUnit\Framework\MockObject\Matcher\Invocation $invocationMatcher */ - protected function _expectTransactionRollback(\PHPUnit_Framework_MockObject_Matcher_Invocation $invocationMatcher) + protected function _expectTransactionRollback(\PHPUnit\Framework\MockObject\Matcher\Invocation $invocationMatcher) { $this->_eventManager->expects($invocationMatcher)->method('fireEvent')->with('rollbackTransaction'); $this->_adapter->expects($this->once())->method('rollback'); diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupons_advanced.php b/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupons_advanced.php index 91369da7aa842..a2176364178dc 100644 --- a/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupons_advanced.php +++ b/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupons_advanced.php @@ -21,7 +21,7 @@ $coupon = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\SalesRule\Model\Coupon::class); $coupon->setRuleId($items[1]->getId())->setCode('autogenerated_2_2')->setType(1)->save(); -// type SPECIFIC with generated coupons +// type SPECIFIC with generated coupons $coupon = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\SalesRule\Model\Coupon::class); $coupon->setRuleId($items[2]->getId())->setCode('autogenerated_3_1')->setType(1)->save(); $coupon = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\SalesRule\Model\Coupon::class); diff --git a/dev/tests/static/framework/Magento/CodeMessDetector/Test/Unit/Rule/Design/FinalImplementationTest.php b/dev/tests/static/framework/Magento/CodeMessDetector/Test/Unit/Rule/Design/FinalImplementationTest.php index 23875f543a419..ca944b5c60e11 100644 --- a/dev/tests/static/framework/Magento/CodeMessDetector/Test/Unit/Rule/Design/FinalImplementationTest.php +++ b/dev/tests/static/framework/Magento/CodeMessDetector/Test/Unit/Rule/Design/FinalImplementationTest.php @@ -8,8 +8,8 @@ use PHPUnit\Framework\TestCase as TestCase; use PHPUnit_Framework_MockObject_MockObject as MockObject; -use PHPUnit_Framework_MockObject_Matcher_InvokedRecorder as InvokedRecorder; -use PHPUnit\Framework\MockObject_Builder_InvocationMocker as InvocationMocker; +use PHPUnit\Framework\MockObject\Matcher\InvokedRecorder as InvokedRecorder; +use PHPUnit\Framework\MockObject\Builder\InvocationMocker as InvocationMocker; use Magento\CodeMessDetector\Rule\Design\FinalImplementation; use PHPMD\Report; use PHPMD\AbstractNode; diff --git a/lib/internal/Magento/Framework/Composer/Test/Unit/ComposerInformationTest.php b/lib/internal/Magento/Framework/Composer/Test/Unit/ComposerInformationTest.php index 74f8c1dcdb875..27a222e6bceb9 100644 --- a/lib/internal/Magento/Framework/Composer/Test/Unit/ComposerInformationTest.php +++ b/lib/internal/Magento/Framework/Composer/Test/Unit/ComposerInformationTest.php @@ -28,12 +28,12 @@ class ComposerInformationTest extends \PHPUnit\Framework\TestCase private $lockerMock; /** - * @var \Composer\Repository\RepositoryInterface|\PHPUnit\Framework_MockObject_Builder_InvocationMocker: + * @var \Composer\Repository\RepositoryInterface|\PHPUnit\Framework\MockObject\Builder\InvocationMocker */ private $lockerRepositoryMock; /** - * @var \Composer\Package\CompletePackageInterface|\PHPUnit\Framework_MockObject_Builder_InvocationMocker: + * @var \Composer\Package\CompletePackageInterface|\PHPUnit\Framework\MockObject\Builder\InvocationMocker */ private $packageMock; diff --git a/lib/internal/Magento/Framework/File/Size.php b/lib/internal/Magento/Framework/File/Size.php index 6f48024f71c16..9817b3b746303 100644 --- a/lib/internal/Magento/Framework/File/Size.php +++ b/lib/internal/Magento/Framework/File/Size.php @@ -56,7 +56,7 @@ public function getUploadMaxSize() * @param int $mode * @return float */ - public function getMaxFileSizeInMb($precision = 0, $mode = PHP_ROUND_HALF_DOWN) + public function getMaxFileSizeInMb($precision = 0, $mode = \PHP_ROUND_HALF_DOWN) { return $this->getFileSizeInMb($this->getMaxFileSize(), $precision, $mode); } @@ -69,7 +69,7 @@ public function getMaxFileSizeInMb($precision = 0, $mode = PHP_ROUND_HALF_DOWN) * @param int $mode * @return float */ - public function getFileSizeInMb($fileSize, $precision = 0, $mode = PHP_ROUND_HALF_DOWN) + public function getFileSizeInMb($fileSize, $precision = 0, $mode = \PHP_ROUND_HALF_DOWN) { return round($fileSize / (1024 * 1024), $precision, $mode); } diff --git a/lib/internal/Magento/Framework/Filesystem/File/Write.php b/lib/internal/Magento/Framework/Filesystem/File/Write.php index ea2f3a93d66c0..913421aa91ad2 100644 --- a/lib/internal/Magento/Framework/Filesystem/File/Write.php +++ b/lib/internal/Magento/Framework/Filesystem/File/Write.php @@ -103,7 +103,7 @@ public function flush() * @param int $lockMode * @return bool */ - public function lock($lockMode = LOCK_EX) + public function lock($lockMode = \LOCK_EX) { return $this->driver->fileLock($this->resource, $lockMode); } diff --git a/lib/internal/Magento/Framework/Filesystem/File/WriteInterface.php b/lib/internal/Magento/Framework/Filesystem/File/WriteInterface.php index 3592c34dae7f6..ecf554de808cc 100644 --- a/lib/internal/Magento/Framework/Filesystem/File/WriteInterface.php +++ b/lib/internal/Magento/Framework/Filesystem/File/WriteInterface.php @@ -44,7 +44,7 @@ public function flush(); * @param int $lockMode * @return bool */ - public function lock($lockMode = LOCK_EX); + public function lock($lockMode = \LOCK_EX); /** * File unlocking diff --git a/lib/internal/Magento/Framework/Module/Test/Unit/Setup/MigrationTest.php b/lib/internal/Magento/Framework/Module/Test/Unit/Setup/MigrationTest.php index 51e86fcf68bee..07dfbacd5d29c 100644 --- a/lib/internal/Magento/Framework/Module/Test/Unit/Setup/MigrationTest.php +++ b/lib/internal/Magento/Framework/Module/Test/Unit/Setup/MigrationTest.php @@ -251,7 +251,7 @@ protected function _getFilesystemMock() /** * @return \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Serialize\Serializer\Json - * @throws \PHPUnit_Framework_Exception + * @throws \PHPUnit\Framework\Exception */ private function getSerializerMock() { diff --git a/lib/internal/Magento/Framework/TestFramework/Test/Unit/Unit/Matcher/MethodInvokedAtIndexTest.php b/lib/internal/Magento/Framework/TestFramework/Test/Unit/Unit/Matcher/MethodInvokedAtIndexTest.php index 9721cdb8f9331..a232934e1c785 100644 --- a/lib/internal/Magento/Framework/TestFramework/Test/Unit/Unit/Matcher/MethodInvokedAtIndexTest.php +++ b/lib/internal/Magento/Framework/TestFramework/Test/Unit/Unit/Matcher/MethodInvokedAtIndexTest.php @@ -11,14 +11,14 @@ class MethodInvokedAtIndexTest extends \PHPUnit\Framework\TestCase { public function testMatches() { - $invocationObject = new \PHPUnit_Framework_MockObject_Invocation_Object( + $invocationObject = new \PHPUnit\Framework\MockObject\Invocation\ObjectInvocation( 'ClassName', 'ValidMethodName', [], 'void', new \StdClass() ); - $matcher = new \Magento\Framework\TestFramework\Unit\Matcher\MethodInvokedAtIndex(0); + $matcher = new MethodInvokedAtIndex(0); $this->assertTrue($matcher->matches($invocationObject)); $matcher = new MethodInvokedAtIndex(1); diff --git a/lib/internal/Magento/Framework/TestFramework/Unit/Block/Adminhtml.php b/lib/internal/Magento/Framework/TestFramework/Unit/Block/Adminhtml.php index 08d618637db69..f24500c788020 100644 --- a/lib/internal/Magento/Framework/TestFramework/Unit/Block/Adminhtml.php +++ b/lib/internal/Magento/Framework/TestFramework/Unit/Block/Adminhtml.php @@ -197,9 +197,9 @@ protected function _makeMock($className) * @param \PHPUnit_Framework_MockObject_MockObject $object * @param string $stubName * @param mixed $return - * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount|null $expects + * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount|null $expects * - * @return \PHPUnit_Framework_MockObject_Builder_InvocationMocker + * @return \PHPUnit\Framework\MockObject\Builder\InvocationMocker */ protected function _setStub( \PHPUnit_Framework_MockObject_MockObject $object, diff --git a/lib/internal/Magento/Framework/TestFramework/Unit/Helper/ProxyTesting.php b/lib/internal/Magento/Framework/TestFramework/Unit/Helper/ProxyTesting.php index 0dc4d490280ec..3085770980dd3 100644 --- a/lib/internal/Magento/Framework/TestFramework/Unit/Helper/ProxyTesting.php +++ b/lib/internal/Magento/Framework/TestFramework/Unit/Helper/ProxyTesting.php @@ -40,12 +40,12 @@ public function invokeWithExpectations( $expectedParams = $params; } $builder = $proxiedObject->expects( - new \PHPUnit_Framework_MockObject_Matcher_InvokedCount(1) + new \PHPUnit\Framework\MockObject\Matcher\InvokedCount(1) )->method( $expectedMethod ); $builder = call_user_func_array([$builder, 'with'], $expectedParams); - $builder->will(new \PHPUnit_Framework_MockObject_Stub_Return($proxiedResult)); + $builder->will(new \PHPUnit\Framework\MockObject\Stub\ReturnStub($proxiedResult)); return call_user_func_array([$object, $method], $params); } diff --git a/lib/internal/Magento/Framework/TestFramework/Unit/Matcher/MethodInvokedAtIndex.php b/lib/internal/Magento/Framework/TestFramework/Unit/Matcher/MethodInvokedAtIndex.php index cd116521dbea5..c7d62205dcaf9 100644 --- a/lib/internal/Magento/Framework/TestFramework/Unit/Matcher/MethodInvokedAtIndex.php +++ b/lib/internal/Magento/Framework/TestFramework/Unit/Matcher/MethodInvokedAtIndex.php @@ -6,6 +6,9 @@ namespace Magento\Framework\TestFramework\Unit\Matcher; +use PHPUnit\Framework\ExpectationFailedException; +use PHPUnit\Framework\MockObject\Invocation as BaseInvocation; + /** * Class MethodInvokedAtIndex * Matches invocations per 'method' at 'position' @@ -18,30 +21,83 @@ * * @package Magento\TestFramework\Matcher */ -class MethodInvokedAtIndex extends \PHPUnit_Framework_MockObject_Matcher_InvokedAtIndex +class MethodInvokedAtIndex implements \PHPUnit\Framework\MockObject\Matcher\Invocation { + /** + * @var int + */ + private $sequenceIndex; + + /** + * @var int + */ + private $currentIndex = -1; + /** * @var array */ - protected $indexes = []; + private $indexes = []; + + /** + * @param int $sequenceIndex + */ + public function __construct($sequenceIndex) + { + $this->sequenceIndex = $sequenceIndex; + } + + /** + * @return string + */ + public function toString(): string + { + return 'invoked at sequence index ' . $this->sequenceIndex; + } /** - * @param \PHPUnit_Framework_MockObject_Invocation $invocation + * @param \PHPUnit\Framework\MockObject\Invocation $invocation * @return boolean */ - public function matches(\PHPUnit_Framework_MockObject_Invocation $invocation) + public function matches(BaseInvocation $invocation): bool { /** @noinspection PhpUndefinedFieldInspection */ - if (!isset($this->indexes[$invocation->methodName])) { + if (!isset($this->indexes[$invocation->getMethodName()])) { /** @noinspection PhpUndefinedFieldInspection */ - $this->indexes[$invocation->methodName] = 0; + $this->indexes[$invocation->getMethodName()] = 0; } else { /** @noinspection PhpUndefinedFieldInspection */ - $this->indexes[$invocation->methodName]++; + $this->indexes[$invocation->getMethodName()]++; } $this->currentIndex++; /** @noinspection PhpUndefinedFieldInspection */ - return $this->indexes[$invocation->methodName] == $this->sequenceIndex; + return $this->indexes[$invocation->getMethodName()] == $this->sequenceIndex; + } + + /** + * @param BaseInvocation $invocation + * @return mixed + * @SuppressWarnings(PHPMD.UnusedFormalParameter) + */ + public function invoked(BaseInvocation $invocation) + { + } + + /** + * Verifies that the current expectation is valid. If everything is OK the + * code should just return, if not it must throw an exception. + * + * @throws ExpectationFailedException + */ + public function verify(): void + { + if ($this->currentIndex < $this->sequenceIndex) { + throw new ExpectationFailedException( + \sprintf( + 'The expected invocation at index %s was never reached.', + $this->sequenceIndex + ) + ); + } } } diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/AbstractBlockTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/AbstractBlockTest.php index a3f34b732be82..70233c0196dc5 100644 --- a/lib/internal/Magento/Framework/View/Test/Unit/Element/AbstractBlockTest.php +++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/AbstractBlockTest.php @@ -220,9 +220,9 @@ public function testToHtmlWhenModuleIsDisabled() * @param string|bool $cacheLifetime * @param string|bool $dataFromCache * @param string $dataForSaveCache - * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsDispatchEvent - * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsCacheLoad - * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsCacheSave + * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsDispatchEvent + * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsCacheLoad + * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsCacheSave * @param string $expectedResult * @return void * @dataProvider getCacheLifetimeDataProvider diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Data/StructureTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Data/StructureTest.php index 703334f896db5..ab623e59d3712 100644 --- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Data/StructureTest.php +++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Data/StructureTest.php @@ -49,7 +49,7 @@ protected function setUp() } /** - * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $loggerExpects + * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $loggerExpects * @param string $stateMode * @return void * @dataProvider reorderChildElementLogDataProvider diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Generator/BlockTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Generator/BlockTest.php index 4db2da1c1ece9..2a53dbe352cdd 100644 --- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Generator/BlockTest.php +++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Generator/BlockTest.php @@ -20,10 +20,10 @@ class BlockTest extends \PHPUnit\Framework\TestCase * @param array $testArgumentData * @param bool $testIsFlag * @param bool $isNeedEvaluate - * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $addToParentGroupCount - * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $setTemplateCount - * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $setTtlCount - * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $setIsFlag + * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $addToParentGroupCount + * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $setTemplateCount + * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $setTtlCount + * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $setIsFlag * @dataProvider provider * * @SuppressWarnings(PHPMD.ExcessiveMethodLength) diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/BlockTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/BlockTest.php index e69e778c85518..ac1dd43f4dd01 100755 --- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/BlockTest.php +++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/BlockTest.php @@ -89,11 +89,11 @@ protected function setUp() /** * @param string $literal - * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $scheduleStructureCount + * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $scheduleStructureCount * @param string $ifconfigValue * @param array $expectedConditions - * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $getCondition - * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $setCondition + * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $getCondition + * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $setCondition * @param string $aclKey * @param string $aclValue * @@ -238,9 +238,9 @@ public function processBlockDataProvider() /** * @param string $literal * @param string $remove - * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $getCondition - * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $setCondition - * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $setRemoveCondition + * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $getCondition + * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $setCondition + * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $setRemoveCondition * @dataProvider processReferenceDataProvider */ public function testProcessReference( diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/ContainerTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/ContainerTest.php index e4834accbcc07..1a3b77f1e7899 100755 --- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/ContainerTest.php +++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/ContainerTest.php @@ -56,9 +56,9 @@ protected function setUp() * @param string $containerName * @param array $structureElement * @param array $expectedData - * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $getStructureCondition - * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $setStructureCondition - * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $setRemoveCondition + * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $getStructureCondition + * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $setStructureCondition + * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $setRemoveCondition * * @dataProvider processDataProvider */ diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/ScheduledStructure/HelperTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/ScheduledStructure/HelperTest.php index 6421610c6dbcd..401492a774adc 100644 --- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/ScheduledStructure/HelperTest.php +++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/ScheduledStructure/HelperTest.php @@ -144,7 +144,7 @@ public function testScheduleNonExistentElement() } /** - * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $loggerExpects + * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $loggerExpects * @param string $stateMode * @return void * @dataProvider scheduleElementLogDataProvider diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Result/LayoutTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Result/LayoutTest.php index 8b6e8d41b5645..d40d65dd2de77 100644 --- a/lib/internal/Magento/Framework/View/Test/Unit/Result/LayoutTest.php +++ b/lib/internal/Magento/Framework/View/Test/Unit/Result/LayoutTest.php @@ -98,8 +98,8 @@ public function testAddUpdate() * @param string $headerName * @param string $headerValue * @param bool $replaceHeader - * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $setHttpResponseCodeCount - * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $setHeaderCount + * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $setHttpResponseCodeCount + * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $setHeaderCount * @dataProvider renderResultDataProvider */ public function testRenderResult( diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/PhpScannerTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/PhpScannerTest.php index ca3fe64f6d153..5f8cd7643e87c 100644 --- a/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/PhpScannerTest.php +++ b/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/PhpScannerTest.php @@ -69,7 +69,7 @@ public function testCollectEntities() ); $this->assertEquals( - ['\Magento\Eav\Api\Data\AttributeExtensionInterface'], + ['\\' . \Magento\Eav\Api\Data\AttributeExtensionInterface::class], $this->_model->collectEntities($this->_testFiles) ); }