From 81256d0df2a1e586fabb156c75602ce5d95ebd6b Mon Sep 17 00:00:00 2001 From: Maddy Chellathurai Date: Mon, 29 Dec 2014 14:52:14 -0600 Subject: [PATCH 01/44] MAGETWO-31962: Link for 'Guide to Using Sample Data' does not work during instalation - added link to sample data documentation --- .../Magento/Setup/view/magento/setup/customize-your-store.phtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/module/Magento/Setup/view/magento/setup/customize-your-store.phtml b/setup/module/Magento/Setup/view/magento/setup/customize-your-store.phtml index 657caaf24c90b..b0845fc2137ce 100644 --- a/setup/module/Magento/Setup/view/magento/setup/customize-your-store.phtml +++ b/setup/module/Magento/Setup/view/magento/setup/customize-your-store.phtml @@ -16,7 +16,7 @@
-

Using sample of "fake" data can be helpful, letting you automatically build your store with fictious products, tax, and payment settings. But it also creates a lot of extra data you need to remove later. Learn the pros and cons in out Guide to Using Sample Data.

+

Using sample of "fake" data can be helpful, letting you automatically build your store with fictitious products, tax, and payment settings. But it also creates a lot of extra data you need to remove later. Learn the pros and cons in out Guide to Using Sample Data.

From 287dee514b061fa80ba8ef285abdef0d0fac41e7 Mon Sep 17 00:00:00 2001 From: Paul Lewis Date: Mon, 29 Dec 2014 17:13:08 -0600 Subject: [PATCH 02/44] MAGETWO-32106: Wrong url in bootstrap.php for page with "system requirements" - fixed error message for console and browser --- app/bootstrap.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/app/bootstrap.php b/app/bootstrap.php index 532f7002ed6fd..df2f02103cfca 100644 --- a/app/bootstrap.php +++ b/app/bootstrap.php @@ -13,15 +13,14 @@ /* PHP version validation */ if (version_compare(phpversion(), '5.4.11', '<') === true) { if (PHP_SAPI == 'cli') { - echo 'Magento supports PHP 5.4.11 or newer. Please read http://www.magento.com/install.'; + echo 'Magento supports PHP 5.4.11 or later. ' . + 'Please read http://devdocs.magento.com/guides/v1.0/install-gde/system-requirements.html.'; } else { echo << -
-

- Whoops, it looks like you have an invalid PHP version.

-
-

Magento supports PHP 5.4.11 or newer. +

Magento supports PHP 5.4.11 or later. Please read + + http://devdocs.magento.com/guides/v1.0/install-gde/system-requirements.html. HTML; } From 5b1f44df4c0e6de982ede4ef996bea04b496f829 Mon Sep 17 00:00:00 2001 From: Anup Dugar Date: Mon, 29 Dec 2014 22:19:29 -0600 Subject: [PATCH 03/44] MAGETWO-31999: oAuth issue [from github] - Fixed consumer expiry calculation to be more deterministic and removed use of Stdlib\DateTime\DateTime from Token provider --- .../Integration/Model/Oauth/Consumer.php | 11 +++++++++ .../Model/Oauth/Token/Provider.php | 13 ++--------- .../Model/Resource/Oauth/Consumer.php | 18 +++++++++++++++ .../Magento/Integration/Oauth/OauthTest.php | 23 +++++++++++-------- 4 files changed, 44 insertions(+), 21 deletions(-) diff --git a/app/code/Magento/Integration/Model/Oauth/Consumer.php b/app/code/Magento/Integration/Model/Oauth/Consumer.php index eb0cb0a5cfabd..b8f7727d3f313 100644 --- a/app/code/Magento/Integration/Model/Oauth/Consumer.php +++ b/app/code/Magento/Integration/Model/Oauth/Consumer.php @@ -165,4 +165,15 @@ public function getCreatedAt() { return $this->getData('created_at'); } + + /** + * Get time in seconds since consumer was created + * + * @param int $consumerId + * @return int - time lapsed in seconds + */ + public function getTimeInSecondsSinceCreation($consumerId) + { + return $this->getResource()->getTimeInSecondsSinceCreation($consumerId); + } } diff --git a/app/code/Magento/Integration/Model/Oauth/Token/Provider.php b/app/code/Magento/Integration/Model/Oauth/Token/Provider.php index e4a0d7134d7de..42f5f5a3f66a6 100644 --- a/app/code/Magento/Integration/Model/Oauth/Token/Provider.php +++ b/app/code/Magento/Integration/Model/Oauth/Token/Provider.php @@ -26,11 +26,6 @@ class Provider implements TokenProviderInterface */ protected $_dataHelper; - /** - * @var \Magento\Framework\Stdlib\DateTime\DateTime - */ - protected $_date; - /** * @var Token */ @@ -40,20 +35,17 @@ class Provider implements TokenProviderInterface * @param \Magento\Integration\Model\Oauth\Consumer\Factory $consumerFactory * @param \Magento\Integration\Model\Oauth\Token\Factory $tokenFactory * @param \Magento\Integration\Helper\Oauth\Data $dataHelper - * @param \Magento\Framework\Stdlib\DateTime\DateTime $date * @param Token $token */ public function __construct( \Magento\Integration\Model\Oauth\Consumer\Factory $consumerFactory, \Magento\Integration\Model\Oauth\Token\Factory $tokenFactory, \Magento\Integration\Helper\Oauth\Data $dataHelper, - \Magento\Framework\Stdlib\DateTime\DateTime $date, Token $token ) { $this->_consumerFactory = $consumerFactory; $this->_tokenFactory = $tokenFactory; $this->_dataHelper = $dataHelper; - $this->_date = $date; $this->token = $token; } @@ -62,10 +54,9 @@ public function __construct( */ public function validateConsumer($consumer) { - // Must use consumer within expiration period. - $consumerTS = strtotime($consumer->getCreatedAt()); $expiry = $this->_dataHelper->getConsumerExpirationPeriod(); - if ($this->_date->timestamp() - $consumerTS > $expiry) { + // Must use consumer within expiration period. + if ($this->_consumerFactory->create()->getTimeInSecondsSinceCreation($consumer->getId()) > $expiry) { throw new \Magento\Framework\Oauth\Exception( 'Consumer key has expired' ); diff --git a/app/code/Magento/Integration/Model/Resource/Oauth/Consumer.php b/app/code/Magento/Integration/Model/Resource/Oauth/Consumer.php index d4f55c07c7d89..ff9e9bea4861c 100644 --- a/app/code/Magento/Integration/Model/Resource/Oauth/Consumer.php +++ b/app/code/Magento/Integration/Model/Resource/Oauth/Consumer.php @@ -56,4 +56,22 @@ public function _afterDelete(\Magento\Framework\Model\AbstractModel $object) $adapter->delete($this->getTable('oauth_token'), ['consumer_id' => $object->getId()]); return parent::_afterDelete($object); } + + /** + * Compute time in seconds since consumer was created. + * + * @param int $consumerId - The consumer id + * @return int - time lapsed in seconds + */ + public function getTimeInSecondsSinceCreation($consumerId) + { + $adapter = $this->_getReadAdapter(); + $select = $adapter->select() + ->from($this->getMainTable()) + ->reset(\Zend_Db_Select::COLUMNS) + ->columns('CURRENT_TIMESTAMP() - created_at') + ->where('entity_id = ?', $consumerId); + + return $adapter->fetchOne($select); + } } diff --git a/dev/tests/unit/testsuite/Magento/Integration/Oauth/OauthTest.php b/dev/tests/unit/testsuite/Magento/Integration/Oauth/OauthTest.php index b510a867cd1df..0d4ee8d5cc0df 100644 --- a/dev/tests/unit/testsuite/Magento/Integration/Oauth/OauthTest.php +++ b/dev/tests/unit/testsuite/Magento/Integration/Oauth/OauthTest.php @@ -65,6 +65,7 @@ public function setUp() 'getCallbackUrl', 'save', 'getData', + 'getTimeInSecondsSinceCreation', '__wakeup', ] ) @@ -122,7 +123,6 @@ public function setUp() $this->_consumerFactory, $this->_tokenFactory, $this->_dataHelperMock, - $this->_dateMock, $this->_tokenMock ); $this->_oauth = new \Magento\Framework\Oauth\Oauth( @@ -218,7 +218,10 @@ public function testGetRequestTokenConsumerKeyNotFound() public function testGetRequestTokenOutdatedConsumerKey() { $this->_setupConsumer(); - $this->_dateMock->expects($this->any())->method('timestamp')->will($this->returnValue(9999999999)); + $this->_consumerMock + ->expects($this->any()) + ->method('getTimeInSecondsSinceCreation') + ->will($this->returnValue(9999999999)); $this->_dataHelperMock->expects( $this->once() )->method( @@ -267,14 +270,14 @@ protected function _setupConsumer($isLoadable = true) protected function _makeValidExpirationPeriod() { - $this->_dateMock->expects($this->any())->method('timestamp')->will($this->returnValue(0)); - $this->_dataHelperMock->expects( - $this->once() - )->method( - 'getConsumerExpirationPeriod' - )->will( - $this->returnValue(300) - ); + $this->_consumerMock + ->expects($this->any()) + ->method('getTimeInSecondsSinceCreation') + ->will($this->returnValue(0)); + $this->_dataHelperMock + ->expects($this->once()) + ->method('getConsumerExpirationPeriod') + ->will($this->returnValue(300)); } /** From 31643a0475ceaef493cda7bfed6bf2e0118db643 Mon Sep 17 00:00:00 2001 From: Maddy Chellathurai Date: Tue, 30 Dec 2014 09:05:51 -0600 Subject: [PATCH 04/44] MAGETWO-31962: Link for 'Guide to Using Sample Data' does not work during instalation - Changes to wording based on CR --- .../Setup/view/magento/setup/customize-your-store.phtml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup/module/Magento/Setup/view/magento/setup/customize-your-store.phtml b/setup/module/Magento/Setup/view/magento/setup/customize-your-store.phtml index b0845fc2137ce..e7952d3c6c0d6 100644 --- a/setup/module/Magento/Setup/view/magento/setup/customize-your-store.phtml +++ b/setup/module/Magento/Setup/view/magento/setup/customize-your-store.phtml @@ -16,7 +16,8 @@

-

Using sample of "fake" data can be helpful, letting you automatically build your store with fictitious products, tax, and payment settings. But it also creates a lot of extra data you need to remove later. Learn the pros and cons in out Guide to Using Sample Data.

+

+ Select “Use Sample Data" to create a sample store with sample products, customers, and payment settings. Our Guide to Using Sample Data can help you get started.

From 9fd12e2da809332c26ea5026631787e5adbc75db Mon Sep 17 00:00:00 2001 From: Paul Lewis Date: Tue, 30 Dec 2014 14:39:23 -0600 Subject: [PATCH 05/44] MAGETWO-32106: Wrong url in bootstrap.php for page with "system requirements" - added target="_blank" and replace text for link with title of page --- app/bootstrap.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/bootstrap.php b/app/bootstrap.php index df2f02103cfca..a4793300d5b1d 100644 --- a/app/bootstrap.php +++ b/app/bootstrap.php @@ -19,8 +19,8 @@ echo <<

Magento supports PHP 5.4.11 or later. Please read - - http://devdocs.magento.com/guides/v1.0/install-gde/system-requirements.html. + + Magento System Requirements. HTML; } From 9f74f453063078b55edb7a34c3a48015afff74c9 Mon Sep 17 00:00:00 2001 From: Paul Lewis Date: Fri, 2 Jan 2015 11:17:28 -0600 Subject: [PATCH 06/44] MAGETWO-32106: Wrong url in bootstrap.php for page with "system requirements" - remove period at end of CLI message to avoid adding it to URL --- app/bootstrap.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bootstrap.php b/app/bootstrap.php index a4793300d5b1d..97c6f7543855f 100644 --- a/app/bootstrap.php +++ b/app/bootstrap.php @@ -14,7 +14,7 @@ if (version_compare(phpversion(), '5.4.11', '<') === true) { if (PHP_SAPI == 'cli') { echo 'Magento supports PHP 5.4.11 or later. ' . - 'Please read http://devdocs.magento.com/guides/v1.0/install-gde/system-requirements.html.'; + 'Please read http://devdocs.magento.com/guides/v1.0/install-gde/system-requirements.html'; } else { echo << From 4f05d76d9308d744ddfc29843abe7d52fae15a75 Mon Sep 17 00:00:00 2001 From: Anup Dugar Date: Tue, 6 Jan 2015 07:15:41 -0600 Subject: [PATCH 07/44] MAGETWO-31999: oAuth issue [from github] - Added isValidForTokenExchange to the consumer interface - Fixed expiry message for Oauth Consumer Settings --- .../Integration/Model/Oauth/Consumer.php | 18 ++++++++++------ .../Model/Oauth/Token/Provider.php | 13 ++---------- .../Integration/etc/adminhtml/system.xml | 2 +- .../Magento/Integration/Oauth/OauthTest.php | 21 +++++-------------- .../Framework/Oauth/ConsumerInterface.php | 7 +++++++ 5 files changed, 27 insertions(+), 34 deletions(-) diff --git a/app/code/Magento/Integration/Model/Oauth/Consumer.php b/app/code/Magento/Integration/Model/Oauth/Consumer.php index b8f7727d3f313..a1983eb720b10 100644 --- a/app/code/Magento/Integration/Model/Oauth/Consumer.php +++ b/app/code/Magento/Integration/Model/Oauth/Consumer.php @@ -37,11 +37,17 @@ class Consumer extends \Magento\Framework\Model\AbstractModel implements Consume */ protected $_keyLengthFactory; + /** + * @var \Magento\Integration\Helper\Oauth\Data + */ + protected $dataHelper; + /** * @param \Magento\Framework\Model\Context $context * @param \Magento\Framework\Registry $registry * @param \Magento\Integration\Model\Oauth\Consumer\Validator\KeyLengthFactory $keyLengthFactory * @param \Magento\Framework\Url\Validator $urlValidator + * @param \Magento\Integration\Helper\Oauth\Data $dataHelper * @param \Magento\Framework\Model\Resource\AbstractResource $resource * @param \Magento\Framework\Data\Collection\Db $resourceCollection * @param array $data @@ -51,12 +57,14 @@ public function __construct( \Magento\Framework\Registry $registry, \Magento\Integration\Model\Oauth\Consumer\Validator\KeyLengthFactory $keyLengthFactory, \Magento\Framework\Url\Validator $urlValidator, + \Magento\Integration\Helper\Oauth\Data $dataHelper, \Magento\Framework\Model\Resource\AbstractResource $resource = null, \Magento\Framework\Data\Collection\Db $resourceCollection = null, array $data = [] ) { $this->_keyLengthFactory = $keyLengthFactory; $this->_urlValidator = $urlValidator; + $this->dataHelper = $dataHelper; parent::__construct($context, $registry, $resource, $resourceCollection, $data); } @@ -167,13 +175,11 @@ public function getCreatedAt() } /** - * Get time in seconds since consumer was created - * - * @param int $consumerId - * @return int - time lapsed in seconds + * {@inheritdoc} */ - public function getTimeInSecondsSinceCreation($consumerId) + public function isValidForTokenExchange() { - return $this->getResource()->getTimeInSecondsSinceCreation($consumerId); + $expiry = $this->dataHelper->getConsumerExpirationPeriod(); + return $this->getResource()->getTimeInSecondsSinceCreation($this->getId()) > $expiry; } } diff --git a/app/code/Magento/Integration/Model/Oauth/Token/Provider.php b/app/code/Magento/Integration/Model/Oauth/Token/Provider.php index c3af502d077fc..86226e601de79 100644 --- a/app/code/Magento/Integration/Model/Oauth/Token/Provider.php +++ b/app/code/Magento/Integration/Model/Oauth/Token/Provider.php @@ -21,24 +21,16 @@ class Provider implements TokenProviderInterface */ protected $_tokenFactory; - /** - * @var \Magento\Integration\Helper\Oauth\Data - */ - protected $_dataHelper; - /** * @param \Magento\Integration\Model\Oauth\Consumer\Factory $consumerFactory * @param \Magento\Integration\Model\Oauth\TokenFactory $tokenFactory - * @param \Magento\Integration\Helper\Oauth\Data $dataHelper */ public function __construct( \Magento\Integration\Model\Oauth\Consumer\Factory $consumerFactory, - \Magento\Integration\Model\Oauth\TokenFactory $tokenFactory, - \Magento\Integration\Helper\Oauth\Data $dataHelper + \Magento\Integration\Model\Oauth\TokenFactory $tokenFactory ) { $this->_consumerFactory = $consumerFactory; $this->_tokenFactory = $tokenFactory; - $this->_dataHelper = $dataHelper; } /** @@ -46,9 +38,8 @@ public function __construct( */ public function validateConsumer($consumer) { - $expiry = $this->_dataHelper->getConsumerExpirationPeriod(); // Must use consumer within expiration period. - if ($this->_consumerFactory->create()->getTimeInSecondsSinceCreation($consumer->getId()) > $expiry) { + if (!$consumer->isValidForTokenExchange()) { throw new \Magento\Framework\Oauth\Exception( 'Consumer key has expired' ); diff --git a/app/code/Magento/Integration/etc/adminhtml/system.xml b/app/code/Magento/Integration/etc/adminhtml/system.xml index 9532b9a4f5c95..8a86f3be16b6b 100644 --- a/app/code/Magento/Integration/etc/adminhtml/system.xml +++ b/app/code/Magento/Integration/etc/adminhtml/system.xml @@ -25,7 +25,7 @@ - Disable consumer key/secret credentials if not used within X seconds. + Consumer key/secret will expire if not used within X seconds after Oauth token exchange starts. diff --git a/dev/tests/unit/testsuite/Magento/Integration/Oauth/OauthTest.php b/dev/tests/unit/testsuite/Magento/Integration/Oauth/OauthTest.php index e5ea8af3bcd70..f18e1cffb3521 100644 --- a/dev/tests/unit/testsuite/Magento/Integration/Oauth/OauthTest.php +++ b/dev/tests/unit/testsuite/Magento/Integration/Oauth/OauthTest.php @@ -65,7 +65,7 @@ public function setUp() 'getCallbackUrl', 'save', 'getData', - 'getTimeInSecondsSinceCreation', + 'isValidForTokenExchange', '__wakeup', ] ) @@ -219,15 +219,8 @@ public function testGetRequestTokenOutdatedConsumerKey() $this->_setupConsumer(); $this->_consumerMock ->expects($this->any()) - ->method('getTimeInSecondsSinceCreation') - ->will($this->returnValue(9999999999)); - $this->_dataHelperMock->expects( - $this->once() - )->method( - 'getConsumerExpirationPeriod' - )->will( - $this->returnValue(0) - ); + ->method('isValidForTokenExchange') + ->will($this->returnValue(false)); $this->_oauth->getRequestToken($this->_getRequestTokenParams(), self::REQUEST_URL); } @@ -271,12 +264,8 @@ protected function _makeValidExpirationPeriod() { $this->_consumerMock ->expects($this->any()) - ->method('getTimeInSecondsSinceCreation') - ->will($this->returnValue(0)); - $this->_dataHelperMock - ->expects($this->once()) - ->method('getConsumerExpirationPeriod') - ->will($this->returnValue(300)); + ->method('isValidForTokenExchange') + ->will($this->returnValue(true)); } /** diff --git a/lib/internal/Magento/Framework/Oauth/ConsumerInterface.php b/lib/internal/Magento/Framework/Oauth/ConsumerInterface.php index 5413e9aa03a34..9682454247025 100644 --- a/lib/internal/Magento/Framework/Oauth/ConsumerInterface.php +++ b/lib/internal/Magento/Framework/Oauth/ConsumerInterface.php @@ -54,4 +54,11 @@ public function getCallbackUrl(); * @return string */ public function getCreatedAt(); + + /** + * Check if the consumer key has not expired for Oauth token exchange usage + * + * @return bool + */ + public function isValidForTokenExchange(); } From 44b7cc18eb85fea732972653572ae795f2da337c Mon Sep 17 00:00:00 2001 From: Anton Makarenko Date: Tue, 6 Jan 2015 14:54:39 -0600 Subject: [PATCH 08/44] MAGETWO-32365: [GITHUB] "web setup wizard is not accessible" error message but the setup wizard is actually accessible #920 - fixed detecting if Setup application is available when DOCUMENT_ROOT has trailing slash --- .../testsuite/Magento/Framework/App/SetupInfoTest.php | 8 ++++++++ lib/internal/Magento/Framework/App/SetupInfo.php | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dev/tests/unit/testsuite/Magento/Framework/App/SetupInfoTest.php b/dev/tests/unit/testsuite/Magento/Framework/App/SetupInfoTest.php index 19c76c1271360..d2fb5e6ec80ed 100644 --- a/dev/tests/unit/testsuite/Magento/Framework/App/SetupInfoTest.php +++ b/dev/tests/unit/testsuite/Magento/Framework/App/SetupInfoTest.php @@ -180,6 +180,14 @@ public function isAvailableDataProvider() ], false ], + 'root within doc root, existent sub-directory, trailing slash' => [ + [ + 'DOCUMENT_ROOT' => dirname(__DIR__) . DIRECTORY_SEPARATOR, + 'SCRIPT_FILENAME' => __FILE__, + SetupInfo::PARAM_NOT_INSTALLED_URL_PATH => '_files' + ], + true + ], ]; } } diff --git a/lib/internal/Magento/Framework/App/SetupInfo.php b/lib/internal/Magento/Framework/App/SetupInfo.php index da707f20519da..9fb0338d75f0e 100644 --- a/lib/internal/Magento/Framework/App/SetupInfo.php +++ b/lib/internal/Magento/Framework/App/SetupInfo.php @@ -56,7 +56,7 @@ public function __construct($server, $projectRoot = '') if (empty($server['DOCUMENT_ROOT'])) { throw new \InvalidArgumentException('DOCUMENT_ROOT variable is unavailable.'); } - $this->docRoot = str_replace('\\', '/', $server['DOCUMENT_ROOT']); + $this->docRoot = rtrim(str_replace('\\', '/', $server['DOCUMENT_ROOT']), '/'); $this->projectRoot = $projectRoot ?: $this->detectProjectRoot(); $this->projectRoot = str_replace('\\', '/', $this->projectRoot); } From 41fae5acc3a12ee7657410e4bc7709be6e668df9 Mon Sep 17 00:00:00 2001 From: Anup Dugar Date: Wed, 7 Jan 2015 13:31:47 -0600 Subject: [PATCH 09/44] MAGETWO-31999: oAuth issue [from github] - Fixed expiry check --- app/code/Magento/Integration/Model/Oauth/Consumer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Integration/Model/Oauth/Consumer.php b/app/code/Magento/Integration/Model/Oauth/Consumer.php index a1983eb720b10..8792c7925e3ec 100644 --- a/app/code/Magento/Integration/Model/Oauth/Consumer.php +++ b/app/code/Magento/Integration/Model/Oauth/Consumer.php @@ -180,6 +180,6 @@ public function getCreatedAt() public function isValidForTokenExchange() { $expiry = $this->dataHelper->getConsumerExpirationPeriod(); - return $this->getResource()->getTimeInSecondsSinceCreation($this->getId()) > $expiry; + return $expiry > $this->getResource()->getTimeInSecondsSinceCreation($this->getId()); } } From 5fc0f166c88783333c2de7bac2ce33a3ad596331 Mon Sep 17 00:00:00 2001 From: Safwan Khan Date: Wed, 7 Jan 2015 15:08:56 -0600 Subject: [PATCH 10/44] MAGETWO-32363: Update composer files for PHP 5.6 - Updated all composer.json files along with composer.lock to support PHP 5.6 --- .../Magento/AdminNotification/composer.json | 2 +- app/code/Magento/Authorization/composer.json | 2 +- app/code/Magento/Backend/composer.json | 2 +- app/code/Magento/Backup/composer.json | 2 +- app/code/Magento/Bundle/composer.json | 2 +- app/code/Magento/Captcha/composer.json | 2 +- app/code/Magento/Catalog/composer.json | 2 +- .../Magento/CatalogImportExport/composer.json | 2 +- .../Magento/CatalogInventory/composer.json | 2 +- app/code/Magento/CatalogRule/composer.json | 2 +- app/code/Magento/CatalogSearch/composer.json | 2 +- .../Magento/CatalogUrlRewrite/composer.json | 2 +- app/code/Magento/CatalogWidget/composer.json | 2 +- app/code/Magento/Centinel/composer.json | 2 +- app/code/Magento/Checkout/composer.json | 2 +- .../Magento/CheckoutAgreements/composer.json | 2 +- app/code/Magento/Cms/composer.json | 2 +- app/code/Magento/CmsUrlRewrite/composer.json | 2 +- .../ConfigurableImportExport/composer.json | 2 +- .../Magento/ConfigurableProduct/composer.json | 2 +- app/code/Magento/Contact/composer.json | 2 +- app/code/Magento/Core/composer.json | 2 +- app/code/Magento/Cron/composer.json | 2 +- app/code/Magento/CurrencySymbol/composer.json | 2 +- app/code/Magento/Customer/composer.json | 2 +- .../CustomerImportExport/composer.json | 2 +- app/code/Magento/DesignEditor/composer.json | 2 +- app/code/Magento/Dhl/composer.json | 2 +- app/code/Magento/Directory/composer.json | 2 +- app/code/Magento/Downloadable/composer.json | 2 +- app/code/Magento/Eav/composer.json | 2 +- app/code/Magento/Email/composer.json | 2 +- app/code/Magento/Fedex/composer.json | 2 +- app/code/Magento/GiftMessage/composer.json | 2 +- app/code/Magento/GoogleAdwords/composer.json | 2 +- .../Magento/GoogleAnalytics/composer.json | 2 +- .../Magento/GoogleOptimizer/composer.json | 2 +- app/code/Magento/GoogleShopping/composer.json | 2 +- .../Magento/GroupedImportExport/composer.json | 2 +- app/code/Magento/GroupedProduct/composer.json | 2 +- app/code/Magento/ImportExport/composer.json | 2 +- app/code/Magento/Indexer/composer.json | 2 +- app/code/Magento/Integration/composer.json | 2 +- .../Magento/LayeredNavigation/composer.json | 2 +- app/code/Magento/Log/composer.json | 2 +- app/code/Magento/Msrp/composer.json | 2 +- app/code/Magento/Multishipping/composer.json | 2 +- app/code/Magento/Newsletter/composer.json | 2 +- .../Magento/OfflinePayments/composer.json | 2 +- .../Magento/OfflineShipping/composer.json | 2 +- app/code/Magento/PageCache/composer.json | 2 +- app/code/Magento/Payment/composer.json | 2 +- app/code/Magento/Persistent/composer.json | 2 +- app/code/Magento/ProductAlert/composer.json | 2 +- app/code/Magento/Reports/composer.json | 2 +- app/code/Magento/RequireJs/composer.json | 2 +- app/code/Magento/Review/composer.json | 2 +- app/code/Magento/Rss/composer.json | 2 +- app/code/Magento/Rule/composer.json | 2 +- app/code/Magento/Sales/composer.json | 2 +- app/code/Magento/SalesRule/composer.json | 2 +- app/code/Magento/Search/composer.json | 2 +- app/code/Magento/Sendfriend/composer.json | 2 +- app/code/Magento/Shipping/composer.json | 2 +- app/code/Magento/Sitemap/composer.json | 2 +- app/code/Magento/Store/composer.json | 2 +- app/code/Magento/Tax/composer.json | 2 +- .../Magento/TaxImportExport/composer.json | 2 +- app/code/Magento/Theme/composer.json | 2 +- app/code/Magento/Translation/composer.json | 2 +- app/code/Magento/Ui/composer.json | 2 +- app/code/Magento/Ups/composer.json | 2 +- app/code/Magento/UrlRewrite/composer.json | 2 +- app/code/Magento/User/composer.json | 2 +- app/code/Magento/Usps/composer.json | 2 +- app/code/Magento/Webapi/composer.json | 2 +- app/code/Magento/Weee/composer.json | 2 +- app/code/Magento/Widget/composer.json | 2 +- app/code/Magento/Wishlist/composer.json | 2 +- .../adminhtml/Magento/backend/composer.json | 2 +- .../frontend/Magento/blank/composer.json | 2 +- .../frontend/Magento/luma/composer.json | 2 +- composer.json | 2 +- composer.lock | 122 +++++++++--------- .../_files/design/frontend/a_d/composer.json | 2 +- .../_files/design/frontend/b_e/composer.json | 2 +- .../frontend/magento_default/composer.json | 2 +- .../design/frontend/magento_g/composer.json | 2 +- .../adminhtml/Vendor/test/composer.json | 2 +- .../area_two/Vendor/theme_one/composer.json | 2 +- .../Vendor/theme_one/composer.json | 2 +- .../frontend/Magento/default/composer.json | 2 +- .../Magento/default_iphone/composer.json | 2 +- .../Test/cache_test_theme/composer.json | 2 +- .../frontend/Test/default/composer.json | 2 +- .../frontend/Test/publication/composer.json | 2 +- .../frontend/Test/test_theme/composer.json | 2 +- .../Vendor/custom_theme/composer.json | 2 +- .../frontend/Vendor/default/composer.json | 2 +- .../design/frontend/Vendor/test/composer.json | 2 +- .../frontend/Vendor/test_child/composer.json | 2 +- .../adminhtml/test_default/composer.json | 2 +- .../frontend/test_default/composer.json | 2 +- .../frontend/Test/default/composer.json | 2 +- .../design/frontend/Test/parent/composer.json | 2 +- .../Vendor/custom_theme/composer.json | 2 +- .../Vendor/custom_theme2/composer.json | 2 +- .../frontend/Vendor/default/composer.json | 2 +- .../Vendor/standalone_theme/composer.json | 2 +- .../Tools/Dependency/_files/composer1.json | 2 +- .../Tools/Dependency/_files/composer2.json | 2 +- .../Tools/Dependency/_files/composer3.json | 2 +- .../Tools/Dependency/_files/composer4.json | 2 +- .../Tools/Dependency/_files/composer5.json | 2 +- .../adminhtml/magento_basic/composer.json | 2 +- .../frontend/magento_iphone/composer.json | 2 +- .../_files/area/default_default/composer.json | 2 +- .../_files/area/default_test/composer.json | 2 +- .../_files/area/default_test2/composer.json | 2 +- .../_files/area/test_default/composer.json | 2 +- .../composer.json | 2 +- lib/internal/Magento/Framework/composer.json | 2 +- 122 files changed, 182 insertions(+), 182 deletions(-) diff --git a/app/code/Magento/AdminNotification/composer.json b/app/code/Magento/AdminNotification/composer.json index c535ad1fe7846..226fcdcc4f4cc 100644 --- a/app/code/Magento/AdminNotification/composer.json +++ b/app/code/Magento/AdminNotification/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-admin-notification", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", "magento/module-backend": "0.42.0-beta2", diff --git a/app/code/Magento/Authorization/composer.json b/app/code/Magento/Authorization/composer.json index 531bda8586eb3..c57613556f014 100644 --- a/app/code/Magento/Authorization/composer.json +++ b/app/code/Magento/Authorization/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-authorization", "description": "Authorization module provides access to Magento ACL functionality.", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-backend": "0.42.0-beta2", "magento/framework": "0.42.0-beta2", "magento/magento-composer-installer": "*" diff --git a/app/code/Magento/Backend/composer.json b/app/code/Magento/Backend/composer.json index aeec76291c95b..a6385383c0b2a 100644 --- a/app/code/Magento/Backend/composer.json +++ b/app/code/Magento/Backend/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-backend", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-directory": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", diff --git a/app/code/Magento/Backup/composer.json b/app/code/Magento/Backup/composer.json index 607d773f9484f..f4670b46b9ced 100644 --- a/app/code/Magento/Backup/composer.json +++ b/app/code/Magento/Backup/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-backup", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", "magento/module-backend": "0.42.0-beta2", diff --git a/app/code/Magento/Bundle/composer.json b/app/code/Magento/Bundle/composer.json index 361d5902c7b7e..3dd36aa3fd1a0 100644 --- a/app/code/Magento/Bundle/composer.json +++ b/app/code/Magento/Bundle/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-bundle", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-catalog": "0.42.0-beta2", "magento/module-tax": "0.42.0-beta2", diff --git a/app/code/Magento/Captcha/composer.json b/app/code/Magento/Captcha/composer.json index a8d6ee4d23b55..210b3aa58a43a 100644 --- a/app/code/Magento/Captcha/composer.json +++ b/app/code/Magento/Captcha/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-captcha", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-customer": "0.42.0-beta2", "magento/module-checkout": "0.42.0-beta2", diff --git a/app/code/Magento/Catalog/composer.json b/app/code/Magento/Catalog/composer.json index fe448355f37bf..a339555ca70d8 100644 --- a/app/code/Magento/Catalog/composer.json +++ b/app/code/Magento/Catalog/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-catalog", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-eav": "0.42.0-beta2", "magento/module-cms": "0.42.0-beta2", diff --git a/app/code/Magento/CatalogImportExport/composer.json b/app/code/Magento/CatalogImportExport/composer.json index 0c8868a542cf7..477a320561f04 100644 --- a/app/code/Magento/CatalogImportExport/composer.json +++ b/app/code/Magento/CatalogImportExport/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-catalog-import-export", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-core": "0.42.0-beta2", "magento/module-catalog": "0.42.0-beta2", "magento/module-eav": "0.42.0-beta2", diff --git a/app/code/Magento/CatalogInventory/composer.json b/app/code/Magento/CatalogInventory/composer.json index adcd06788b10b..1913f562d776c 100644 --- a/app/code/Magento/CatalogInventory/composer.json +++ b/app/code/Magento/CatalogInventory/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-catalog-inventory", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-catalog": "0.42.0-beta2", "magento/module-customer": "0.42.0-beta2", diff --git a/app/code/Magento/CatalogRule/composer.json b/app/code/Magento/CatalogRule/composer.json index 8f0d6f3203c38..ff8a250510e08 100644 --- a/app/code/Magento/CatalogRule/composer.json +++ b/app/code/Magento/CatalogRule/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-catalog-rule", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-rule": "0.42.0-beta2", "magento/module-catalog": "0.42.0-beta2", diff --git a/app/code/Magento/CatalogSearch/composer.json b/app/code/Magento/CatalogSearch/composer.json index cfc250a47f094..6419337ababfb 100644 --- a/app/code/Magento/CatalogSearch/composer.json +++ b/app/code/Magento/CatalogSearch/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-catalog-search", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-catalog": "0.42.0-beta2", "magento/module-search": "0.42.0-beta2", diff --git a/app/code/Magento/CatalogUrlRewrite/composer.json b/app/code/Magento/CatalogUrlRewrite/composer.json index 14b53cbabdb0e..27b5845864ce5 100644 --- a/app/code/Magento/CatalogUrlRewrite/composer.json +++ b/app/code/Magento/CatalogUrlRewrite/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-catalog-url-rewrite", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-backend": "0.42.0-beta2", "magento/module-catalog": "0.42.0-beta2", "magento/module-catalog-import-export": "0.42.0-beta2", diff --git a/app/code/Magento/CatalogWidget/composer.json b/app/code/Magento/CatalogWidget/composer.json index 9d078bb6a55ae..9bb9aee4686c6 100644 --- a/app/code/Magento/CatalogWidget/composer.json +++ b/app/code/Magento/CatalogWidget/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-catalog-widget", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-catalog": "0.42.0-beta2", "magento/module-widget": "0.42.0-beta2", "magento/module-backend": "0.42.0-beta2", diff --git a/app/code/Magento/Centinel/composer.json b/app/code/Magento/Centinel/composer.json index 88add92445e43..a7a2e9865c1c3 100644 --- a/app/code/Magento/Centinel/composer.json +++ b/app/code/Magento/Centinel/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-centinel", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-checkout": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", diff --git a/app/code/Magento/Checkout/composer.json b/app/code/Magento/Checkout/composer.json index bfb7b17b422f2..952b58a5543bb 100644 --- a/app/code/Magento/Checkout/composer.json +++ b/app/code/Magento/Checkout/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-checkout", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-sales": "0.42.0-beta2", "magento/module-authorization": "0.42.0-beta2", diff --git a/app/code/Magento/CheckoutAgreements/composer.json b/app/code/Magento/CheckoutAgreements/composer.json index 8463f4a91f454..b556f6753320a 100644 --- a/app/code/Magento/CheckoutAgreements/composer.json +++ b/app/code/Magento/CheckoutAgreements/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-checkout-agreements", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-checkout": "0.42.0-beta2", "magento/module-store": "0.42.0-beta2", "magento/module-backend": "0.42.0-beta2", diff --git a/app/code/Magento/Cms/composer.json b/app/code/Magento/Cms/composer.json index a21c486469f6c..448106a625460 100644 --- a/app/code/Magento/Cms/composer.json +++ b/app/code/Magento/Cms/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-cms", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", "magento/module-theme": "0.42.0-beta2", diff --git a/app/code/Magento/CmsUrlRewrite/composer.json b/app/code/Magento/CmsUrlRewrite/composer.json index 32a478b3fba14..42dd0565d0487 100644 --- a/app/code/Magento/CmsUrlRewrite/composer.json +++ b/app/code/Magento/CmsUrlRewrite/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-cms-url-rewrite", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-cms": "0.42.0-beta2", "magento/module-store": "0.42.0-beta2", "magento/module-url-rewrite": "0.42.0-beta2", diff --git a/app/code/Magento/ConfigurableImportExport/composer.json b/app/code/Magento/ConfigurableImportExport/composer.json index de3e60c4f3cab..b653bd1cf74fd 100644 --- a/app/code/Magento/ConfigurableImportExport/composer.json +++ b/app/code/Magento/ConfigurableImportExport/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-configurable-import-export", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-catalog": "0.42.0-beta2", "magento/module-catalog-import-export": "0.42.0-beta2", "magento/module-eav": "0.42.0-beta2", diff --git a/app/code/Magento/ConfigurableProduct/composer.json b/app/code/Magento/ConfigurableProduct/composer.json index faa5a31fdf94b..a8c626716323b 100644 --- a/app/code/Magento/ConfigurableProduct/composer.json +++ b/app/code/Magento/ConfigurableProduct/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-configurable-product", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-catalog": "0.42.0-beta2", "magento/module-catalog-inventory": "0.42.0-beta2", diff --git a/app/code/Magento/Contact/composer.json b/app/code/Magento/Contact/composer.json index 21e57df75ebc4..73bce7725f63e 100644 --- a/app/code/Magento/Contact/composer.json +++ b/app/code/Magento/Contact/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-contact", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-customer": "0.42.0-beta2", "magento/module-backend": "0.42.0-beta2", diff --git a/app/code/Magento/Core/composer.json b/app/code/Magento/Core/composer.json index d0f462f935cfe..f80fbad291446 100644 --- a/app/code/Magento/Core/composer.json +++ b/app/code/Magento/Core/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-core", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-backend": "0.42.0-beta2", "magento/module-cron": "0.42.0-beta2", diff --git a/app/code/Magento/Cron/composer.json b/app/code/Magento/Cron/composer.json index 26a0c49e2bcb1..2bd08194d7125 100644 --- a/app/code/Magento/Cron/composer.json +++ b/app/code/Magento/Cron/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-cron", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-backend": "0.42.0-beta2", "magento/framework": "0.42.0-beta2", diff --git a/app/code/Magento/CurrencySymbol/composer.json b/app/code/Magento/CurrencySymbol/composer.json index e81038fe6a9bb..943178f2ffb67 100644 --- a/app/code/Magento/CurrencySymbol/composer.json +++ b/app/code/Magento/CurrencySymbol/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-currency-symbol", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-page-cache": "0.42.0-beta2", "magento/module-directory": "0.42.0-beta2", diff --git a/app/code/Magento/Customer/composer.json b/app/code/Magento/Customer/composer.json index b43bee3bd5227..46b521c0e412c 100644 --- a/app/code/Magento/Customer/composer.json +++ b/app/code/Magento/Customer/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-customer", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-eav": "0.42.0-beta2", "magento/module-directory": "0.42.0-beta2", diff --git a/app/code/Magento/CustomerImportExport/composer.json b/app/code/Magento/CustomerImportExport/composer.json index eb6cfecd3b82b..723bd7ad3dd1f 100644 --- a/app/code/Magento/CustomerImportExport/composer.json +++ b/app/code/Magento/CustomerImportExport/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-customer-import-export", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-backend": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", "magento/module-customer": "0.42.0-beta2", diff --git a/app/code/Magento/DesignEditor/composer.json b/app/code/Magento/DesignEditor/composer.json index badd482f1f9a7..9da28cf7e2e90 100644 --- a/app/code/Magento/DesignEditor/composer.json +++ b/app/code/Magento/DesignEditor/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-design-editor", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-theme": "0.42.0-beta2", "magento/module-backend": "0.42.0-beta2", diff --git a/app/code/Magento/Dhl/composer.json b/app/code/Magento/Dhl/composer.json index 6a5e7b77d1333..54658c388b384 100644 --- a/app/code/Magento/Dhl/composer.json +++ b/app/code/Magento/Dhl/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-dhl", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-shipping": "0.42.0-beta2", "magento/module-backend": "0.42.0-beta2", diff --git a/app/code/Magento/Directory/composer.json b/app/code/Magento/Directory/composer.json index ffabf1f65c02d..b32bd6ed430b7 100644 --- a/app/code/Magento/Directory/composer.json +++ b/app/code/Magento/Directory/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-directory", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", "magento/module-backend": "0.42.0-beta2", diff --git a/app/code/Magento/Downloadable/composer.json b/app/code/Magento/Downloadable/composer.json index 099aada617682..2aaf4af8db162 100644 --- a/app/code/Magento/Downloadable/composer.json +++ b/app/code/Magento/Downloadable/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-downloadable", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-catalog": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", diff --git a/app/code/Magento/Eav/composer.json b/app/code/Magento/Eav/composer.json index 401bb5a2f2a4f..1424bfd69c9d3 100644 --- a/app/code/Magento/Eav/composer.json +++ b/app/code/Magento/Eav/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-eav", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", "magento/module-backend": "0.42.0-beta2", diff --git a/app/code/Magento/Email/composer.json b/app/code/Magento/Email/composer.json index 5cfba4a520a15..de9fad2242f91 100644 --- a/app/code/Magento/Email/composer.json +++ b/app/code/Magento/Email/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-email", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", "magento/module-cms": "0.42.0-beta2", diff --git a/app/code/Magento/Fedex/composer.json b/app/code/Magento/Fedex/composer.json index c986bb2eaa583..20c8b98b6ea0a 100644 --- a/app/code/Magento/Fedex/composer.json +++ b/app/code/Magento/Fedex/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-fedex", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-shipping": "0.42.0-beta2", "magento/module-directory": "0.42.0-beta2", diff --git a/app/code/Magento/GiftMessage/composer.json b/app/code/Magento/GiftMessage/composer.json index 49c57a5c0af71..55637f8036bd9 100644 --- a/app/code/Magento/GiftMessage/composer.json +++ b/app/code/Magento/GiftMessage/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-gift-message", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-catalog": "0.42.0-beta2", "magento/module-checkout": "0.42.0-beta2", diff --git a/app/code/Magento/GoogleAdwords/composer.json b/app/code/Magento/GoogleAdwords/composer.json index 788dcfae1dde7..0cf10cead21fe 100644 --- a/app/code/Magento/GoogleAdwords/composer.json +++ b/app/code/Magento/GoogleAdwords/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-google-adwords", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-sales": "0.42.0-beta2", "magento/framework": "0.42.0-beta2", diff --git a/app/code/Magento/GoogleAnalytics/composer.json b/app/code/Magento/GoogleAnalytics/composer.json index 6970e094a645e..6c526d7db5f16 100644 --- a/app/code/Magento/GoogleAnalytics/composer.json +++ b/app/code/Magento/GoogleAnalytics/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-google-analytics", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-sales": "0.42.0-beta2", "magento/framework": "0.42.0-beta2", diff --git a/app/code/Magento/GoogleOptimizer/composer.json b/app/code/Magento/GoogleOptimizer/composer.json index bf78f67b5539d..65a2cafa86256 100644 --- a/app/code/Magento/GoogleOptimizer/composer.json +++ b/app/code/Magento/GoogleOptimizer/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-google-optimizer", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-google-analytics": "0.42.0-beta2", "magento/module-catalog": "0.42.0-beta2", diff --git a/app/code/Magento/GoogleShopping/composer.json b/app/code/Magento/GoogleShopping/composer.json index e495e5483c9d1..42a98d50dac2a 100644 --- a/app/code/Magento/GoogleShopping/composer.json +++ b/app/code/Magento/GoogleShopping/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-google-shopping", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", "magento/module-backend": "0.42.0-beta2", diff --git a/app/code/Magento/GroupedImportExport/composer.json b/app/code/Magento/GroupedImportExport/composer.json index aaecfb8a7ef46..5359c2e40852b 100644 --- a/app/code/Magento/GroupedImportExport/composer.json +++ b/app/code/Magento/GroupedImportExport/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-grouped-import-export", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-catalog": "0.42.0-beta2", "magento/module-import-export": "0.42.0-beta2", "magento/module-catalog-import-export": "0.42.0-beta2", diff --git a/app/code/Magento/GroupedProduct/composer.json b/app/code/Magento/GroupedProduct/composer.json index ed6dc4ddd57ef..b561a85f6c937 100644 --- a/app/code/Magento/GroupedProduct/composer.json +++ b/app/code/Magento/GroupedProduct/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-grouped-product", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-catalog": "0.42.0-beta2", "magento/module-catalog-inventory": "0.42.0-beta2", diff --git a/app/code/Magento/ImportExport/composer.json b/app/code/Magento/ImportExport/composer.json index 0333fadc33c60..1b8e6a7b0ecf1 100644 --- a/app/code/Magento/ImportExport/composer.json +++ b/app/code/Magento/ImportExport/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-import-export", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", "magento/module-backend": "0.42.0-beta2", diff --git a/app/code/Magento/Indexer/composer.json b/app/code/Magento/Indexer/composer.json index 1a2e3bcba0755..5e3bb6e770a29 100644 --- a/app/code/Magento/Indexer/composer.json +++ b/app/code/Magento/Indexer/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-indexer", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-backend": "0.42.0-beta2", "magento/module-page-cache": "0.42.0-beta2", "magento/framework": "0.42.0-beta2", diff --git a/app/code/Magento/Integration/composer.json b/app/code/Magento/Integration/composer.json index d30a365c4c991..137b4a9ec0f77 100644 --- a/app/code/Magento/Integration/composer.json +++ b/app/code/Magento/Integration/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-integration", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", "magento/module-backend": "0.42.0-beta2", diff --git a/app/code/Magento/LayeredNavigation/composer.json b/app/code/Magento/LayeredNavigation/composer.json index aadf43d71c1d2..c10e066ff7f41 100644 --- a/app/code/Magento/LayeredNavigation/composer.json +++ b/app/code/Magento/LayeredNavigation/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-layered-navigation", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-catalog": "0.42.0-beta2", "magento/module-backend": "0.42.0-beta2", "magento/framework": "0.42.0-beta2", diff --git a/app/code/Magento/Log/composer.json b/app/code/Magento/Log/composer.json index 9f97050e77e98..ff4c94dc8b7eb 100644 --- a/app/code/Magento/Log/composer.json +++ b/app/code/Magento/Log/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-log", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", "magento/module-customer": "0.42.0-beta2", diff --git a/app/code/Magento/Msrp/composer.json b/app/code/Magento/Msrp/composer.json index 4644a21f2c486..8dee927a58200 100644 --- a/app/code/Magento/Msrp/composer.json +++ b/app/code/Magento/Msrp/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-msrp", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-bundle": "0.42.0-beta2", "magento/module-catalog": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", diff --git a/app/code/Magento/Multishipping/composer.json b/app/code/Magento/Multishipping/composer.json index 4b6f7bd24aca0..9a5bcae1c1f72 100644 --- a/app/code/Magento/Multishipping/composer.json +++ b/app/code/Magento/Multishipping/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-multishipping", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", "magento/module-checkout": "0.42.0-beta2", diff --git a/app/code/Magento/Newsletter/composer.json b/app/code/Magento/Newsletter/composer.json index 8e8c5ea8d79ba..ea4feace2fb9e 100644 --- a/app/code/Magento/Newsletter/composer.json +++ b/app/code/Magento/Newsletter/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-newsletter", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", "magento/module-customer": "0.42.0-beta2", diff --git a/app/code/Magento/OfflinePayments/composer.json b/app/code/Magento/OfflinePayments/composer.json index 3e14de61e13f8..ea087cab96f2a 100644 --- a/app/code/Magento/OfflinePayments/composer.json +++ b/app/code/Magento/OfflinePayments/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-offline-payments", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-payment": "0.42.0-beta2", "magento/framework": "0.42.0-beta2", "magento/magento-composer-installer": "*" diff --git a/app/code/Magento/OfflineShipping/composer.json b/app/code/Magento/OfflineShipping/composer.json index 013eee21a918d..5af2a94f7746f 100644 --- a/app/code/Magento/OfflineShipping/composer.json +++ b/app/code/Magento/OfflineShipping/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-offline-shipping", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-backend": "0.42.0-beta2", "magento/module-shipping": "0.42.0-beta2", diff --git a/app/code/Magento/PageCache/composer.json b/app/code/Magento/PageCache/composer.json index 1fa0f7dbb2486..add78ab7eb4b4 100644 --- a/app/code/Magento/PageCache/composer.json +++ b/app/code/Magento/PageCache/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-page-cache", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-backend": "0.42.0-beta2", "magento/framework": "0.42.0-beta2", diff --git a/app/code/Magento/Payment/composer.json b/app/code/Magento/Payment/composer.json index bda90a3cbc12e..5cb066b85ac21 100644 --- a/app/code/Magento/Payment/composer.json +++ b/app/code/Magento/Payment/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-payment", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", "magento/module-sales": "0.42.0-beta2", diff --git a/app/code/Magento/Persistent/composer.json b/app/code/Magento/Persistent/composer.json index e9dfbcdca9f43..8f6e755b02418 100644 --- a/app/code/Magento/Persistent/composer.json +++ b/app/code/Magento/Persistent/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-persistent", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-checkout": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", diff --git a/app/code/Magento/ProductAlert/composer.json b/app/code/Magento/ProductAlert/composer.json index ce27de2532c3e..5a79a3241b9bc 100644 --- a/app/code/Magento/ProductAlert/composer.json +++ b/app/code/Magento/ProductAlert/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-product-alert", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-catalog": "0.42.0-beta2", "magento/module-customer": "0.42.0-beta2", diff --git a/app/code/Magento/Reports/composer.json b/app/code/Magento/Reports/composer.json index 1784a532b0e7c..212b61ec13e9b 100644 --- a/app/code/Magento/Reports/composer.json +++ b/app/code/Magento/Reports/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-reports", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-eav": "0.42.0-beta2", "magento/module-customer": "0.42.0-beta2", diff --git a/app/code/Magento/RequireJs/composer.json b/app/code/Magento/RequireJs/composer.json index 7b1ca1f8af0d8..81c777f89b8a3 100644 --- a/app/code/Magento/RequireJs/composer.json +++ b/app/code/Magento/RequireJs/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-require-js", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/framework": "0.42.0-beta2", "magento/magento-composer-installer": "*" }, diff --git a/app/code/Magento/Review/composer.json b/app/code/Magento/Review/composer.json index c0aba7261db0a..cf132b880d540 100644 --- a/app/code/Magento/Review/composer.json +++ b/app/code/Magento/Review/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-review", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-catalog": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", diff --git a/app/code/Magento/Rss/composer.json b/app/code/Magento/Rss/composer.json index 55830ff619d63..7689827c4d129 100644 --- a/app/code/Magento/Rss/composer.json +++ b/app/code/Magento/Rss/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-rss", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-backend": "0.42.0-beta2", "magento/framework": "0.42.0-beta2", diff --git a/app/code/Magento/Rule/composer.json b/app/code/Magento/Rule/composer.json index cabe83db1fee9..75c666cbdddf5 100644 --- a/app/code/Magento/Rule/composer.json +++ b/app/code/Magento/Rule/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-rule", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-eav": "0.42.0-beta2", "magento/module-catalog": "0.42.0-beta2", diff --git a/app/code/Magento/Sales/composer.json b/app/code/Magento/Sales/composer.json index 5220cd715a079..5d54dd97fa69a 100644 --- a/app/code/Magento/Sales/composer.json +++ b/app/code/Magento/Sales/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-sales", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-catalog": "0.42.0-beta2", "magento/module-customer": "0.42.0-beta2", diff --git a/app/code/Magento/SalesRule/composer.json b/app/code/Magento/SalesRule/composer.json index 5017f8928d7bc..83db72961867b 100644 --- a/app/code/Magento/SalesRule/composer.json +++ b/app/code/Magento/SalesRule/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-sales-rule", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-rule": "0.42.0-beta2", "magento/module-catalog": "0.42.0-beta2", diff --git a/app/code/Magento/Search/composer.json b/app/code/Magento/Search/composer.json index 5043405ad17cf..9e0361285b65c 100644 --- a/app/code/Magento/Search/composer.json +++ b/app/code/Magento/Search/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-search", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/framework": "0.42.0-beta2", "magento/module-backend": "0.42.0-beta2", "magento/module-store": "0.42.0-beta2", diff --git a/app/code/Magento/Sendfriend/composer.json b/app/code/Magento/Sendfriend/composer.json index b9fc79a750c35..6c683ec12f030 100644 --- a/app/code/Magento/Sendfriend/composer.json +++ b/app/code/Magento/Sendfriend/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-sendfriend", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-catalog": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", diff --git a/app/code/Magento/Shipping/composer.json b/app/code/Magento/Shipping/composer.json index 36a2294310b4d..d25b1b11c3eaa 100644 --- a/app/code/Magento/Shipping/composer.json +++ b/app/code/Magento/Shipping/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-shipping", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", "magento/module-catalog": "0.42.0-beta2", diff --git a/app/code/Magento/Sitemap/composer.json b/app/code/Magento/Sitemap/composer.json index 6394181c86c42..5724b659a5d39 100644 --- a/app/code/Magento/Sitemap/composer.json +++ b/app/code/Magento/Sitemap/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-sitemap", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-catalog": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", diff --git a/app/code/Magento/Store/composer.json b/app/code/Magento/Store/composer.json index 4ea7b85cd29a9..bdbb6454aeb44 100644 --- a/app/code/Magento/Store/composer.json +++ b/app/code/Magento/Store/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-store", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-core": "0.42.0-beta2", "magento/module-directory": "0.42.0-beta2", "magento/module-ui": "0.42.0-beta2", diff --git a/app/code/Magento/Tax/composer.json b/app/code/Magento/Tax/composer.json index 47a035e7a77e8..a191202b106cf 100644 --- a/app/code/Magento/Tax/composer.json +++ b/app/code/Magento/Tax/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-tax", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-catalog": "0.42.0-beta2", "magento/module-customer": "0.42.0-beta2", diff --git a/app/code/Magento/TaxImportExport/composer.json b/app/code/Magento/TaxImportExport/composer.json index e3af939b3c2cc..ddd37363dcc79 100644 --- a/app/code/Magento/TaxImportExport/composer.json +++ b/app/code/Magento/TaxImportExport/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-tax-import-export", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-tax": "0.42.0-beta2", "magento/module-backend": "0.42.0-beta2", "magento/module-directory": "0.42.0-beta2", diff --git a/app/code/Magento/Theme/composer.json b/app/code/Magento/Theme/composer.json index 1f40aae7fd2fa..83382efba9ece 100644 --- a/app/code/Magento/Theme/composer.json +++ b/app/code/Magento/Theme/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-theme", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", "magento/module-customer": "0.42.0-beta2", diff --git a/app/code/Magento/Translation/composer.json b/app/code/Magento/Translation/composer.json index 58011a9b5fc14..09f99127a6797 100644 --- a/app/code/Magento/Translation/composer.json +++ b/app/code/Magento/Translation/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-translation", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-core": "0.42.0-beta2", "magento/module-store": "0.42.0-beta2", "magento/module-backend": "0.42.0-beta2", diff --git a/app/code/Magento/Ui/composer.json b/app/code/Magento/Ui/composer.json index a718cf1994aa1..0c4b4d39acc17 100644 --- a/app/code/Magento/Ui/composer.json +++ b/app/code/Magento/Ui/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-ui", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-backend": "0.42.0-beta2", "magento/module-store": "0.42.0-beta2", "magento/framework": "0.42.0-beta2", diff --git a/app/code/Magento/Ups/composer.json b/app/code/Magento/Ups/composer.json index 70e71fd6080eb..6d5cd59b0e5f1 100644 --- a/app/code/Magento/Ups/composer.json +++ b/app/code/Magento/Ups/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-ups", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", "magento/module-backend": "0.42.0-beta2", diff --git a/app/code/Magento/UrlRewrite/composer.json b/app/code/Magento/UrlRewrite/composer.json index 9944ab44a7311..08061d572a0e5 100644 --- a/app/code/Magento/UrlRewrite/composer.json +++ b/app/code/Magento/UrlRewrite/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-url-rewrite", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-catalog": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", "magento/module-store": "0.42.0-beta2", diff --git a/app/code/Magento/User/composer.json b/app/code/Magento/User/composer.json index aecb049734881..724837ef944e1 100644 --- a/app/code/Magento/User/composer.json +++ b/app/code/Magento/User/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-user", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-authorization": "0.42.0-beta2", "magento/module-backend": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", diff --git a/app/code/Magento/Usps/composer.json b/app/code/Magento/Usps/composer.json index 14d5771423781..634a35df11d29 100644 --- a/app/code/Magento/Usps/composer.json +++ b/app/code/Magento/Usps/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-usps", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-shipping": "0.42.0-beta2", "magento/module-directory": "0.42.0-beta2", diff --git a/app/code/Magento/Webapi/composer.json b/app/code/Magento/Webapi/composer.json index 3d520c28732b0..c48b11c132197 100644 --- a/app/code/Magento/Webapi/composer.json +++ b/app/code/Magento/Webapi/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-webapi", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-authorization": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", diff --git a/app/code/Magento/Weee/composer.json b/app/code/Magento/Weee/composer.json index acee54fa4cca8..e336e1b1e2f7b 100644 --- a/app/code/Magento/Weee/composer.json +++ b/app/code/Magento/Weee/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-weee", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-catalog": "0.42.0-beta2", "magento/module-tax": "0.42.0-beta2", diff --git a/app/code/Magento/Widget/composer.json b/app/code/Magento/Widget/composer.json index 29a3df7341354..cebd2066c8330 100644 --- a/app/code/Magento/Widget/composer.json +++ b/app/code/Magento/Widget/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-widget", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-cms": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", diff --git a/app/code/Magento/Wishlist/composer.json b/app/code/Magento/Wishlist/composer.json index d72686c8a1e3e..91d03094d7ee1 100644 --- a/app/code/Magento/Wishlist/composer.json +++ b/app/code/Magento/Wishlist/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-wishlist", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-customer": "0.42.0-beta2", "magento/module-catalog": "0.42.0-beta2", diff --git a/app/design/adminhtml/Magento/backend/composer.json b/app/design/adminhtml/Magento/backend/composer.json index 25b1fd38c70e0..d1cf354e9ded1 100644 --- a/app/design/adminhtml/Magento/backend/composer.json +++ b/app/design/adminhtml/Magento/backend/composer.json @@ -2,7 +2,7 @@ "name": "magento/theme-adminhtml-backend", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/framework": "0.42.0-beta2", "magento/magento-composer-installer": "*" }, diff --git a/app/design/frontend/Magento/blank/composer.json b/app/design/frontend/Magento/blank/composer.json index ddfe84f6f985e..2bf7be122bb65 100644 --- a/app/design/frontend/Magento/blank/composer.json +++ b/app/design/frontend/Magento/blank/composer.json @@ -2,7 +2,7 @@ "name": "magento/theme-frontend-blank", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/framework": "0.42.0-beta2", "magento/magento-composer-installer": "*" }, diff --git a/app/design/frontend/Magento/luma/composer.json b/app/design/frontend/Magento/luma/composer.json index f4ae793c2219c..2339f39769b6b 100644 --- a/app/design/frontend/Magento/luma/composer.json +++ b/app/design/frontend/Magento/luma/composer.json @@ -2,7 +2,7 @@ "name": "magento/theme-frontend-luma", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/theme-frontend-blank": "0.42.0-beta2", "magento/framework": "0.42.0-beta2", "magento/magento-composer-installer": "*" diff --git a/composer.json b/composer.json index b30cc8775b2c0..7924ac0877128 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,7 @@ "AFL-3.0" ], "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "zendframework/zend-stdlib": "2.3.1", "zendframework/zend-code": "2.3.1", "zendframework/zend-server": "2.3.1", diff --git a/composer.lock b/composer.lock index d2fc6da7fe7b8..163f432bf7ac7 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "d3a510fb8a6b17c084148509d02478d4", + "hash": "7967f76b60b4f7df0293267b8de840fa", "packages": [ { "name": "composer/composer", @@ -290,16 +290,16 @@ }, { "name": "seld/jsonlint", - "version": "1.3.0", + "version": "1.3.1", "source": { "type": "git", "url": "https://github.com/Seldaek/jsonlint.git", - "reference": "a7bc2ec9520ad15382292591b617c43bdb1fec35" + "reference": "863ae85c6d3ef60ca49cb12bd051c4a0648c40c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/a7bc2ec9520ad15382292591b617c43bdb1fec35", - "reference": "a7bc2ec9520ad15382292591b617c43bdb1fec35", + "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/863ae85c6d3ef60ca49cb12bd051c4a0648c40c4", + "reference": "863ae85c6d3ef60ca49cb12bd051c4a0648c40c4", "shasum": "" }, "require": { @@ -332,21 +332,21 @@ "parser", "validator" ], - "time": "2014-09-05 15:36:20" + "time": "2015-01-04 21:18:15" }, { "name": "symfony/console", - "version": "v2.6.1", + "version": "v2.6.3", "target-dir": "Symfony/Component/Console", "source": { "type": "git", "url": "https://github.com/symfony/Console.git", - "reference": "ef825fd9f809d275926547c9e57cbf14968793e8" + "reference": "6ac6491ff60c0e5a941db3ccdc75a07adbb61476" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Console/zipball/ef825fd9f809d275926547c9e57cbf14968793e8", - "reference": "ef825fd9f809d275926547c9e57cbf14968793e8", + "url": "https://api.github.com/repos/symfony/Console/zipball/6ac6491ff60c0e5a941db3ccdc75a07adbb61476", + "reference": "6ac6491ff60c0e5a941db3ccdc75a07adbb61476", "shasum": "" }, "require": { @@ -389,21 +389,21 @@ ], "description": "Symfony Console Component", "homepage": "http://symfony.com", - "time": "2014-12-02 20:19:20" + "time": "2015-01-06 17:50:02" }, { "name": "symfony/finder", - "version": "v2.6.1", + "version": "v2.6.3", "target-dir": "Symfony/Component/Finder", "source": { "type": "git", "url": "https://github.com/symfony/Finder.git", - "reference": "0d3ef7f6ec55a7af5eca7914eaa0dacc04ccc721" + "reference": "16513333bca64186c01609961a2bb1b95b5e1355" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Finder/zipball/0d3ef7f6ec55a7af5eca7914eaa0dacc04ccc721", - "reference": "0d3ef7f6ec55a7af5eca7914eaa0dacc04ccc721", + "url": "https://api.github.com/repos/symfony/Finder/zipball/16513333bca64186c01609961a2bb1b95b5e1355", + "reference": "16513333bca64186c01609961a2bb1b95b5e1355", "shasum": "" }, "require": { @@ -436,21 +436,21 @@ ], "description": "Symfony Finder Component", "homepage": "http://symfony.com", - "time": "2014-12-02 20:19:20" + "time": "2015-01-03 08:01:59" }, { "name": "symfony/process", - "version": "v2.6.1", + "version": "v2.6.3", "target-dir": "Symfony/Component/Process", "source": { "type": "git", "url": "https://github.com/symfony/Process.git", - "reference": "bf0c9bd625f13b0b0bbe39919225cf145dfb935a" + "reference": "319794f611bd8bdefbac72beb3f05e847f8ebc92" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Process/zipball/bf0c9bd625f13b0b0bbe39919225cf145dfb935a", - "reference": "bf0c9bd625f13b0b0bbe39919225cf145dfb935a", + "url": "https://api.github.com/repos/symfony/Process/zipball/319794f611bd8bdefbac72beb3f05e847f8ebc92", + "reference": "319794f611bd8bdefbac72beb3f05e847f8ebc92", "shasum": "" }, "require": { @@ -483,7 +483,7 @@ ], "description": "Symfony Process Component", "homepage": "http://symfony.com", - "time": "2014-12-02 20:19:20" + "time": "2015-01-06 22:47:52" }, { "name": "zendframework/zend-code", @@ -2001,16 +2001,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "2.0.13", + "version": "2.0.14", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "0e7d2eec5554f869fa7a4ec2d21e4b37af943ea5" + "reference": "ca158276c1200cc27f5409a5e338486bc0b4fc94" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/0e7d2eec5554f869fa7a4ec2d21e4b37af943ea5", - "reference": "0e7d2eec5554f869fa7a4ec2d21e4b37af943ea5", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ca158276c1200cc27f5409a5e338486bc0b4fc94", + "reference": "ca158276c1200cc27f5409a5e338486bc0b4fc94", "shasum": "" }, "require": { @@ -2062,7 +2062,7 @@ "testing", "xunit" ], - "time": "2014-12-03 06:41:44" + "time": "2014-12-26 13:28:33" }, { "name": "phpunit/php-file-iterator", @@ -2608,16 +2608,16 @@ }, { "name": "sebastian/version", - "version": "1.0.3", + "version": "1.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/version.git", - "reference": "b6e1f0cf6b9e1ec409a0d3e2f2a5fb0998e36b43" + "reference": "a77d9123f8e809db3fbdea15038c27a95da4058b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/b6e1f0cf6b9e1ec409a0d3e2f2a5fb0998e36b43", - "reference": "b6e1f0cf6b9e1ec409a0d3e2f2a5fb0998e36b43", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/a77d9123f8e809db3fbdea15038c27a95da4058b", + "reference": "a77d9123f8e809db3fbdea15038c27a95da4058b", "shasum": "" }, "type": "library", @@ -2639,7 +2639,7 @@ ], "description": "Library that helps with managing the version number of Git-hosted PHP projects", "homepage": "https://github.com/sebastianbergmann/version", - "time": "2014-03-07 15:35:33" + "time": "2014-12-15 14:25:24" }, { "name": "sjparkinson/static-review", @@ -2771,17 +2771,17 @@ }, { "name": "symfony/config", - "version": "v2.5.8", + "version": "v2.5.9", "target-dir": "Symfony/Component/Config", "source": { "type": "git", "url": "https://github.com/symfony/Config.git", - "reference": "92f0b4c625b8c42d394b53f879d2795d84bb8c4f" + "reference": "c7309e33b719433d5cf3845d0b5b9608609d8c8e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Config/zipball/92f0b4c625b8c42d394b53f879d2795d84bb8c4f", - "reference": "92f0b4c625b8c42d394b53f879d2795d84bb8c4f", + "url": "https://api.github.com/repos/symfony/Config/zipball/c7309e33b719433d5cf3845d0b5b9608609d8c8e", + "reference": "c7309e33b719433d5cf3845d0b5b9608609d8c8e", "shasum": "" }, "require": { @@ -2815,21 +2815,21 @@ ], "description": "Symfony Config Component", "homepage": "http://symfony.com", - "time": "2014-12-02 20:15:53" + "time": "2015-01-03 08:01:13" }, { "name": "symfony/dependency-injection", - "version": "v2.5.8", + "version": "v2.5.9", "target-dir": "Symfony/Component/DependencyInjection", "source": { "type": "git", "url": "https://github.com/symfony/DependencyInjection.git", - "reference": "b4afda3c24867a17f93237ac1fcce917cc9d7695" + "reference": "b04e6782962f8e3312274fd16fb6b37a8210a1c3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/b4afda3c24867a17f93237ac1fcce917cc9d7695", - "reference": "b4afda3c24867a17f93237ac1fcce917cc9d7695", + "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/b04e6782962f8e3312274fd16fb6b37a8210a1c3", + "reference": "b04e6782962f8e3312274fd16fb6b37a8210a1c3", "shasum": "" }, "require": { @@ -2837,8 +2837,8 @@ }, "require-dev": { "symfony/config": "~2.2", - "symfony/expression-language": "~2.4", - "symfony/yaml": "~2.0" + "symfony/expression-language": "~2.4,>=2.4.10", + "symfony/yaml": "~2.1" }, "suggest": { "symfony/config": "", @@ -2872,21 +2872,21 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "http://symfony.com", - "time": "2014-12-02 21:48:32" + "time": "2015-01-05 08:51:41" }, { "name": "symfony/event-dispatcher", - "version": "v2.6.1", + "version": "v2.6.3", "target-dir": "Symfony/Component/EventDispatcher", "source": { "type": "git", "url": "https://github.com/symfony/EventDispatcher.git", - "reference": "720fe9bca893df7ad1b4546649473b5afddf0216" + "reference": "40ff70cadea3785d83cac1c8309514b36113064e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/720fe9bca893df7ad1b4546649473b5afddf0216", - "reference": "720fe9bca893df7ad1b4546649473b5afddf0216", + "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/40ff70cadea3785d83cac1c8309514b36113064e", + "reference": "40ff70cadea3785d83cac1c8309514b36113064e", "shasum": "" }, "require": { @@ -2894,10 +2894,10 @@ }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~2.0", + "symfony/config": "~2.0,>=2.0.5", "symfony/dependency-injection": "~2.6", "symfony/expression-language": "~2.6", - "symfony/stopwatch": "~2.2" + "symfony/stopwatch": "~2.3" }, "suggest": { "symfony/dependency-injection": "", @@ -2930,21 +2930,21 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "http://symfony.com", - "time": "2014-12-02 20:19:20" + "time": "2015-01-05 14:28:40" }, { "name": "symfony/filesystem", - "version": "v2.5.8", + "version": "v2.5.9", "target-dir": "Symfony/Component/Filesystem", "source": { "type": "git", "url": "https://github.com/symfony/Filesystem.git", - "reference": "e5fc05a3a1dbb4ea0bed80fe7bd21ba3cab88c42" + "reference": "d3c24d7d6e9c342008d8421b2fade460311647ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Filesystem/zipball/e5fc05a3a1dbb4ea0bed80fe7bd21ba3cab88c42", - "reference": "e5fc05a3a1dbb4ea0bed80fe7bd21ba3cab88c42", + "url": "https://api.github.com/repos/symfony/Filesystem/zipball/d3c24d7d6e9c342008d8421b2fade460311647ea", + "reference": "d3c24d7d6e9c342008d8421b2fade460311647ea", "shasum": "" }, "require": { @@ -2977,21 +2977,21 @@ ], "description": "Symfony Filesystem Component", "homepage": "http://symfony.com", - "time": "2014-12-02 20:15:53" + "time": "2015-01-03 21:04:44" }, { "name": "symfony/stopwatch", - "version": "v2.6.1", + "version": "v2.6.3", "target-dir": "Symfony/Component/Stopwatch", "source": { "type": "git", "url": "https://github.com/symfony/Stopwatch.git", - "reference": "261abd360cfb6ac65ea93ffd82073e2011d034fc" + "reference": "e8da5286132ba75ce4b4275fbf0f4cd369bfd71c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Stopwatch/zipball/261abd360cfb6ac65ea93ffd82073e2011d034fc", - "reference": "261abd360cfb6ac65ea93ffd82073e2011d034fc", + "url": "https://api.github.com/repos/symfony/Stopwatch/zipball/e8da5286132ba75ce4b4275fbf0f4cd369bfd71c", + "reference": "e8da5286132ba75ce4b4275fbf0f4cd369bfd71c", "shasum": "" }, "require": { @@ -3024,7 +3024,7 @@ ], "description": "Symfony Stopwatch Component", "homepage": "http://symfony.com", - "time": "2014-12-02 20:19:20" + "time": "2015-01-03 08:01:59" } ], "aliases": [], @@ -3035,7 +3035,7 @@ }, "prefer-stable": false, "platform": { - "php": "~5.4.11|~5.5.0" + "php": "~5.4.11|~5.5.0|~5.6.0" }, "platform-dev": { "lib-libxml": "*", diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/a_d/composer.json b/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/a_d/composer.json index 5c53b1799e974..c66e8bee3f563 100644 --- a/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/a_d/composer.json +++ b/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/a_d/composer.json @@ -2,7 +2,7 @@ "name": "magento/theme-frontend-a_d", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/framework": "0.1.0-alpha103", "magento/magento-composer-installer": "*" }, diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/b_e/composer.json b/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/b_e/composer.json index ce67f2ccc05ec..52005fea85157 100644 --- a/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/b_e/composer.json +++ b/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/b_e/composer.json @@ -2,7 +2,7 @@ "name": "magento/theme-fronend-b_e", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/framework": "0.1.0-alpha103", "magento/magento-composer-installer": "*" }, diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/magento_default/composer.json b/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/magento_default/composer.json index 21b9e83b12f6d..b8fb30f464317 100644 --- a/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/magento_default/composer.json +++ b/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/magento_default/composer.json @@ -2,7 +2,7 @@ "name": "magento/theme-frontend-magento_default", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/framework": "0.1.0-alpha103", "magento/magento-composer-installer": "*" }, diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/magento_g/composer.json b/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/magento_g/composer.json index 2a92e96f7f9df..128ee13f27aa4 100644 --- a/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/magento_g/composer.json +++ b/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/magento_g/composer.json @@ -2,7 +2,7 @@ "name": "magento/theme-frontend-magento_g", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/framework": "0.1.0-alpha103", "magento/theme-frontend-magento_default": "0.1.0", "magento/magento-composer-installer": "*" diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/adminhtml/Vendor/test/composer.json b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/adminhtml/Vendor/test/composer.json index e0b1310c81f89..84cd855cbccc6 100644 --- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/adminhtml/Vendor/test/composer.json +++ b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/adminhtml/Vendor/test/composer.json @@ -2,7 +2,7 @@ "name": "vendor/theme-adminhtml-test", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/framework": "0.1.0-alpha103", "magento/magento-composer-installer": "*" }, diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/area_two/Vendor/theme_one/composer.json b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/area_two/Vendor/theme_one/composer.json index 8af3364ca1008..95a6b36a5e2cd 100644 --- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/area_two/Vendor/theme_one/composer.json +++ b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/area_two/Vendor/theme_one/composer.json @@ -2,7 +2,7 @@ "name": "vendor/theme-area_two-theme_one", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/framework": "0.1.0-alpha103", "magento/magento-composer-installer": "*" }, diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/design_area/Vendor/theme_one/composer.json b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/design_area/Vendor/theme_one/composer.json index 36bb9873b4165..6dca502d8ee94 100644 --- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/design_area/Vendor/theme_one/composer.json +++ b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/design_area/Vendor/theme_one/composer.json @@ -2,7 +2,7 @@ "name": "vendor/theme-design_area-theme_one", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/framework": "0.1.0-alpha103", "magento/magento-composer-installer": "*" }, diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Magento/default/composer.json b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Magento/default/composer.json index edffe32afb571..41b4f6e40248c 100644 --- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Magento/default/composer.json +++ b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Magento/default/composer.json @@ -2,7 +2,7 @@ "name": "magento/theme-frontend-default", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/framework": "0.1.0-alpha103", "magento/magento-composer-installer": "*" }, diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Magento/default_iphone/composer.json b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Magento/default_iphone/composer.json index 755f0fa260b47..4bf135943a4df 100644 --- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Magento/default_iphone/composer.json +++ b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Magento/default_iphone/composer.json @@ -2,7 +2,7 @@ "name": "magento/theme-frontend-default_iphone", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/framework": "0.1.0-alpha103", "magento/theme-frontend-default": "0.1.0", "magento/magento-composer-installer": "*" diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/cache_test_theme/composer.json b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/cache_test_theme/composer.json index d9194e28829a7..490779e4387b6 100644 --- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/cache_test_theme/composer.json +++ b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/cache_test_theme/composer.json @@ -2,7 +2,7 @@ "name": "test/theme-frontend-cache_test_theme", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/framework": "0.1.0-alpha103", "magento/theme-frontend-default": "0.1.0", "magento/magento-composer-installer": "*" diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/composer.json b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/composer.json index b9fcee893aea1..98a42c4ea02d1 100644 --- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/composer.json +++ b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/composer.json @@ -2,7 +2,7 @@ "name": "test/theme-frontend-default", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/framework": "0.1.0-alpha103", "magento/magento-composer-installer": "*" }, diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/publication/composer.json b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/publication/composer.json index 212b2e18fee8c..a081f94dde774 100644 --- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/publication/composer.json +++ b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/publication/composer.json @@ -2,7 +2,7 @@ "name": "test/theme-frontend-publication", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/framework": "0.1.0-alpha103", "magento/magento-composer-installer": "*" }, diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/test_theme/composer.json b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/test_theme/composer.json index 6a676c65acd95..9576747784c1a 100644 --- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/test_theme/composer.json +++ b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/test_theme/composer.json @@ -2,7 +2,7 @@ "name": "test/theme-frontend-test_theme", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/framework": "0.1.0-alpha103", "test/theme-frontend-default": "0.1.0", "magento/magento-composer-installer": "*" diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/custom_theme/composer.json b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/custom_theme/composer.json index 47ef65ebb8ae9..4b7feaa5c1717 100644 --- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/custom_theme/composer.json +++ b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/custom_theme/composer.json @@ -2,7 +2,7 @@ "name": "vendor/theme-frontend-custom_theme", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/framework": "0.1.0-alpha103", "vendor/theme-frontend-default": "0.1.0", "magento/magento-composer-installer": "*" diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/default/composer.json b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/default/composer.json index 43b56cf881312..73f7fea16cf49 100644 --- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/default/composer.json +++ b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/default/composer.json @@ -2,7 +2,7 @@ "name": "vendor/theme-frontend-default", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/framework": "0.1.0-alpha103", "magento/magento-composer-installer": "*" }, diff --git a/dev/tests/integration/testsuite/Magento/DesignEditor/Model/_files/design/frontend/Vendor/test/composer.json b/dev/tests/integration/testsuite/Magento/DesignEditor/Model/_files/design/frontend/Vendor/test/composer.json index 8bae49b8c1238..7ab929a2b3664 100644 --- a/dev/tests/integration/testsuite/Magento/DesignEditor/Model/_files/design/frontend/Vendor/test/composer.json +++ b/dev/tests/integration/testsuite/Magento/DesignEditor/Model/_files/design/frontend/Vendor/test/composer.json @@ -2,7 +2,7 @@ "name": "vendor/theme-frontend-test", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/framework": "0.1.0-alpha103", "magento/magento-composer-installer": "*" }, diff --git a/dev/tests/integration/testsuite/Magento/DesignEditor/Model/_files/design/frontend/Vendor/test_child/composer.json b/dev/tests/integration/testsuite/Magento/DesignEditor/Model/_files/design/frontend/Vendor/test_child/composer.json index 99b057b589b20..cf422c446830d 100644 --- a/dev/tests/integration/testsuite/Magento/DesignEditor/Model/_files/design/frontend/Vendor/test_child/composer.json +++ b/dev/tests/integration/testsuite/Magento/DesignEditor/Model/_files/design/frontend/Vendor/test_child/composer.json @@ -2,7 +2,7 @@ "name": "vendor/theme-frontend-test_child", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/framework": "0.1.0-alpha103", "vendor/theme-frontend-test": "0.1.0", "magento/magento-composer-installer": "*" diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/adminhtml/test_default/composer.json b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/adminhtml/test_default/composer.json index ec400477fccf4..7fec345ba4c6b 100644 --- a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/adminhtml/test_default/composer.json +++ b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/adminhtml/test_default/composer.json @@ -2,7 +2,7 @@ "name": "magento/theme-adminhtml-test_default", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/framework": "0.1.0-alpha103", "magento/magento-composer-installer": "*" }, diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/test_default/composer.json b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/test_default/composer.json index 5dec2b76fe7c7..d00c1b4f56e86 100644 --- a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/test_default/composer.json +++ b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/test_default/composer.json @@ -2,7 +2,7 @@ "name": "magento/theme-frontend-test_default", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/framework": "0.1.0-alpha103", "magento/magento-composer-installer": "*" }, diff --git a/dev/tests/integration/testsuite/Magento/Framework/Less/_files/design/frontend/Test/default/composer.json b/dev/tests/integration/testsuite/Magento/Framework/Less/_files/design/frontend/Test/default/composer.json index fe632e587767b..1919c3b559946 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Less/_files/design/frontend/Test/default/composer.json +++ b/dev/tests/integration/testsuite/Magento/Framework/Less/_files/design/frontend/Test/default/composer.json @@ -2,7 +2,7 @@ "name": "test/theme-frontend-default", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/framework": "0.1.0-alpha103", "test/theme-frontend-parent": "0.1.0", "magento/magento-composer-installer": "*" diff --git a/dev/tests/integration/testsuite/Magento/Framework/Less/_files/design/frontend/Test/parent/composer.json b/dev/tests/integration/testsuite/Magento/Framework/Less/_files/design/frontend/Test/parent/composer.json index 906eda7d63b30..0a589c7071d43 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Less/_files/design/frontend/Test/parent/composer.json +++ b/dev/tests/integration/testsuite/Magento/Framework/Less/_files/design/frontend/Test/parent/composer.json @@ -2,7 +2,7 @@ "name": "test/theme-frontend-parent", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/framework": "0.1.0-alpha103", "magento/magento-composer-installer": "*" }, diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/fallback/design/frontend/Vendor/custom_theme/composer.json b/dev/tests/integration/testsuite/Magento/Framework/View/_files/fallback/design/frontend/Vendor/custom_theme/composer.json index 47ef65ebb8ae9..4b7feaa5c1717 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/View/_files/fallback/design/frontend/Vendor/custom_theme/composer.json +++ b/dev/tests/integration/testsuite/Magento/Framework/View/_files/fallback/design/frontend/Vendor/custom_theme/composer.json @@ -2,7 +2,7 @@ "name": "vendor/theme-frontend-custom_theme", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/framework": "0.1.0-alpha103", "vendor/theme-frontend-default": "0.1.0", "magento/magento-composer-installer": "*" diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/fallback/design/frontend/Vendor/custom_theme2/composer.json b/dev/tests/integration/testsuite/Magento/Framework/View/_files/fallback/design/frontend/Vendor/custom_theme2/composer.json index 958cc1528d708..c2a4fbaaa5244 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/View/_files/fallback/design/frontend/Vendor/custom_theme2/composer.json +++ b/dev/tests/integration/testsuite/Magento/Framework/View/_files/fallback/design/frontend/Vendor/custom_theme2/composer.json @@ -2,7 +2,7 @@ "name": "vendor/theme-frontend-custom_theme2", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/framework": "0.1.0-alpha103", "vendor/theme-frontend-custom_theme": "0.1.0", "magento/magento-composer-installer": "*" diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/fallback/design/frontend/Vendor/default/composer.json b/dev/tests/integration/testsuite/Magento/Framework/View/_files/fallback/design/frontend/Vendor/default/composer.json index 43b56cf881312..73f7fea16cf49 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/View/_files/fallback/design/frontend/Vendor/default/composer.json +++ b/dev/tests/integration/testsuite/Magento/Framework/View/_files/fallback/design/frontend/Vendor/default/composer.json @@ -2,7 +2,7 @@ "name": "vendor/theme-frontend-default", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/framework": "0.1.0-alpha103", "magento/magento-composer-installer": "*" }, diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/fallback/design/frontend/Vendor/standalone_theme/composer.json b/dev/tests/integration/testsuite/Magento/Framework/View/_files/fallback/design/frontend/Vendor/standalone_theme/composer.json index 120bd0a03bdeb..fbdfc6b910059 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/View/_files/fallback/design/frontend/Vendor/standalone_theme/composer.json +++ b/dev/tests/integration/testsuite/Magento/Framework/View/_files/fallback/design/frontend/Vendor/standalone_theme/composer.json @@ -2,7 +2,7 @@ "name": "vendor/theme-frontend-standalone_theme", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/framework": "0.1.0-alpha103", "magento/magento-composer-installer": "*" }, diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer1.json b/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer1.json index ba3e319204ac8..4fe637e35fcd3 100644 --- a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer1.json +++ b/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer1.json @@ -2,7 +2,7 @@ "name": "magento/module-module1", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-core": "0.1.0-alpha103", "magento/module-module2": "0.1.0-alpha103" }, diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer2.json b/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer2.json index 3b45c34a4994f..a7b58c71e34c7 100644 --- a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer2.json +++ b/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer2.json @@ -2,7 +2,7 @@ "name": "magento/module-module2", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-core": "0.1.0-alpha103", "magento/module-module3": "0.1.0-alpha103" }, diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer3.json b/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer3.json index 9501dd68bb121..4619c88460d9b 100644 --- a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer3.json +++ b/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer3.json @@ -2,7 +2,7 @@ "name": "magento/module-module1", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0" + "php": "~5.4.11|~5.5.0|~5.6.0" }, "type": "magento2-module", "version": "0.1.0-alpha103" diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer4.json b/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer4.json index 723f4f9e6cdf5..441ed7e5af1aa 100644 --- a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer4.json +++ b/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer4.json @@ -2,7 +2,7 @@ "name": "magento/module-module1", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-core": "0.1.0-alpha103", "magento/module-module2": "0.1.0-alpha103" }, diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer5.json b/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer5.json index 8df20906f117c..a630787a56681 100644 --- a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer5.json +++ b/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer5.json @@ -2,7 +2,7 @@ "name": "magento/module-module2", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-core": "0.1.0-alpha103", "magento/module-module1": "0.1.0-alpha103" }, diff --git a/dev/tests/integration/testsuite/Magento/Widget/_files/design/adminhtml/magento_basic/composer.json b/dev/tests/integration/testsuite/Magento/Widget/_files/design/adminhtml/magento_basic/composer.json index 16bcf44b85c2c..4a5c0d27cd304 100644 --- a/dev/tests/integration/testsuite/Magento/Widget/_files/design/adminhtml/magento_basic/composer.json +++ b/dev/tests/integration/testsuite/Magento/Widget/_files/design/adminhtml/magento_basic/composer.json @@ -2,7 +2,7 @@ "name": "magento/admin-Magento_Catalog", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/framework": "0.1.0-alpha103", "magento/magento-composer-installer": "*" }, diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/_files/frontend/magento_iphone/composer.json b/dev/tests/unit/testsuite/Magento/Core/Model/_files/frontend/magento_iphone/composer.json index fa9ae3e082f96..1d60a88e8431e 100644 --- a/dev/tests/unit/testsuite/Magento/Core/Model/_files/frontend/magento_iphone/composer.json +++ b/dev/tests/unit/testsuite/Magento/Core/Model/_files/frontend/magento_iphone/composer.json @@ -2,7 +2,7 @@ "name": "magento/frontend-magento_iphone", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/framework": "0.1.0-alpha103", "magento/magento-composer-installer": "*" }, diff --git a/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/default_default/composer.json b/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/default_default/composer.json index 12d0e925d13dc..bd504bd4bf1f0 100644 --- a/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/default_default/composer.json +++ b/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/default_default/composer.json @@ -2,7 +2,7 @@ "name": "magento/theme-area-default_default", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/framework": "0.1.0-alpha103", "magento/magento-composer-installer": "*" }, diff --git a/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/default_test/composer.json b/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/default_test/composer.json index d7700221ad92e..12d208790bf63 100644 --- a/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/default_test/composer.json +++ b/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/default_test/composer.json @@ -2,7 +2,7 @@ "name": "magento/theme-area-default_test", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/framework": "0.1.0-alpha103", "magento/theme-area-default_default": "0.1.0", "magento/magento-composer-installer": "*" diff --git a/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/default_test2/composer.json b/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/default_test2/composer.json index b74a4b53c2c04..eccefaff3cbbe 100644 --- a/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/default_test2/composer.json +++ b/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/default_test2/composer.json @@ -2,7 +2,7 @@ "name": "magento/theme-area-default_test2", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/framework": "0.1.0-alpha103", "magento/theme-area-default_test": "0.1.1", "magento/magento-composer-installer": "*" diff --git a/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/test_default/composer.json b/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/test_default/composer.json index bfb7334208a44..582e5ab1b2869 100644 --- a/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/test_default/composer.json +++ b/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/test_default/composer.json @@ -2,7 +2,7 @@ "name": "magento/theme-area-test_default", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/framework": "0.1.0-alpha103", "magento/magento-composer-installer": "*" }, diff --git a/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/test_external_package_descendant/composer.json b/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/test_external_package_descendant/composer.json index 930bd7d484a93..e5c3e971789af 100644 --- a/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/test_external_package_descendant/composer.json +++ b/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/test_external_package_descendant/composer.json @@ -2,7 +2,7 @@ "name": "magento/theme-area-test_external_package_descendant", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/framework": "0.1.0-alpha103", "magento/theme-area-default_test2": "0.1.0", "magento/magento-composer-installer": "*" diff --git a/lib/internal/Magento/Framework/composer.json b/lib/internal/Magento/Framework/composer.json index 2d0570bae3b5d..69072d0345dd1 100644 --- a/lib/internal/Magento/Framework/composer.json +++ b/lib/internal/Magento/Framework/composer.json @@ -8,7 +8,7 @@ "AFL-3.0" ], "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "ext-spl": "*", "ext-dom": "*", "ext-simplexml": "*", From 9ecf277987ff511b054400a3c285272a3b36b6e8 Mon Sep 17 00:00:00 2001 From: Anup Dugar Date: Wed, 7 Jan 2015 19:31:15 -0600 Subject: [PATCH 11/44] MAGETWO-31999: oAuth issue [from github] - Fixed oauth validation to return aggregated error message - Fixed to return HTTP 400 instead of 500 for missing parameters - Fixed to return HTTP 400 for invalid token length --- .../Magento/Webapi/Authentication/RestTest.php | 2 +- .../Magento/Integration/Oauth/OauthTest.php | 3 ++- .../Magento/Framework/Oauth/Helper/Request.php | 3 +++ lib/internal/Magento/Framework/Oauth/Oauth.php | 16 +++++++++------- .../Framework/Oauth/OauthInputException.php | 18 ++++++++++++++++++ 5 files changed, 33 insertions(+), 9 deletions(-) diff --git a/dev/tests/api-functional/testsuite/Magento/Webapi/Authentication/RestTest.php b/dev/tests/api-functional/testsuite/Magento/Webapi/Authentication/RestTest.php index 3f8bd45445a6e..49c661e6627ff 100644 --- a/dev/tests/api-functional/testsuite/Magento/Webapi/Authentication/RestTest.php +++ b/dev/tests/api-functional/testsuite/Magento/Webapi/Authentication/RestTest.php @@ -175,7 +175,7 @@ public function testGetAccessTokenConsumerMismatch() /** * @expectedException \Exception - * @expectedExceptionMessage HTTP/1.1 401 + * @expectedExceptionMessage HTTP/1.1 400 */ public function testAccessApiInvalidAccessToken() { diff --git a/dev/tests/unit/testsuite/Magento/Integration/Oauth/OauthTest.php b/dev/tests/unit/testsuite/Magento/Integration/Oauth/OauthTest.php index f18e1cffb3521..aaa75598d9709 100644 --- a/dev/tests/unit/testsuite/Magento/Integration/Oauth/OauthTest.php +++ b/dev/tests/unit/testsuite/Magento/Integration/Oauth/OauthTest.php @@ -217,6 +217,7 @@ public function testGetRequestTokenConsumerKeyNotFound() public function testGetRequestTokenOutdatedConsumerKey() { $this->_setupConsumer(); + $this->_setupNonce(); $this->_consumerMock ->expects($this->any()) ->method('isValidForTokenExchange') @@ -521,7 +522,7 @@ public function testGetAccessTokenParameterAbsent() /** * \Magento\Framework\Oauth\OauthInterface::ERR_TOKEN_REJECTED * - * @expectedException \Magento\Framework\Oauth\Exception + * @expectedException \Magento\Framework\Oauth\OauthInputException */ public function testGetAccessTokenTokenRejected() { diff --git a/lib/internal/Magento/Framework/Oauth/Helper/Request.php b/lib/internal/Magento/Framework/Oauth/Helper/Request.php index 813dc13fbb386..e3100389bb029 100644 --- a/lib/internal/Magento/Framework/Oauth/Helper/Request.php +++ b/lib/internal/Magento/Framework/Oauth/Helper/Request.php @@ -196,6 +196,9 @@ public function prepareErrorResponse(\Exception $exception, \Zend_Controller_Res $responseCode = self::HTTP_UNAUTHORIZED; } elseif ($exception instanceof \Magento\Framework\Oauth\OauthInputException) { $responseCode = self::HTTP_BAD_REQUEST; + if ($errorMsg == \Magento\Framework\Oauth\OauthInputException::DEFAULT_MESSAGE) { + $errorMsg = $exception->getAggregatedErrorMessage(); + } } else { $errorMsg = 'internal_error&message=' . ($errorMsg ? $errorMsg : 'empty_message'); $responseCode = self::HTTP_INTERNAL_ERROR; diff --git a/lib/internal/Magento/Framework/Oauth/Oauth.php b/lib/internal/Magento/Framework/Oauth/Oauth.php index 7e4493af90e95..69490683eb788 100644 --- a/lib/internal/Magento/Framework/Oauth/Oauth.php +++ b/lib/internal/Magento/Framework/Oauth/Oauth.php @@ -60,11 +60,9 @@ public static function getSupportedSignatureMethods() */ public function getRequestToken($params, $requestUrl, $httpMethod = 'POST') { - $this->_validateVersionParam($params['oauth_version']); + $this->_validateProtocolParams($params); $consumer = $this->_tokenProvider->getConsumerByKey($params['oauth_consumer_key']); $this->_tokenProvider->validateConsumer($consumer); - $this->_nonceGenerator->validateNonce($consumer, $params['oauth_nonce'], $params['oauth_timestamp']); - $this->_validateSignature($params, $consumer->getSecret(), $httpMethod, $requestUrl); return $this->_tokenProvider->createRequestToken($consumer); @@ -219,9 +217,9 @@ protected function _validateVersionParam($version) * @param array $protocolParams * @param array $requiredParams * @return void - * @throws Exception|OauthInputException + * @throws OauthInputException */ - protected function _validateProtocolParams($protocolParams, $requiredParams) + protected function _validateProtocolParams($protocolParams, $requiredParams = []) { // validate version if specified. if (isset($protocolParams['oauth_version'])) { @@ -246,7 +244,7 @@ protected function _validateProtocolParams($protocolParams, $requiredParams) $protocolParams['oauth_token'] ) ) { - throw new Exception('Token is not the correct length'); + throw new OauthInputException('Token is not the correct length'); } // Validate signature method. @@ -275,10 +273,14 @@ protected function _validateProtocolParams($protocolParams, $requiredParams) */ protected function _checkRequiredParams($protocolParams, $requiredParams) { + $exception = new OauthInputException(); foreach ($requiredParams as $param) { if (!isset($protocolParams[$param])) { - throw new OauthInputException(OauthInputException::REQUIRED_FIELD, ['fieldName' => $param]); + $exception->addError(OauthInputException::REQUIRED_FIELD, ['fieldName' => $param]); } } + if ($exception->wasErrorAdded()) { + throw $exception; + } } } diff --git a/lib/internal/Magento/Framework/Oauth/OauthInputException.php b/lib/internal/Magento/Framework/Oauth/OauthInputException.php index 56c1cbce379b8..61dfd56378cb7 100644 --- a/lib/internal/Magento/Framework/Oauth/OauthInputException.php +++ b/lib/internal/Magento/Framework/Oauth/OauthInputException.php @@ -12,4 +12,22 @@ */ class OauthInputException extends InputException { + /** + * Get error messages as a single comma separated string + * + * @return string + */ + public function getAggregatedErrorMessage() + { + $errors = []; + foreach ($this->getErrors() as $error) { + // Clean up any trailing period + $errors[] = rtrim($error->getMessage(), '.'); + } + $errorMsg = ''; + if (!empty($errors)) { + $errorMsg = implode(', ', $errors); + } + return $errorMsg; + } } From 4b322c86f9957394702ed4033165243ea0751ad5 Mon Sep 17 00:00:00 2001 From: Dale Sikkema Date: Thu, 8 Jan 2015 10:04:09 -0600 Subject: [PATCH 12/44] MAGETWO-31851: [GITHUB] Failed to set ini option "session.save_path" to value #792 --- .../Magento/Framework/Session/ConfigTest.php | 66 +++++++++++++++++-- .../Magento/Framework/Session/ConfigTest.php | 3 - .../Magento/Framework/Session/Config.php | 7 +- 3 files changed, 65 insertions(+), 11 deletions(-) diff --git a/dev/tests/integration/testsuite/Magento/Framework/Session/ConfigTest.php b/dev/tests/integration/testsuite/Magento/Framework/Session/ConfigTest.php index 4d6080e8746bc..e84b92334d4da 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Session/ConfigTest.php +++ b/dev/tests/integration/testsuite/Magento/Framework/Session/ConfigTest.php @@ -26,6 +26,16 @@ class ConfigTest extends \PHPUnit_Framework_TestCase */ protected $_objectManager; + /** + * @var string Default value for session.save_path setting + */ + protected $defaultSavePath; + + /** + * @var \Magento\Framework\App\DeploymentConfig | \PHPUnit_Framework_MockObject_MockObject + */ + protected $deploymentConfigMock; + protected function setUp() { $this->_objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); @@ -34,24 +44,27 @@ protected function setUp() if ($sessionManager->isSessionExists()) { $sessionManager->writeClose(); } - $deploymentConfigMock = $this->getMock('Magento\Framework\App\DeploymentConfig', [], [], '', false); - $deploymentConfigMock->expects($this->at(0)) + $this->deploymentConfigMock = $this->getMock('Magento\Framework\App\DeploymentConfig', [], [], '', false); + $this->deploymentConfigMock->expects($this->at(0)) ->method('get') ->with(Config::PARAM_SESSION_SAVE_METHOD, 'files') ->will($this->returnValue('files')); - $deploymentConfigMock->expects($this->at(1)) + $this->deploymentConfigMock->expects($this->at(1)) ->method('get') ->with(Config::PARAM_SESSION_SAVE_PATH) ->will($this->returnValue(null)); - $deploymentConfigMock->expects($this->at(2)) + $this->deploymentConfigMock->expects($this->at(2)) ->method('get') ->with(Config::PARAM_SESSION_CACHE_LIMITER) ->will($this->returnValue($this->_cacheLimiter)); $this->_model = $this->_objectManager->create( 'Magento\Framework\Session\Config', - ['deploymentConfig' => $deploymentConfigMock] + ['deploymentConfig' => $this->deploymentConfigMock] ); + $this->defaultSavePath = $this->_objectManager + ->get('Magento\Framework\Filesystem\DirectoryList') + ->getPath(DirectoryList::SESSION); } protected function tearDown() @@ -282,4 +295,47 @@ public function testSetSavePath() $this->_model->setSavePath('some_save_path'); $this->assertEquals($this->_model->getOption('save_path'), 'some_save_path'); } + + /** + * @dataProvider savePathDataProvider + */ + public function testConstructorSavePath($existing, $given, $expected) + { + $sessionSavePath = ini_get('session.save_path'); + if ($expected === 'default') { + $expected = $this->defaultSavePath . '/'; + } + $setup = ini_set('session.save_path', $existing); + if ($setup === false) { + $this->markTestSkipped('Cannot set session.save_path with ini_set'); + } + + $this->deploymentConfigMock->expects($this->at(1)) + ->method('get') + ->with(Config::PARAM_SESSION_SAVE_PATH) + ->will($this->returnValue($given)); + + $this->_model = $this->_objectManager->create( + 'Magento\Framework\Session\Config', + ['deploymentConfig' => $this->deploymentConfigMock] + ); + $this->assertEquals($expected, $this->_model->getOption('save_path')); + + if ($sessionSavePath != ini_get('session.save_path')) { + ini_set('session.save_path', $sessionSavePath); + } + } + + public function savePathDataProvider() + { + // preset value (null = not set), input value (null = not set), expected value + $savePathGiven = 'explicit_save_path'; + $presetPath = 'preset_save_path'; + return [ + [null, $savePathGiven, $savePathGiven], + [null, null, 'default'], + [$presetPath, $savePathGiven, $savePathGiven], + [$presetPath, null, $presetPath], + ]; + } } diff --git a/dev/tests/unit/testsuite/Magento/Framework/Session/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Framework/Session/ConfigTest.php index 1348e691e7f61..78c09039e1e70 100644 --- a/dev/tests/unit/testsuite/Magento/Framework/Session/ConfigTest.php +++ b/dev/tests/unit/testsuite/Magento/Framework/Session/ConfigTest.php @@ -363,7 +363,6 @@ public function constructorDataProvider() true, [ 'session.save_handler' => 'files', - 'session.save_path' => null, 'session.cache_limiter' => 'files', 'session.cookie_lifetime' => 7200, 'session.cookie_path' => '/', @@ -376,7 +375,6 @@ public function constructorDataProvider() false, [ 'session.save_handler' => 'files', - 'session.save_path' => null, 'session.cache_limiter' => 'files', 'session.cookie_httponly' => false, ], @@ -386,7 +384,6 @@ public function constructorDataProvider() true, [ 'session.save_handler' => 'files', - 'session.save_path' => null, 'session.cache_limiter' => 'files', 'session.cookie_lifetime' => 3600, 'session.cookie_path' => '/', diff --git a/lib/internal/Magento/Framework/Session/Config.php b/lib/internal/Magento/Framework/Session/Config.php index 33a8c2f7a62e0..0e21cf788f125 100644 --- a/lib/internal/Magento/Framework/Session/Config.php +++ b/lib/internal/Magento/Framework/Session/Config.php @@ -135,13 +135,14 @@ public function __construct( $this->setSaveHandler($saveMethod === 'db' ? 'user' : $saveMethod); - if (!$savePath) { + if (!$savePath && !ini_get('session.save_path')) { $sessionDir = $filesystem->getDirectoryWrite(DirectoryList::SESSION); $savePath = $sessionDir->getAbsolutePath(); $sessionDir->create(); } - $this->setSavePath($savePath); - + if ($savePath) { + $this->setSavePath($savePath); + } if ($cacheLimiter) { $this->setOption('session.cache_limiter', $cacheLimiter); } From 77d97d6ef0d73f113246a962d28c92d19ddbe403 Mon Sep 17 00:00:00 2001 From: Ievgen Shakhsuvarov Date: Thu, 25 Dec 2014 13:46:33 +0200 Subject: [PATCH 13/44] MAGETWO-26655: [TD] Compiler Can't Verify Case Sensitive Dependency --- .../Code/Reader/SourceArgumentsReaderTest.php | 56 ++++++ .../SourceArgumentsReaderTest.php.sample | 26 +++ .../Test/Integrity/Di/CompilerTest.php | 1 + .../ConstructorArgumentTypesTest.php | 74 ++++++++ .../Code/Reader/SourceArgumentsReader.php | 168 ++++++++++++++++++ .../Validator/ConstructorArgumentTypes.php | 54 ++++++ .../Framework/Config/Composer/Package.php | 2 +- 7 files changed, 380 insertions(+), 1 deletion(-) create mode 100644 dev/tests/integration/testsuite/Magento/Framework/Code/Reader/SourceArgumentsReaderTest.php create mode 100644 dev/tests/integration/testsuite/Magento/Framework/Code/Reader/_files/SourceArgumentsReaderTest.php.sample create mode 100644 dev/tests/unit/testsuite/Magento/Framework/Code/Validator/ConstructorArgumentTypesTest.php create mode 100644 lib/internal/Magento/Framework/Code/Reader/SourceArgumentsReader.php create mode 100644 lib/internal/Magento/Framework/Code/Validator/ConstructorArgumentTypes.php diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/SourceArgumentsReaderTest.php b/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/SourceArgumentsReaderTest.php new file mode 100644 index 0000000000000..92bef840df5d4 --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/SourceArgumentsReaderTest.php @@ -0,0 +1,56 @@ +sourceArgumentsReader = new \Magento\Framework\Code\Reader\SourceArgumentsReader(); + } + + /** + * @param string $class + * @param array $expectedResult + * @dataProvider getConstructorArgumentTypesDataProvider + */ + public function testGetConstructorArgumentTypes($class, $expectedResult) + { + $class = new \ReflectionClass($class); + $actualResult = $this->sourceArgumentsReader->getConstructorArgumentTypes($class); + $this->assertEquals($expectedResult, $actualResult); + } + + public function getConstructorArgumentTypesDataProvider() + { + return [ + [ + 'Some\Testing\Name\Space\AnotherSimpleClass', + [ + '\Some\Testing\Name\Space\Item', + '\Imported\Name\Space\One', + '\Imported\Name\Space\AnotherTest\Extended', + '\Imported\Name\Space\Test', + '\Imported\Name\Space\Object\Under\Test', + '\Imported\Name\Space\Object', + '\Some\Testing\Name\Space\Test', + 'array', + '' + ], + ], + [ + '\stdClass', + [null] + ] + ]; + } +} diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/_files/SourceArgumentsReaderTest.php.sample b/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/_files/SourceArgumentsReaderTest.php.sample new file mode 100644 index 0000000000000..de0ee2a676fa6 --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/_files/SourceArgumentsReaderTest.php.sample @@ -0,0 +1,26 @@ +_validator->add(new \Magento\Framework\Code\Validator\ContextAggregation()); $this->_validator->add(new \Magento\Framework\Code\Validator\TypeDuplication()); $this->_validator->add(new \Magento\Framework\Code\Validator\ArgumentSequence()); + $this->_validator->add(new \Magento\Framework\Code\Validator\ConstructorArgumentTypes()); $this->pluginValidator = new \Magento\Framework\Interception\Code\InterfaceValidator(); } diff --git a/dev/tests/unit/testsuite/Magento/Framework/Code/Validator/ConstructorArgumentTypesTest.php b/dev/tests/unit/testsuite/Magento/Framework/Code/Validator/ConstructorArgumentTypesTest.php new file mode 100644 index 0000000000000..c03de973f0069 --- /dev/null +++ b/dev/tests/unit/testsuite/Magento/Framework/Code/Validator/ConstructorArgumentTypesTest.php @@ -0,0 +1,74 @@ +argumentsReaderMock = $this->getMock( + '\Magento\Framework\Code\Reader\ArgumentsReader', + [], + [], + '', + false + ); + $this->sourceArgumentsReaderMock = $this->getMock( + '\Magento\Framework\Code\Reader\sourceArgumentsReader', + [], + [], + '', + false + ); + $this->model = new \Magento\Framework\Code\Validator\ConstructorArgumentTypes( + $this->argumentsReaderMock, + $this->sourceArgumentsReaderMock + ); + } + + public function testValidate() + { + $className = '\stdClass'; + $classMock = new \ReflectionClass($className); + $this->argumentsReaderMock->expects($this->once())->method('getConstructorArguments')->with($classMock) + ->willReturn([['name' => 'Name1', 'type' => '\Type'], ['name' => 'Name2', 'type' => '\Type2']]); + $this->sourceArgumentsReaderMock->expects($this->once())->method('getConstructorArgumentTypes') + ->with($classMock)->willReturn(['\Type', '\Type2']); + $this->assertTrue($this->model->validate($className)); + } + + /** + * @expectedException \Magento\Framework\Code\ValidationException + * @expectedExceptionMessage Invalid constructor argument(s) in \stdClass + */ + public function testValidateWithException() + { + $className = '\stdClass'; + $classMock = new \ReflectionClass($className); + $this->argumentsReaderMock->expects($this->once())->method('getConstructorArguments')->with($classMock) + ->willReturn([['name' => 'Name1', 'type' => '\FAIL']]); + $this->sourceArgumentsReaderMock->expects($this->once())->method('getConstructorArgumentTypes') + ->with($classMock)->willReturn(['\Type', '\Fail']); + $this->assertTrue($this->model->validate($className)); + } +} + + diff --git a/lib/internal/Magento/Framework/Code/Reader/SourceArgumentsReader.php b/lib/internal/Magento/Framework/Code/Reader/SourceArgumentsReader.php new file mode 100644 index 0000000000000..0e07cc34ecf48 --- /dev/null +++ b/lib/internal/Magento/Framework/Code/Reader/SourceArgumentsReader.php @@ -0,0 +1,168 @@ +getFileName() || false == $class->hasMethod( + '__construct' + ) || !$inherited && $class->getConstructor()->class !== $class->getName() + ) { + return $output; + } + $reflectionConstructor = $class->getConstructor(); + $fileContent = file($class->getFileName()); + $availableNamespaces = $this->getImportedNamespaces($fileContent); + $availableNamespaces[0] = $class->getNamespaceName(); + $constructorStartLine = $reflectionConstructor->getStartLine() - 1; + $constructorEndLine = $reflectionConstructor->getEndLine(); + $fileContent = array_slice($fileContent, $constructorStartLine, $constructorEndLine - $constructorStartLine); + $source = ' $argument]; + } + unset($argument); + $arguments = array_filter($arguments, function ($token) { + $blacklist = [T_VARIABLE, T_WHITESPACE]; + if (isset($token[0]) && in_array($token[0], $blacklist)) { + return false; + } + return true; + }); + $arguments = array_column($arguments, 1); + $arguments = implode('', $arguments); + if (empty($arguments)) { + return $output; + } + $arguments = explode(',', $arguments); + foreach ($arguments as $key => &$argument) { + $argument = $this->removeDefaultValue($argument); + $argument = $this->resolveNamespaces($argument, $availableNamespaces); + } + unset($argument); + return $arguments; + } + + /** + * Perform namespace resolution if required and return fully qualified name. + * + * @param $argument + * @param $availableNamespaces array + * @return string + */ + protected function resolveNamespaces($argument, $availableNamespaces) + { + if (substr($argument, 0, 1) !== self::NS_SEPARATOR && $argument !== 'array' && !empty($argument)) { + $name = explode(self::NS_SEPARATOR, $argument); + $unqualifiedName = $name[0]; + $isQualifiedName = count($name) > 1 ? true : false; + if (isset($availableNamespaces[$unqualifiedName])) { + $namespace = $availableNamespaces[$unqualifiedName]; + if ($isQualifiedName) { + array_shift($name); + return $namespace . self::NS_SEPARATOR . implode(self::NS_SEPARATOR, $name); + } + return $namespace; + } else { + return self::NS_SEPARATOR . $availableNamespaces[0] . self::NS_SEPARATOR . $argument; + } + } + return $argument; + } + + /** + * Remove default value from argument. + * + * @param $argument + * @return string + */ + protected function removeDefaultValue($argument) + { + $position = strpos($argument, '='); + if (is_numeric($position)) { + return substr($argument, 0, $position); + } + return $argument; + } + + /** + * Get all imported namespaces. + * + * @param array $file + * @return array + */ + protected function getImportedNamespaces(array $file) + { + $file = implode('', $file); + $file = token_get_all($file); + $classStart = array_search('{', $file); + $file = array_slice($file, 0, $classStart); + $output = []; + foreach ($file as $position => $token) { + if (is_array($token) && $token[0] === T_USE) { + $import = array_slice($file, $position); + $importEnd = array_search(';', $import); + $import = array_slice($import, 0, $importEnd); + $imports = []; + $importsCount = 0; + foreach ($import as $item) { + if ($item === ',') { + $importsCount++; + continue; + } + $imports[$importsCount][] = $item; + } + foreach($imports as $import) { + $import = array_filter($import, function ($token) { + $whitelist = [T_NS_SEPARATOR, T_STRING, T_AS]; + if (isset($token[0]) && in_array($token[0], $whitelist)) { + return true; + } + return false; + }); + $import = array_column($import, 1); + if ($import[0] === self::NS_SEPARATOR) { + array_shift($import); + } + $importName = null; + if (in_array('as', $import)) { + $importName = array_splice($import, -1)[0]; + array_pop($import); + } + $useStatement = implode('', $import); + if ($importName) { + $output[$importName] = self::NS_SEPARATOR . $useStatement; + } else { + $key = end(explode(self::NS_SEPARATOR, $useStatement)); + $output[$key] = self::NS_SEPARATOR . $useStatement; + } + } + } + } + return $output; + } +} diff --git a/lib/internal/Magento/Framework/Code/Validator/ConstructorArgumentTypes.php b/lib/internal/Magento/Framework/Code/Validator/ConstructorArgumentTypes.php new file mode 100644 index 0000000000000..08ba58728a319 --- /dev/null +++ b/lib/internal/Magento/Framework/Code/Validator/ConstructorArgumentTypes.php @@ -0,0 +1,54 @@ +argumentsReader = $argumentsReader ?: new \Magento\Framework\Code\Reader\ArgumentsReader(); + $this->sourceArgumentsReader = + $sourceArgumentsReader ?: new \Magento\Framework\Code\Reader\SourceArgumentsReader(); + } + + /** + * Validate class constructor arguments + * + * @param string $className + * @return bool + * @throws \Magento\Framework\Code\ValidationException + */ + public function validate($className) + { + $class = new \ReflectionClass($className); + $expectedArguments = $this->argumentsReader->getConstructorArguments($class); + $actualArguments = $this->sourceArgumentsReader->getConstructorArgumentTypes($class); + $expectedArguments = array_column($expectedArguments, 'type'); + if (!empty(array_diff($expectedArguments, $actualArguments))) { + throw new \Magento\Framework\Code\ValidationException( + 'Invalid constructor argument(s) in ' . $className + ); + } + return true; + } +} diff --git a/lib/internal/Magento/Framework/Config/Composer/Package.php b/lib/internal/Magento/Framework/Config/Composer/Package.php index fe3079f9159a3..06046b543482c 100644 --- a/lib/internal/Magento/Framework/Config/Composer/Package.php +++ b/lib/internal/Magento/Framework/Config/Composer/Package.php @@ -22,7 +22,7 @@ class Package * * @param \StdClass $json */ - public function __construct(\StdClass $json) + public function __construct(\stdClass $json) { $this->json = $json; } From 040efbd7a3dce9fa6af16a143b97d5714f0fec42 Mon Sep 17 00:00:00 2001 From: Ievgen Shakhsuvarov Date: Thu, 8 Jan 2015 19:06:31 +0200 Subject: [PATCH 14/44] MAGETWO-26655: [TD] Compiler Can't Verify Case Sensitive Dependency --- .../Code/Reader/_files/SourceArgumentsReaderTest.php.sample | 1 - 1 file changed, 1 deletion(-) diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/_files/SourceArgumentsReaderTest.php.sample b/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/_files/SourceArgumentsReaderTest.php.sample index de0ee2a676fa6..af2b52ff101f1 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/_files/SourceArgumentsReaderTest.php.sample +++ b/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/_files/SourceArgumentsReaderTest.php.sample @@ -21,6 +21,5 @@ class AnotherSimpleClass array $itemEight = [], $itemNine = 'test' ) { - return; } } \ No newline at end of file From e9f6e86ad7762d552269af5a8e80a21b4d62dd99 Mon Sep 17 00:00:00 2001 From: Safwan Khan Date: Thu, 8 Jan 2015 11:32:43 -0600 Subject: [PATCH 15/44] MAGETWO-32363: Update composer files for PHP 5.6 - Updated composer.lock --- composer.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index 805bbf13580a0..57a8a150f2242 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "27bff88b2a866343d0e0bc06fc52080f", + "hash": "6fa42719525f72454c4c706f02f102cb", "packages": [ { "name": "composer/composer", @@ -3144,7 +3144,7 @@ }, "prefer-stable": false, "platform": { - "php": "~5.4.11|~5.5.0" + "php": "~5.4.11|~5.5.0|~5.6.0" }, "platform-dev": { "lib-libxml": "*", From ea6676635c41b1ee462c75e8eb5377ed33984c55 Mon Sep 17 00:00:00 2001 From: Safwan Khan Date: Thu, 8 Jan 2015 12:07:44 -0600 Subject: [PATCH 16/44] MAGETWO-32363: Update composer files for PHP 5.6 - Correction on composer.lock --- composer.lock | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index 57a8a150f2242..540794633a976 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "6fa42719525f72454c4c706f02f102cb", + "hash": "d784dd3070bb6f45bc8f1793feecb191", "packages": [ { "name": "composer/composer", @@ -118,7 +118,7 @@ "email": "justin.rainbow@gmail.com" }, { - "name": "Robert Schönthal", + "name": "Robert Schönthal", "email": "robert.schoenthal@gmail.com", "homepage": "http://digitalkaoz.net" } @@ -1621,7 +1621,7 @@ "license": [ "BSD-3-Clause" ], - "description": "a component that aids in manipulating and validating » Uniform Resource Identifiers (URIs)", + "description": "a component that aids in manipulating and validating » Uniform Resource Identifiers (URIs)", "keywords": [ "uri", "zf2" @@ -1863,7 +1863,7 @@ ], "authors": [ { - "name": "Dariusz Rumiński", + "name": "Dariusz RumiÅ„ski", "email": "dariusz.ruminski@gmail.com" }, { @@ -3143,6 +3143,7 @@ "phpmd/phpmd": 0 }, "prefer-stable": false, + "prefer-lowest": false, "platform": { "php": "~5.4.11|~5.5.0|~5.6.0" }, From e1c9b8f7252400fd94384c0780448a84239e6b30 Mon Sep 17 00:00:00 2001 From: Safwan Khan Date: Thu, 8 Jan 2015 15:49:38 -0600 Subject: [PATCH 17/44] MAGETWO-32363: Update composer files for PHP 5.6 - Correction on composer.lock --- composer.lock | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index 540794633a976..49e3d462858c2 100644 --- a/composer.lock +++ b/composer.lock @@ -118,7 +118,7 @@ "email": "justin.rainbow@gmail.com" }, { - "name": "Robert Schönthal", + "name": "Robert Schönthal", "email": "robert.schoenthal@gmail.com", "homepage": "http://digitalkaoz.net" } @@ -1621,7 +1621,7 @@ "license": [ "BSD-3-Clause" ], - "description": "a component that aids in manipulating and validating » Uniform Resource Identifiers (URIs)", + "description": "a component that aids in manipulating and validating » Uniform Resource Identifiers (URIs)", "keywords": [ "uri", "zf2" @@ -1863,7 +1863,7 @@ ], "authors": [ { - "name": "Dariusz RumiÅ„ski", + "name": "Dariusz Rumiński", "email": "dariusz.ruminski@gmail.com" }, { @@ -3143,7 +3143,6 @@ "phpmd/phpmd": 0 }, "prefer-stable": false, - "prefer-lowest": false, "platform": { "php": "~5.4.11|~5.5.0|~5.6.0" }, From 46a7bb0d7bbae8c00063a9c4bb18844177acfd63 Mon Sep 17 00:00:00 2001 From: Anup Dugar Date: Thu, 8 Jan 2015 23:48:23 -0600 Subject: [PATCH 18/44] MAGETWO-31999: oAuth issue [from github] - Unit test for OauthInputException::getAggregatedErrorMessage --- .../Magento/Oauth/OauthInputExceptionTest.php | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 dev/tests/unit/testsuite/Magento/Oauth/OauthInputExceptionTest.php diff --git a/dev/tests/unit/testsuite/Magento/Oauth/OauthInputExceptionTest.php b/dev/tests/unit/testsuite/Magento/Oauth/OauthInputExceptionTest.php new file mode 100644 index 0000000000000..abbeb29c974c4 --- /dev/null +++ b/dev/tests/unit/testsuite/Magento/Oauth/OauthInputExceptionTest.php @@ -0,0 +1,28 @@ +addError(OauthInputException::REQUIRED_FIELD, ['fieldName' => $param]); + } + $exception->addError('Message with period.', ['fieldName' => 'field3']); + + $this->assertEquals( + 'field1 is a required field, field2 is a required field, Message with period', + $exception->getAggregatedErrorMessage() + ); + } + + public function testGetAggregatedErrorMessageNoError() + { + $exception = new OauthInputException(); + $this->assertEquals('', $exception->getAggregatedErrorMessage()); + } +} From f0b6a112c6cca67566a6749c9230fcb762b950a4 Mon Sep 17 00:00:00 2001 From: Ievgen Shakhsuvarov Date: Fri, 9 Jan 2015 11:07:32 +0200 Subject: [PATCH 19/44] MAGETWO-26655: [TD] Compiler Can't Verify Case Sensitive Dependency --- .../Framework/Code/Validator/ConstructorArgumentTypes.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/internal/Magento/Framework/Code/Validator/ConstructorArgumentTypes.php b/lib/internal/Magento/Framework/Code/Validator/ConstructorArgumentTypes.php index 08ba58728a319..ab98778484521 100644 --- a/lib/internal/Magento/Framework/Code/Validator/ConstructorArgumentTypes.php +++ b/lib/internal/Magento/Framework/Code/Validator/ConstructorArgumentTypes.php @@ -44,7 +44,8 @@ public function validate($className) $expectedArguments = $this->argumentsReader->getConstructorArguments($class); $actualArguments = $this->sourceArgumentsReader->getConstructorArgumentTypes($class); $expectedArguments = array_column($expectedArguments, 'type'); - if (!empty(array_diff($expectedArguments, $actualArguments))) { + $result = array_diff($expectedArguments, $actualArguments); + if (!empty($result)) { throw new \Magento\Framework\Code\ValidationException( 'Invalid constructor argument(s) in ' . $className ); From 437a9ea6e532994f0b8f95567d91cfc48a573118 Mon Sep 17 00:00:00 2001 From: Ievgen Shakhsuvarov Date: Fri, 9 Jan 2015 11:19:10 +0200 Subject: [PATCH 20/44] MAGETWO-26655: [TD] Compiler Can't Verify Case Sensitive Dependency --- .../Framework/Code/Validator/ConstructorArgumentTypesTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tests/unit/testsuite/Magento/Framework/Code/Validator/ConstructorArgumentTypesTest.php b/dev/tests/unit/testsuite/Magento/Framework/Code/Validator/ConstructorArgumentTypesTest.php index c03de973f0069..b9933923ff80b 100644 --- a/dev/tests/unit/testsuite/Magento/Framework/Code/Validator/ConstructorArgumentTypesTest.php +++ b/dev/tests/unit/testsuite/Magento/Framework/Code/Validator/ConstructorArgumentTypesTest.php @@ -32,7 +32,7 @@ protected function setUp() false ); $this->sourceArgumentsReaderMock = $this->getMock( - '\Magento\Framework\Code\Reader\sourceArgumentsReader', + '\Magento\Framework\Code\Reader\SourceArgumentsReader', [], [], '', From b8b4d7ec42756fd62dc4070262e5f4bdb851857c Mon Sep 17 00:00:00 2001 From: Ievgen Shakhsuvarov Date: Fri, 9 Jan 2015 11:58:10 +0200 Subject: [PATCH 21/44] MAGETWO-26655: [TD] Compiler Can't Verify Case Sensitive Dependency --- .../Code/Reader/SourceArgumentsReader.php | 24 ++++++++++++------- .../Validator/ConstructorArgumentTypes.php | 4 +++- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/lib/internal/Magento/Framework/Code/Reader/SourceArgumentsReader.php b/lib/internal/Magento/Framework/Code/Reader/SourceArgumentsReader.php index 0e07cc34ecf48..9e7a3ee2c35c8 100644 --- a/lib/internal/Magento/Framework/Code/Reader/SourceArgumentsReader.php +++ b/lib/internal/Magento/Framework/Code/Reader/SourceArgumentsReader.php @@ -21,9 +21,11 @@ class SourceArgumentsReader public function getConstructorArgumentTypes(\ReflectionClass $class, $inherited = false) { $output = [null]; + /** - * Skip native PHP types, classes without constructor - */ + Skip native PHP types, classes without constructor. + */ + if (!$class->getFileName() || false == $class->hasMethod( '__construct' ) || !$inherited && $class->getConstructor()->class !== $class->getName() @@ -53,7 +55,10 @@ public function getConstructorArgumentTypes(\ReflectionClass $class, $inherited } return true; }); - $arguments = array_column($arguments, 1); + $arguments = array_map(function ($element) { + return $element[1]; + }, $arguments); + $arguments = array_values($arguments); $arguments = implode('', $arguments); if (empty($arguments)) { return $output; @@ -70,8 +75,8 @@ public function getConstructorArgumentTypes(\ReflectionClass $class, $inherited /** * Perform namespace resolution if required and return fully qualified name. * - * @param $argument - * @param $availableNamespaces array + * @param string $argument + * @param array $availableNamespaces * @return string */ protected function resolveNamespaces($argument, $availableNamespaces) @@ -97,7 +102,7 @@ protected function resolveNamespaces($argument, $availableNamespaces) /** * Remove default value from argument. * - * @param $argument + * @param string $argument * @return string */ protected function removeDefaultValue($argument) @@ -136,7 +141,7 @@ protected function getImportedNamespaces(array $file) } $imports[$importsCount][] = $item; } - foreach($imports as $import) { + foreach ($imports as $import) { $import = array_filter($import, function ($token) { $whitelist = [T_NS_SEPARATOR, T_STRING, T_AS]; if (isset($token[0]) && in_array($token[0], $whitelist)) { @@ -144,7 +149,10 @@ protected function getImportedNamespaces(array $file) } return false; }); - $import = array_column($import, 1); + $import = array_map(function ($element) { + return $element[1]; + }, $import); + $import = array_values($import); if ($import[0] === self::NS_SEPARATOR) { array_shift($import); } diff --git a/lib/internal/Magento/Framework/Code/Validator/ConstructorArgumentTypes.php b/lib/internal/Magento/Framework/Code/Validator/ConstructorArgumentTypes.php index ab98778484521..f119bd004ddf7 100644 --- a/lib/internal/Magento/Framework/Code/Validator/ConstructorArgumentTypes.php +++ b/lib/internal/Magento/Framework/Code/Validator/ConstructorArgumentTypes.php @@ -43,7 +43,9 @@ public function validate($className) $class = new \ReflectionClass($className); $expectedArguments = $this->argumentsReader->getConstructorArguments($class); $actualArguments = $this->sourceArgumentsReader->getConstructorArgumentTypes($class); - $expectedArguments = array_column($expectedArguments, 'type'); + $expectedArguments = array_map(function ($element) { + return $element['type']; + }, $expectedArguments); $result = array_diff($expectedArguments, $actualArguments); if (!empty($result)) { throw new \Magento\Framework\Code\ValidationException( From 21aa6a3cae8886caa8cac27204250fcad5975fb2 Mon Sep 17 00:00:00 2001 From: Ievgen Shakhsuvarov Date: Fri, 9 Jan 2015 12:23:04 +0200 Subject: [PATCH 22/44] MAGETWO-26655: [TD] Compiler Can't Verify Case Sensitive Dependency --- .../Magento/Framework/Code/Reader/SourceArgumentsReader.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/lib/internal/Magento/Framework/Code/Reader/SourceArgumentsReader.php b/lib/internal/Magento/Framework/Code/Reader/SourceArgumentsReader.php index 9e7a3ee2c35c8..6f34672189ec3 100644 --- a/lib/internal/Magento/Framework/Code/Reader/SourceArgumentsReader.php +++ b/lib/internal/Magento/Framework/Code/Reader/SourceArgumentsReader.php @@ -21,11 +21,6 @@ class SourceArgumentsReader public function getConstructorArgumentTypes(\ReflectionClass $class, $inherited = false) { $output = [null]; - - /** - Skip native PHP types, classes without constructor. - */ - if (!$class->getFileName() || false == $class->hasMethod( '__construct' ) || !$inherited && $class->getConstructor()->class !== $class->getName() From de73fa2f240fc4ea39d7a3ff9f2aaa13fc79baf7 Mon Sep 17 00:00:00 2001 From: Ievgen Shakhsuvarov Date: Fri, 9 Jan 2015 12:37:55 +0200 Subject: [PATCH 23/44] MAGETWO-26655: [TD] Compiler Can't Verify Case Sensitive Dependency --- .../Magento/Framework/Code/Reader/SourceArgumentsReader.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/internal/Magento/Framework/Code/Reader/SourceArgumentsReader.php b/lib/internal/Magento/Framework/Code/Reader/SourceArgumentsReader.php index 6f34672189ec3..68ef4482b6367 100644 --- a/lib/internal/Magento/Framework/Code/Reader/SourceArgumentsReader.php +++ b/lib/internal/Magento/Framework/Code/Reader/SourceArgumentsReader.php @@ -160,7 +160,8 @@ protected function getImportedNamespaces(array $file) if ($importName) { $output[$importName] = self::NS_SEPARATOR . $useStatement; } else { - $key = end(explode(self::NS_SEPARATOR, $useStatement)); + $key = explode(self::NS_SEPARATOR, $useStatement); + $key = end($key); $output[$key] = self::NS_SEPARATOR . $useStatement; } } From 1125acf7eeb721542c1d26bb01204d057dae8779 Mon Sep 17 00:00:00 2001 From: Ievgen Shakhsuvarov Date: Fri, 9 Jan 2015 12:54:42 +0200 Subject: [PATCH 24/44] MAGETWO-26655: [TD] Compiler Can't Verify Case Sensitive Dependency --- .../Magento/Framework/Code/Reader/SourceArgumentsReader.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/internal/Magento/Framework/Code/Reader/SourceArgumentsReader.php b/lib/internal/Magento/Framework/Code/Reader/SourceArgumentsReader.php index 68ef4482b6367..27b087cfe6d1c 100644 --- a/lib/internal/Magento/Framework/Code/Reader/SourceArgumentsReader.php +++ b/lib/internal/Magento/Framework/Code/Reader/SourceArgumentsReader.php @@ -22,8 +22,8 @@ public function getConstructorArgumentTypes(\ReflectionClass $class, $inherited { $output = [null]; if (!$class->getFileName() || false == $class->hasMethod( - '__construct' - ) || !$inherited && $class->getConstructor()->class !== $class->getName() + '__construct' + ) || !$inherited && $class->getConstructor()->class !== $class->getName() ) { return $output; } From a95e9c753504a94f7748f70f7eabe0d59bcf667a Mon Sep 17 00:00:00 2001 From: Maddy Chellathurai Date: Fri, 19 Dec 2014 10:48:14 -0600 Subject: [PATCH 25/44] MAGETWO-31850: [GITHUB] install.log can not be created with open_basedir restriction - moved install.log to var/log --- .../Setup/src/Controller/DatabaseCheck.php | 14 +++- .../Magento/Setup/src/Model/WebLogger.php | 80 ++++++------------- 2 files changed, 37 insertions(+), 57 deletions(-) diff --git a/setup/module/Magento/Setup/src/Controller/DatabaseCheck.php b/setup/module/Magento/Setup/src/Controller/DatabaseCheck.php index 00765648b030c..34284da0a7e6f 100644 --- a/setup/module/Magento/Setup/src/Controller/DatabaseCheck.php +++ b/setup/module/Magento/Setup/src/Controller/DatabaseCheck.php @@ -4,6 +4,7 @@ */ namespace Magento\Setup\Controller; +use Magento\Framework\Filesystem; use Magento\Setup\Model\InstallerFactory; use Magento\Setup\Model\WebLogger; use Zend\Json\Json; @@ -19,14 +20,23 @@ class DatabaseCheck extends AbstractActionController */ private $installerFactory; + /** + * Filesystem to access log + * + * @var Filesystem + */ + private $filesystem; + /** * Constructor * * @param InstallerFactory $installerFactory + * @param Filesystem $filesystem */ - public function __construct(InstallerFactory $installerFactory) + public function __construct(InstallerFactory $installerFactory, Filesystem $filesystem) { $this->installerFactory = $installerFactory; + $this->filesystem = $filesystem; } /** @@ -38,7 +48,7 @@ public function indexAction() { $params = Json::decode($this->getRequest()->getContent(), Json::TYPE_ARRAY); try { - $installer = $this->installerFactory->create(new WebLogger()); + $installer = $this->installerFactory->create(new WebLogger($this->filesystem)); $password = isset($params['password']) ? $params['password'] : ''; $installer->checkDatabaseConnection($params['name'], $params['host'], $params['user'], $password); return new JsonModel(['success' => true]); diff --git a/setup/module/Magento/Setup/src/Model/WebLogger.php b/setup/module/Magento/Setup/src/Model/WebLogger.php index 28dde3a0b2b76..328d8823df51c 100644 --- a/setup/module/Magento/Setup/src/Model/WebLogger.php +++ b/setup/module/Magento/Setup/src/Model/WebLogger.php @@ -5,6 +5,9 @@ namespace Magento\Setup\Model; +use Magento\Framework\App\Filesystem\DirectoryList; +use Magento\Framework\Filesystem; + /** * Web UI Logger * @@ -22,16 +25,17 @@ class WebLogger implements LoggerInterface /** * Currently open file resource * - * @var resource + * @var Filesystem */ - protected $resource; + protected $filesystem; + /** - * Whether the log contains an error message + * Currently open file resource * - * @var bool + * @var \Magento\Framework\Filesystem\Directory\WriteInterface */ - protected $hasError = false; + protected $directory; /** * Indicator of whether inline output is started @@ -42,31 +46,11 @@ class WebLogger implements LoggerInterface /** * Constructor + * @param Filesystem $filesystem */ - public function __construct() - { - $this->logFile = sys_get_temp_dir() . DIRECTORY_SEPARATOR . $this->logFile; - } - - /** - * Opens log file in the specified mode - * - * @param string $mode - * @return void - */ - private function open($mode) - { - $this->resource = fopen($this->logFile, $mode); - } - - /** - * Closes the log file - * - * @return void - */ - private function close() + public function __construct(Filesystem $filesystem) { - fclose($this->resource); + $this->directory = $filesystem->getDirectoryWrite(DirectoryList::LOG); } /** @@ -84,7 +68,14 @@ public function logSuccess($message) public function logError(\Exception $e) { $this->terminateLine(); - $this->writeToFile('[ERROR] ' . $e . '
'); + $stackTrace = $e->getTrace(); + $this->writeToFile('[ERROR] ' . $e->getMessage() . '
'); + foreach ($stackTrace as $errorLine) { + if (isset($errorLine['file'])) { + $this->writeToFile($errorLine['file'] . ' ' . $errorLine['line'] . '
'); + } + } + $this->writeToFile('
'); } /** @@ -122,19 +113,7 @@ public function logMeta($message) */ private function writeToFile($message) { - $this->open('a+'); - fwrite($this->resource, $message); - $this->close(); - } - - /** - * Whether there is an error in the log - * - * @return bool - */ - public function hasError() - { - return $this->hasError; + $this->directory->writeFile($this->logFile, $message, 'a+'); } /** @@ -144,17 +123,8 @@ public function hasError() */ public function get() { - $this->open('r+'); - fseek($this->resource, 0); - $messages = []; - while (($string = fgets($this->resource)) !== false) { - if (strpos($string, '[ERROR]') !== false) { - $this->hasError = true; - } - $messages[] = $string; - } - $this->close(); - return $messages; + $fileContents = explode('\n', $this->directory->readFile($this->logFile)); + return $fileContents; } /** @@ -164,8 +134,8 @@ public function get() */ public function clear() { - if (file_exists($this->logFile)) { - unlink($this->logFile); + if ($this->directory->isExist($this->logFile)) { + $this->directory->delete($this->logFile); } } From 999d53836c5837ceebb14a55bc3bbce6c9856496 Mon Sep 17 00:00:00 2001 From: Maddy Chellathurai Date: Mon, 22 Dec 2014 11:31:10 -0600 Subject: [PATCH 26/44] MAGETWO-31850: [GITHUB] install.log can not be created with open_basedir restriction #796 - fixes based on CR comments --- .../Setup/src/Controller/DatabaseCheck.php | 15 ++----------- .../Setup/src/Model/InstallerFactory.php | 5 ++--- .../Magento/Setup/src/Model/WebLogger.php | 22 ++++++------------- 3 files changed, 11 insertions(+), 31 deletions(-) diff --git a/setup/module/Magento/Setup/src/Controller/DatabaseCheck.php b/setup/module/Magento/Setup/src/Controller/DatabaseCheck.php index 34284da0a7e6f..4e7286c8d5b1d 100644 --- a/setup/module/Magento/Setup/src/Controller/DatabaseCheck.php +++ b/setup/module/Magento/Setup/src/Controller/DatabaseCheck.php @@ -4,9 +4,7 @@ */ namespace Magento\Setup\Controller; -use Magento\Framework\Filesystem; use Magento\Setup\Model\InstallerFactory; -use Magento\Setup\Model\WebLogger; use Zend\Json\Json; use Zend\Mvc\Controller\AbstractActionController; use Zend\View\Model\JsonModel; @@ -20,23 +18,14 @@ class DatabaseCheck extends AbstractActionController */ private $installerFactory; - /** - * Filesystem to access log - * - * @var Filesystem - */ - private $filesystem; - /** * Constructor * * @param InstallerFactory $installerFactory - * @param Filesystem $filesystem */ - public function __construct(InstallerFactory $installerFactory, Filesystem $filesystem) + public function __construct(InstallerFactory $installerFactory) { $this->installerFactory = $installerFactory; - $this->filesystem = $filesystem; } /** @@ -48,7 +37,7 @@ public function indexAction() { $params = Json::decode($this->getRequest()->getContent(), Json::TYPE_ARRAY); try { - $installer = $this->installerFactory->create(new WebLogger($this->filesystem)); + $installer = $this->installerFactory->create(); $password = isset($params['password']) ? $params['password'] : ''; $installer->checkDatabaseConnection($params['name'], $params['host'], $params['user'], $password); return new JsonModel(['success' => true]); diff --git a/setup/module/Magento/Setup/src/Model/InstallerFactory.php b/setup/module/Magento/Setup/src/Model/InstallerFactory.php index 84b8b76bb0321..b2fca6118b1a1 100644 --- a/setup/module/Magento/Setup/src/Model/InstallerFactory.php +++ b/setup/module/Magento/Setup/src/Model/InstallerFactory.php @@ -29,10 +29,9 @@ public function __construct(ServiceLocatorInterface $serviceLocator) /** * Factory method for installer object * - * @param LoggerInterface $log * @return Installer */ - public function create(LoggerInterface $log) + public function create() { return new Installer( $this->serviceLocator->get('Magento\Setup\Model\FilePermissions'), @@ -43,7 +42,7 @@ public function create(LoggerInterface $log) $this->serviceLocator->get('Magento\Framework\Module\ModuleList\Loader'), $this->serviceLocator->get('Magento\Framework\App\Filesystem\DirectoryList'), $this->serviceLocator->get('Magento\Setup\Model\AdminAccountFactory'), - $log, + new WebLogger($this->serviceLocator->get('Magento\Framework\Filesystem')), $this->serviceLocator->get('Magento\Framework\Math\Random'), $this->serviceLocator->get('Magento\Setup\Module\ConnectionFactory'), $this->serviceLocator->get('Magento\Framework\App\MaintenanceMode'), diff --git a/setup/module/Magento/Setup/src/Model/WebLogger.php b/setup/module/Magento/Setup/src/Model/WebLogger.php index 328d8823df51c..133c932c50e27 100644 --- a/setup/module/Magento/Setup/src/Model/WebLogger.php +++ b/setup/module/Magento/Setup/src/Model/WebLogger.php @@ -18,9 +18,9 @@ class WebLogger implements LoggerInterface /** * Log File * - * @var string + * @const string */ - protected $logFile = 'install.log'; + const LOG_WEB = 'install.log'; /** * Currently open file resource @@ -29,7 +29,6 @@ class WebLogger implements LoggerInterface */ protected $filesystem; - /** * Currently open file resource * @@ -68,14 +67,7 @@ public function logSuccess($message) public function logError(\Exception $e) { $this->terminateLine(); - $stackTrace = $e->getTrace(); - $this->writeToFile('[ERROR] ' . $e->getMessage() . '
'); - foreach ($stackTrace as $errorLine) { - if (isset($errorLine['file'])) { - $this->writeToFile($errorLine['file'] . ' ' . $errorLine['line'] . '
'); - } - } - $this->writeToFile('
'); + $this->writeToFile('[ERROR] ' . $e . '
'); } /** @@ -113,7 +105,7 @@ public function logMeta($message) */ private function writeToFile($message) { - $this->directory->writeFile($this->logFile, $message, 'a+'); + $this->directory->writeFile(self::LOG_WEB, $message, 'a+'); } /** @@ -123,7 +115,7 @@ private function writeToFile($message) */ public function get() { - $fileContents = explode('\n', $this->directory->readFile($this->logFile)); + $fileContents = explode('\n', $this->directory->readFile(self::LOG_WEB)); return $fileContents; } @@ -134,8 +126,8 @@ public function get() */ public function clear() { - if ($this->directory->isExist($this->logFile)) { - $this->directory->delete($this->logFile); + if ($this->directory->isExist(self::LOG_WEB)) { + $this->directory->delete(self::LOG_WEB); } } From 40148b3f0770fc8f7b30699d79d6e3fba76bb128 Mon Sep 17 00:00:00 2001 From: Maddy Chellathurai Date: Wed, 24 Dec 2014 09:39:57 -0600 Subject: [PATCH 27/44] MAGETWO-31850: [GITHUB] install.log can not be created with open_basedir restriction #796 - CR changes --- .../Magento/Setup/src/Controller/DatabaseCheck.php | 14 ++++++++++++-- .../Magento/Setup/src/Model/InstallerFactory.php | 5 +++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/setup/module/Magento/Setup/src/Controller/DatabaseCheck.php b/setup/module/Magento/Setup/src/Controller/DatabaseCheck.php index 4e7286c8d5b1d..4988c4ba13057 100644 --- a/setup/module/Magento/Setup/src/Controller/DatabaseCheck.php +++ b/setup/module/Magento/Setup/src/Controller/DatabaseCheck.php @@ -5,6 +5,7 @@ namespace Magento\Setup\Controller; use Magento\Setup\Model\InstallerFactory; +use Magento\Setup\Model\WebLogger; use Zend\Json\Json; use Zend\Mvc\Controller\AbstractActionController; use Zend\View\Model\JsonModel; @@ -18,14 +19,23 @@ class DatabaseCheck extends AbstractActionController */ private $installerFactory; + /** + * WebLogger to access log + * + * @var WebLogger + */ + private $webLogger; + /** * Constructor * * @param InstallerFactory $installerFactory + * @param WebLogger $webLogger */ - public function __construct(InstallerFactory $installerFactory) + public function __construct(InstallerFactory $installerFactory, WebLogger $webLogger) { $this->installerFactory = $installerFactory; + $this->webLogger = $webLogger; } /** @@ -37,7 +47,7 @@ public function indexAction() { $params = Json::decode($this->getRequest()->getContent(), Json::TYPE_ARRAY); try { - $installer = $this->installerFactory->create(); + $installer = $this->installerFactory->create($this->webLogger); $password = isset($params['password']) ? $params['password'] : ''; $installer->checkDatabaseConnection($params['name'], $params['host'], $params['user'], $password); return new JsonModel(['success' => true]); diff --git a/setup/module/Magento/Setup/src/Model/InstallerFactory.php b/setup/module/Magento/Setup/src/Model/InstallerFactory.php index b2fca6118b1a1..84b8b76bb0321 100644 --- a/setup/module/Magento/Setup/src/Model/InstallerFactory.php +++ b/setup/module/Magento/Setup/src/Model/InstallerFactory.php @@ -29,9 +29,10 @@ public function __construct(ServiceLocatorInterface $serviceLocator) /** * Factory method for installer object * + * @param LoggerInterface $log * @return Installer */ - public function create() + public function create(LoggerInterface $log) { return new Installer( $this->serviceLocator->get('Magento\Setup\Model\FilePermissions'), @@ -42,7 +43,7 @@ public function create() $this->serviceLocator->get('Magento\Framework\Module\ModuleList\Loader'), $this->serviceLocator->get('Magento\Framework\App\Filesystem\DirectoryList'), $this->serviceLocator->get('Magento\Setup\Model\AdminAccountFactory'), - new WebLogger($this->serviceLocator->get('Magento\Framework\Filesystem')), + $log, $this->serviceLocator->get('Magento\Framework\Math\Random'), $this->serviceLocator->get('Magento\Setup\Module\ConnectionFactory'), $this->serviceLocator->get('Magento\Framework\App\MaintenanceMode'), From 480295015a4363bca5ed5494b5d645fad04ac284 Mon Sep 17 00:00:00 2001 From: Maddy Chellathurai Date: Mon, 29 Dec 2014 08:40:39 -0600 Subject: [PATCH 28/44] MAGETWO-31850: [GITHUB] install.log can not be created with open_basedir restriction #796 - reverting few changes in weblogger --- .../Magento/Setup/src/Model/WebLogger.php | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/setup/module/Magento/Setup/src/Model/WebLogger.php b/setup/module/Magento/Setup/src/Model/WebLogger.php index 133c932c50e27..43f2c05d9a4db 100644 --- a/setup/module/Magento/Setup/src/Model/WebLogger.php +++ b/setup/module/Magento/Setup/src/Model/WebLogger.php @@ -18,9 +18,9 @@ class WebLogger implements LoggerInterface /** * Log File * - * @const string + * @var string */ - const LOG_WEB = 'install.log'; + protected $logFile = 'install.log'; /** * Currently open file resource @@ -46,10 +46,14 @@ class WebLogger implements LoggerInterface /** * Constructor * @param Filesystem $filesystem + * @param string $logFile */ - public function __construct(Filesystem $filesystem) + public function __construct(Filesystem $filesystem, $logFile = null) { $this->directory = $filesystem->getDirectoryWrite(DirectoryList::LOG); + if ($logFile) { + $this->logFile = $logFile; + } } /** @@ -105,7 +109,7 @@ public function logMeta($message) */ private function writeToFile($message) { - $this->directory->writeFile(self::LOG_WEB, $message, 'a+'); + $this->directory->writeFile($this->logFile, $message, 'a+'); } /** @@ -115,7 +119,7 @@ private function writeToFile($message) */ public function get() { - $fileContents = explode('\n', $this->directory->readFile(self::LOG_WEB)); + $fileContents = explode('\n', $this->directory->readFile($this->logFile)); return $fileContents; } @@ -126,8 +130,8 @@ public function get() */ public function clear() { - if ($this->directory->isExist(self::LOG_WEB)) { - $this->directory->delete(self::LOG_WEB); + if ($this->directory->isExist($this->logFile)) { + $this->directory->delete($this->logFile); } } From 852f4aafb23419af24ab71ecb7c128a1aae79a97 Mon Sep 17 00:00:00 2001 From: Safwan Khan Date: Wed, 24 Dec 2014 21:37:49 -0600 Subject: [PATCH 29/44] MAGETWO-32026: [GitHub] Invalid backend frontname During Installation #823 - Solved the stated problem. --- setup/pub/magento/setup/main.js | 1 - 1 file changed, 1 deletion(-) diff --git a/setup/pub/magento/setup/main.js b/setup/pub/magento/setup/main.js index 1e6979b38f682..0d7e33104d2f6 100644 --- a/setup/pub/magento/setup/main.js +++ b/setup/pub/magento/setup/main.js @@ -5,7 +5,6 @@ 'use strict'; var main = angular.module('main', ['ngStorage']); main.controller('navigationController', ['$scope', '$state', '$rootScope', 'navigationService', '$localStorage', function ($scope, $state, $rootScope, navigationService, $localStorage) { - $localStorage.$reset(); navigationService.load(); $rootScope.isMenuEnabled = true; $scope.itemStatus = function (order) { From d9d0f45b89d8afbbde389ed8b7423546971e69e5 Mon Sep 17 00:00:00 2001 From: Safwan Khan Date: Mon, 5 Jan 2015 17:43:53 -0600 Subject: [PATCH 30/44] MAGETWO-32026: [GitHub] Invalid backend frontname During Installation #823 - Changes based on CR feedback. --- .../App/DeploymentConfig/BackendConfigTest.php | 11 ++++++++++- .../Framework/App/DeploymentConfig/BackendConfig.php | 3 +++ setup/pub/magento/setup/landing.js | 1 + setup/pub/magento/setup/main.js | 2 +- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dev/tests/unit/testsuite/Magento/Framework/App/DeploymentConfig/BackendConfigTest.php b/dev/tests/unit/testsuite/Magento/Framework/App/DeploymentConfig/BackendConfigTest.php index 903f8e6756fdc..f5c6d2fcaf282 100644 --- a/dev/tests/unit/testsuite/Magento/Framework/App/DeploymentConfig/BackendConfigTest.php +++ b/dev/tests/unit/testsuite/Magento/Framework/App/DeploymentConfig/BackendConfigTest.php @@ -23,11 +23,20 @@ public function testGetData() * @expectedException \InvalidArgumentException * @expectedExceptionMessage No backend frontname provided. */ - public function testEmptyData() + public function testUnsetData() { new BackendConfig([]); } + /** + * @expectedException \InvalidArgumentException + * @expectedExceptionMessage Empty backend frontname provided. + */ + public function testEmptyData() + { + new BackendConfig(['frontName' => '']); + } + /** * @param array $data * @dataProvider invalidDataDataProvider diff --git a/lib/internal/Magento/Framework/App/DeploymentConfig/BackendConfig.php b/lib/internal/Magento/Framework/App/DeploymentConfig/BackendConfig.php index 597fafb82dc79..62ee7b81e34e8 100644 --- a/lib/internal/Magento/Framework/App/DeploymentConfig/BackendConfig.php +++ b/lib/internal/Magento/Framework/App/DeploymentConfig/BackendConfig.php @@ -28,6 +28,9 @@ public function __construct(array $data) if (!isset($data[self::KEY_FRONTNAME])) { throw new \InvalidArgumentException("No backend frontname provided."); } + if ($data[self::KEY_FRONTNAME] === '') { + throw new \InvalidArgumentException("Empty backend frontname provided."); + } if (!preg_match('/^[a-zA-Z0-9_]+$/', $data[self::KEY_FRONTNAME])) { throw new \InvalidArgumentException("Invalid backend frontname {$data[self::KEY_FRONTNAME]}"); } diff --git a/setup/pub/magento/setup/landing.js b/setup/pub/magento/setup/landing.js index 60d9a3b8076cc..2b9279e6228c1 100644 --- a/setup/pub/magento/setup/landing.js +++ b/setup/pub/magento/setup/landing.js @@ -9,6 +9,7 @@ angular.module('landing', ['ngStorage']) '$location', '$localStorage', function ($scope, $location, $localStorage) { + $localStorage.$reset(); $scope.selectLanguage = function () { $localStorage.lang = $scope.modelLanguage; window.location = 'index.php/' + $scope.modelLanguage + '/index'; diff --git a/setup/pub/magento/setup/main.js b/setup/pub/magento/setup/main.js index 0d7e33104d2f6..e4686f88b67df 100644 --- a/setup/pub/magento/setup/main.js +++ b/setup/pub/magento/setup/main.js @@ -4,7 +4,7 @@ 'use strict'; var main = angular.module('main', ['ngStorage']); -main.controller('navigationController', ['$scope', '$state', '$rootScope', 'navigationService', '$localStorage', function ($scope, $state, $rootScope, navigationService, $localStorage) { +main.controller('navigationController', ['$scope', '$state', '$rootScope', 'navigationService', function ($scope, $state, $rootScope, navigationService) { navigationService.load(); $rootScope.isMenuEnabled = true; $scope.itemStatus = function (order) { From 73a1b59f2b351cef9ade1dddd5a0b54b435c3289 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 6 Jan 2015 17:06:48 -0600 Subject: [PATCH 31/44] MAGETWO-32026: [GitHub] Invalid backend frontname During Installation #823 - Fixed the error based on CR feedback. --- .../Magento/Framework/App/DeploymentConfig/BackendConfig.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/internal/Magento/Framework/App/DeploymentConfig/BackendConfig.php b/lib/internal/Magento/Framework/App/DeploymentConfig/BackendConfig.php index 62ee7b81e34e8..1bfd48fd1f2f3 100644 --- a/lib/internal/Magento/Framework/App/DeploymentConfig/BackendConfig.php +++ b/lib/internal/Magento/Framework/App/DeploymentConfig/BackendConfig.php @@ -28,7 +28,7 @@ public function __construct(array $data) if (!isset($data[self::KEY_FRONTNAME])) { throw new \InvalidArgumentException("No backend frontname provided."); } - if ($data[self::KEY_FRONTNAME] === '') { + if (empty($data[self::KEY_FRONTNAME])) { throw new \InvalidArgumentException("Empty backend frontname provided."); } if (!preg_match('/^[a-zA-Z0-9_]+$/', $data[self::KEY_FRONTNAME])) { From ca9684eb36e4c604d56e2526027942c85314bedf Mon Sep 17 00:00:00 2001 From: Safwan Khan Date: Wed, 7 Jan 2015 14:15:21 -0600 Subject: [PATCH 32/44] MAGETWO-32026: [GitHub] Invalid backend frontname During Installation #823 - Change based on CR feedback. --- .../Framework/App/DeploymentConfig/BackendConfigTest.php | 2 +- .../Magento/Framework/App/DeploymentConfig/BackendConfig.php | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dev/tests/unit/testsuite/Magento/Framework/App/DeploymentConfig/BackendConfigTest.php b/dev/tests/unit/testsuite/Magento/Framework/App/DeploymentConfig/BackendConfigTest.php index f5c6d2fcaf282..46d95c7976441 100644 --- a/dev/tests/unit/testsuite/Magento/Framework/App/DeploymentConfig/BackendConfigTest.php +++ b/dev/tests/unit/testsuite/Magento/Framework/App/DeploymentConfig/BackendConfigTest.php @@ -30,7 +30,7 @@ public function testUnsetData() /** * @expectedException \InvalidArgumentException - * @expectedExceptionMessage Empty backend frontname provided. + * @expectedExceptionMessage No backend frontname provided. */ public function testEmptyData() { diff --git a/lib/internal/Magento/Framework/App/DeploymentConfig/BackendConfig.php b/lib/internal/Magento/Framework/App/DeploymentConfig/BackendConfig.php index 1bfd48fd1f2f3..e3be80b28c292 100644 --- a/lib/internal/Magento/Framework/App/DeploymentConfig/BackendConfig.php +++ b/lib/internal/Magento/Framework/App/DeploymentConfig/BackendConfig.php @@ -25,11 +25,8 @@ class BackendConfig extends AbstractSegment */ public function __construct(array $data) { - if (!isset($data[self::KEY_FRONTNAME])) { - throw new \InvalidArgumentException("No backend frontname provided."); - } if (empty($data[self::KEY_FRONTNAME])) { - throw new \InvalidArgumentException("Empty backend frontname provided."); + throw new \InvalidArgumentException("No backend frontname provided."); } if (!preg_match('/^[a-zA-Z0-9_]+$/', $data[self::KEY_FRONTNAME])) { throw new \InvalidArgumentException("Invalid backend frontname {$data[self::KEY_FRONTNAME]}"); From 8efb8d321f85d64098d4cd4123120ddf73ad94f3 Mon Sep 17 00:00:00 2001 From: Safwan Khan Date: Wed, 7 Jan 2015 15:08:56 -0600 Subject: [PATCH 33/44] MAGETWO-32363: Update composer files for PHP 5.6 - Updated all composer.json files along with composer.lock to support PHP 5.6 --- app/code/Magento/AdminNotification/composer.json | 2 +- app/code/Magento/Authorization/composer.json | 2 +- app/code/Magento/Backend/composer.json | 2 +- app/code/Magento/Backup/composer.json | 2 +- app/code/Magento/Bundle/composer.json | 2 +- app/code/Magento/Captcha/composer.json | 2 +- app/code/Magento/Catalog/composer.json | 2 +- app/code/Magento/CatalogImportExport/composer.json | 2 +- app/code/Magento/CatalogInventory/composer.json | 2 +- app/code/Magento/CatalogRule/composer.json | 2 +- app/code/Magento/CatalogSearch/composer.json | 2 +- app/code/Magento/CatalogUrlRewrite/composer.json | 2 +- app/code/Magento/CatalogWidget/composer.json | 2 +- app/code/Magento/Centinel/composer.json | 2 +- app/code/Magento/Checkout/composer.json | 2 +- app/code/Magento/CheckoutAgreements/composer.json | 2 +- app/code/Magento/Cms/composer.json | 2 +- app/code/Magento/CmsUrlRewrite/composer.json | 2 +- app/code/Magento/ConfigurableImportExport/composer.json | 2 +- app/code/Magento/ConfigurableProduct/composer.json | 2 +- app/code/Magento/Contact/composer.json | 2 +- app/code/Magento/Core/composer.json | 2 +- app/code/Magento/Cron/composer.json | 2 +- app/code/Magento/CurrencySymbol/composer.json | 2 +- app/code/Magento/Customer/composer.json | 2 +- app/code/Magento/CustomerImportExport/composer.json | 2 +- app/code/Magento/DesignEditor/composer.json | 2 +- app/code/Magento/Dhl/composer.json | 2 +- app/code/Magento/Directory/composer.json | 2 +- app/code/Magento/Downloadable/composer.json | 2 +- app/code/Magento/Eav/composer.json | 2 +- app/code/Magento/Email/composer.json | 2 +- app/code/Magento/Fedex/composer.json | 2 +- app/code/Magento/GiftMessage/composer.json | 2 +- app/code/Magento/GoogleAdwords/composer.json | 2 +- app/code/Magento/GoogleAnalytics/composer.json | 2 +- app/code/Magento/GoogleOptimizer/composer.json | 2 +- app/code/Magento/GoogleShopping/composer.json | 2 +- app/code/Magento/GroupedImportExport/composer.json | 2 +- app/code/Magento/GroupedProduct/composer.json | 2 +- app/code/Magento/ImportExport/composer.json | 2 +- app/code/Magento/Indexer/composer.json | 2 +- app/code/Magento/Integration/composer.json | 2 +- app/code/Magento/LayeredNavigation/composer.json | 2 +- app/code/Magento/Log/composer.json | 2 +- app/code/Magento/Msrp/composer.json | 2 +- app/code/Magento/Multishipping/composer.json | 2 +- app/code/Magento/Newsletter/composer.json | 2 +- app/code/Magento/OfflinePayments/composer.json | 2 +- app/code/Magento/OfflineShipping/composer.json | 2 +- app/code/Magento/PageCache/composer.json | 2 +- app/code/Magento/Payment/composer.json | 2 +- app/code/Magento/Persistent/composer.json | 2 +- app/code/Magento/ProductAlert/composer.json | 2 +- app/code/Magento/Reports/composer.json | 2 +- app/code/Magento/RequireJs/composer.json | 2 +- app/code/Magento/Review/composer.json | 2 +- app/code/Magento/Rss/composer.json | 2 +- app/code/Magento/Rule/composer.json | 2 +- app/code/Magento/Sales/composer.json | 2 +- app/code/Magento/SalesRule/composer.json | 2 +- app/code/Magento/Search/composer.json | 2 +- app/code/Magento/Sendfriend/composer.json | 2 +- app/code/Magento/Shipping/composer.json | 2 +- app/code/Magento/Sitemap/composer.json | 2 +- app/code/Magento/Store/composer.json | 2 +- app/code/Magento/Tax/composer.json | 2 +- app/code/Magento/TaxImportExport/composer.json | 2 +- app/code/Magento/Theme/composer.json | 2 +- app/code/Magento/Translation/composer.json | 2 +- app/code/Magento/Ui/composer.json | 2 +- app/code/Magento/Ups/composer.json | 2 +- app/code/Magento/UrlRewrite/composer.json | 2 +- app/code/Magento/User/composer.json | 2 +- app/code/Magento/Usps/composer.json | 2 +- app/code/Magento/Webapi/composer.json | 2 +- app/code/Magento/Weee/composer.json | 2 +- app/code/Magento/Widget/composer.json | 2 +- app/code/Magento/Wishlist/composer.json | 2 +- app/design/adminhtml/Magento/backend/composer.json | 2 +- app/design/frontend/Magento/blank/composer.json | 2 +- app/design/frontend/Magento/luma/composer.json | 2 +- composer.json | 2 +- .../Magento/Test/Tools/Dependency/_files/composer1.json | 2 +- .../Magento/Test/Tools/Dependency/_files/composer2.json | 2 +- .../Magento/Test/Tools/Dependency/_files/composer3.json | 2 +- .../Magento/Test/Tools/Dependency/_files/composer4.json | 2 +- .../Magento/Test/Tools/Dependency/_files/composer5.json | 2 +- .../Widget/_files/design/adminhtml/magento_basic/composer.json | 2 +- .../Core/Model/_files/frontend/magento_iphone/composer.json | 2 +- lib/internal/Magento/Framework/composer.json | 2 +- 91 files changed, 91 insertions(+), 91 deletions(-) diff --git a/app/code/Magento/AdminNotification/composer.json b/app/code/Magento/AdminNotification/composer.json index c535ad1fe7846..226fcdcc4f4cc 100644 --- a/app/code/Magento/AdminNotification/composer.json +++ b/app/code/Magento/AdminNotification/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-admin-notification", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", "magento/module-backend": "0.42.0-beta2", diff --git a/app/code/Magento/Authorization/composer.json b/app/code/Magento/Authorization/composer.json index 531bda8586eb3..c57613556f014 100644 --- a/app/code/Magento/Authorization/composer.json +++ b/app/code/Magento/Authorization/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-authorization", "description": "Authorization module provides access to Magento ACL functionality.", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-backend": "0.42.0-beta2", "magento/framework": "0.42.0-beta2", "magento/magento-composer-installer": "*" diff --git a/app/code/Magento/Backend/composer.json b/app/code/Magento/Backend/composer.json index aeec76291c95b..a6385383c0b2a 100644 --- a/app/code/Magento/Backend/composer.json +++ b/app/code/Magento/Backend/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-backend", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-directory": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", diff --git a/app/code/Magento/Backup/composer.json b/app/code/Magento/Backup/composer.json index 607d773f9484f..f4670b46b9ced 100644 --- a/app/code/Magento/Backup/composer.json +++ b/app/code/Magento/Backup/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-backup", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", "magento/module-backend": "0.42.0-beta2", diff --git a/app/code/Magento/Bundle/composer.json b/app/code/Magento/Bundle/composer.json index 361d5902c7b7e..3dd36aa3fd1a0 100644 --- a/app/code/Magento/Bundle/composer.json +++ b/app/code/Magento/Bundle/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-bundle", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-catalog": "0.42.0-beta2", "magento/module-tax": "0.42.0-beta2", diff --git a/app/code/Magento/Captcha/composer.json b/app/code/Magento/Captcha/composer.json index a8d6ee4d23b55..210b3aa58a43a 100644 --- a/app/code/Magento/Captcha/composer.json +++ b/app/code/Magento/Captcha/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-captcha", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-customer": "0.42.0-beta2", "magento/module-checkout": "0.42.0-beta2", diff --git a/app/code/Magento/Catalog/composer.json b/app/code/Magento/Catalog/composer.json index fe448355f37bf..a339555ca70d8 100644 --- a/app/code/Magento/Catalog/composer.json +++ b/app/code/Magento/Catalog/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-catalog", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-eav": "0.42.0-beta2", "magento/module-cms": "0.42.0-beta2", diff --git a/app/code/Magento/CatalogImportExport/composer.json b/app/code/Magento/CatalogImportExport/composer.json index 0c8868a542cf7..477a320561f04 100644 --- a/app/code/Magento/CatalogImportExport/composer.json +++ b/app/code/Magento/CatalogImportExport/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-catalog-import-export", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-core": "0.42.0-beta2", "magento/module-catalog": "0.42.0-beta2", "magento/module-eav": "0.42.0-beta2", diff --git a/app/code/Magento/CatalogInventory/composer.json b/app/code/Magento/CatalogInventory/composer.json index adcd06788b10b..1913f562d776c 100644 --- a/app/code/Magento/CatalogInventory/composer.json +++ b/app/code/Magento/CatalogInventory/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-catalog-inventory", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-catalog": "0.42.0-beta2", "magento/module-customer": "0.42.0-beta2", diff --git a/app/code/Magento/CatalogRule/composer.json b/app/code/Magento/CatalogRule/composer.json index 8f0d6f3203c38..ff8a250510e08 100644 --- a/app/code/Magento/CatalogRule/composer.json +++ b/app/code/Magento/CatalogRule/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-catalog-rule", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-rule": "0.42.0-beta2", "magento/module-catalog": "0.42.0-beta2", diff --git a/app/code/Magento/CatalogSearch/composer.json b/app/code/Magento/CatalogSearch/composer.json index cfc250a47f094..6419337ababfb 100644 --- a/app/code/Magento/CatalogSearch/composer.json +++ b/app/code/Magento/CatalogSearch/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-catalog-search", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-catalog": "0.42.0-beta2", "magento/module-search": "0.42.0-beta2", diff --git a/app/code/Magento/CatalogUrlRewrite/composer.json b/app/code/Magento/CatalogUrlRewrite/composer.json index 14b53cbabdb0e..27b5845864ce5 100644 --- a/app/code/Magento/CatalogUrlRewrite/composer.json +++ b/app/code/Magento/CatalogUrlRewrite/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-catalog-url-rewrite", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-backend": "0.42.0-beta2", "magento/module-catalog": "0.42.0-beta2", "magento/module-catalog-import-export": "0.42.0-beta2", diff --git a/app/code/Magento/CatalogWidget/composer.json b/app/code/Magento/CatalogWidget/composer.json index 9d078bb6a55ae..9bb9aee4686c6 100644 --- a/app/code/Magento/CatalogWidget/composer.json +++ b/app/code/Magento/CatalogWidget/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-catalog-widget", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-catalog": "0.42.0-beta2", "magento/module-widget": "0.42.0-beta2", "magento/module-backend": "0.42.0-beta2", diff --git a/app/code/Magento/Centinel/composer.json b/app/code/Magento/Centinel/composer.json index 88add92445e43..a7a2e9865c1c3 100644 --- a/app/code/Magento/Centinel/composer.json +++ b/app/code/Magento/Centinel/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-centinel", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-checkout": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", diff --git a/app/code/Magento/Checkout/composer.json b/app/code/Magento/Checkout/composer.json index bfb7b17b422f2..952b58a5543bb 100644 --- a/app/code/Magento/Checkout/composer.json +++ b/app/code/Magento/Checkout/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-checkout", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-sales": "0.42.0-beta2", "magento/module-authorization": "0.42.0-beta2", diff --git a/app/code/Magento/CheckoutAgreements/composer.json b/app/code/Magento/CheckoutAgreements/composer.json index 8463f4a91f454..b556f6753320a 100644 --- a/app/code/Magento/CheckoutAgreements/composer.json +++ b/app/code/Magento/CheckoutAgreements/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-checkout-agreements", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-checkout": "0.42.0-beta2", "magento/module-store": "0.42.0-beta2", "magento/module-backend": "0.42.0-beta2", diff --git a/app/code/Magento/Cms/composer.json b/app/code/Magento/Cms/composer.json index a21c486469f6c..448106a625460 100644 --- a/app/code/Magento/Cms/composer.json +++ b/app/code/Magento/Cms/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-cms", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", "magento/module-theme": "0.42.0-beta2", diff --git a/app/code/Magento/CmsUrlRewrite/composer.json b/app/code/Magento/CmsUrlRewrite/composer.json index 32a478b3fba14..42dd0565d0487 100644 --- a/app/code/Magento/CmsUrlRewrite/composer.json +++ b/app/code/Magento/CmsUrlRewrite/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-cms-url-rewrite", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-cms": "0.42.0-beta2", "magento/module-store": "0.42.0-beta2", "magento/module-url-rewrite": "0.42.0-beta2", diff --git a/app/code/Magento/ConfigurableImportExport/composer.json b/app/code/Magento/ConfigurableImportExport/composer.json index de3e60c4f3cab..b653bd1cf74fd 100644 --- a/app/code/Magento/ConfigurableImportExport/composer.json +++ b/app/code/Magento/ConfigurableImportExport/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-configurable-import-export", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-catalog": "0.42.0-beta2", "magento/module-catalog-import-export": "0.42.0-beta2", "magento/module-eav": "0.42.0-beta2", diff --git a/app/code/Magento/ConfigurableProduct/composer.json b/app/code/Magento/ConfigurableProduct/composer.json index faa5a31fdf94b..a8c626716323b 100644 --- a/app/code/Magento/ConfigurableProduct/composer.json +++ b/app/code/Magento/ConfigurableProduct/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-configurable-product", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-catalog": "0.42.0-beta2", "magento/module-catalog-inventory": "0.42.0-beta2", diff --git a/app/code/Magento/Contact/composer.json b/app/code/Magento/Contact/composer.json index 21e57df75ebc4..73bce7725f63e 100644 --- a/app/code/Magento/Contact/composer.json +++ b/app/code/Magento/Contact/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-contact", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-customer": "0.42.0-beta2", "magento/module-backend": "0.42.0-beta2", diff --git a/app/code/Magento/Core/composer.json b/app/code/Magento/Core/composer.json index d0f462f935cfe..f80fbad291446 100644 --- a/app/code/Magento/Core/composer.json +++ b/app/code/Magento/Core/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-core", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-backend": "0.42.0-beta2", "magento/module-cron": "0.42.0-beta2", diff --git a/app/code/Magento/Cron/composer.json b/app/code/Magento/Cron/composer.json index 26a0c49e2bcb1..2bd08194d7125 100644 --- a/app/code/Magento/Cron/composer.json +++ b/app/code/Magento/Cron/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-cron", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-backend": "0.42.0-beta2", "magento/framework": "0.42.0-beta2", diff --git a/app/code/Magento/CurrencySymbol/composer.json b/app/code/Magento/CurrencySymbol/composer.json index e81038fe6a9bb..943178f2ffb67 100644 --- a/app/code/Magento/CurrencySymbol/composer.json +++ b/app/code/Magento/CurrencySymbol/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-currency-symbol", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-page-cache": "0.42.0-beta2", "magento/module-directory": "0.42.0-beta2", diff --git a/app/code/Magento/Customer/composer.json b/app/code/Magento/Customer/composer.json index b43bee3bd5227..46b521c0e412c 100644 --- a/app/code/Magento/Customer/composer.json +++ b/app/code/Magento/Customer/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-customer", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-eav": "0.42.0-beta2", "magento/module-directory": "0.42.0-beta2", diff --git a/app/code/Magento/CustomerImportExport/composer.json b/app/code/Magento/CustomerImportExport/composer.json index eb6cfecd3b82b..723bd7ad3dd1f 100644 --- a/app/code/Magento/CustomerImportExport/composer.json +++ b/app/code/Magento/CustomerImportExport/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-customer-import-export", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-backend": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", "magento/module-customer": "0.42.0-beta2", diff --git a/app/code/Magento/DesignEditor/composer.json b/app/code/Magento/DesignEditor/composer.json index badd482f1f9a7..9da28cf7e2e90 100644 --- a/app/code/Magento/DesignEditor/composer.json +++ b/app/code/Magento/DesignEditor/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-design-editor", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-theme": "0.42.0-beta2", "magento/module-backend": "0.42.0-beta2", diff --git a/app/code/Magento/Dhl/composer.json b/app/code/Magento/Dhl/composer.json index 6a5e7b77d1333..54658c388b384 100644 --- a/app/code/Magento/Dhl/composer.json +++ b/app/code/Magento/Dhl/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-dhl", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-shipping": "0.42.0-beta2", "magento/module-backend": "0.42.0-beta2", diff --git a/app/code/Magento/Directory/composer.json b/app/code/Magento/Directory/composer.json index ffabf1f65c02d..b32bd6ed430b7 100644 --- a/app/code/Magento/Directory/composer.json +++ b/app/code/Magento/Directory/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-directory", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", "magento/module-backend": "0.42.0-beta2", diff --git a/app/code/Magento/Downloadable/composer.json b/app/code/Magento/Downloadable/composer.json index 099aada617682..2aaf4af8db162 100644 --- a/app/code/Magento/Downloadable/composer.json +++ b/app/code/Magento/Downloadable/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-downloadable", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-catalog": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", diff --git a/app/code/Magento/Eav/composer.json b/app/code/Magento/Eav/composer.json index 401bb5a2f2a4f..1424bfd69c9d3 100644 --- a/app/code/Magento/Eav/composer.json +++ b/app/code/Magento/Eav/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-eav", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", "magento/module-backend": "0.42.0-beta2", diff --git a/app/code/Magento/Email/composer.json b/app/code/Magento/Email/composer.json index 5cfba4a520a15..de9fad2242f91 100644 --- a/app/code/Magento/Email/composer.json +++ b/app/code/Magento/Email/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-email", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", "magento/module-cms": "0.42.0-beta2", diff --git a/app/code/Magento/Fedex/composer.json b/app/code/Magento/Fedex/composer.json index c986bb2eaa583..20c8b98b6ea0a 100644 --- a/app/code/Magento/Fedex/composer.json +++ b/app/code/Magento/Fedex/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-fedex", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-shipping": "0.42.0-beta2", "magento/module-directory": "0.42.0-beta2", diff --git a/app/code/Magento/GiftMessage/composer.json b/app/code/Magento/GiftMessage/composer.json index 49c57a5c0af71..55637f8036bd9 100644 --- a/app/code/Magento/GiftMessage/composer.json +++ b/app/code/Magento/GiftMessage/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-gift-message", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-catalog": "0.42.0-beta2", "magento/module-checkout": "0.42.0-beta2", diff --git a/app/code/Magento/GoogleAdwords/composer.json b/app/code/Magento/GoogleAdwords/composer.json index 788dcfae1dde7..0cf10cead21fe 100644 --- a/app/code/Magento/GoogleAdwords/composer.json +++ b/app/code/Magento/GoogleAdwords/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-google-adwords", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-sales": "0.42.0-beta2", "magento/framework": "0.42.0-beta2", diff --git a/app/code/Magento/GoogleAnalytics/composer.json b/app/code/Magento/GoogleAnalytics/composer.json index 6970e094a645e..6c526d7db5f16 100644 --- a/app/code/Magento/GoogleAnalytics/composer.json +++ b/app/code/Magento/GoogleAnalytics/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-google-analytics", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-sales": "0.42.0-beta2", "magento/framework": "0.42.0-beta2", diff --git a/app/code/Magento/GoogleOptimizer/composer.json b/app/code/Magento/GoogleOptimizer/composer.json index bf78f67b5539d..65a2cafa86256 100644 --- a/app/code/Magento/GoogleOptimizer/composer.json +++ b/app/code/Magento/GoogleOptimizer/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-google-optimizer", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-google-analytics": "0.42.0-beta2", "magento/module-catalog": "0.42.0-beta2", diff --git a/app/code/Magento/GoogleShopping/composer.json b/app/code/Magento/GoogleShopping/composer.json index e495e5483c9d1..42a98d50dac2a 100644 --- a/app/code/Magento/GoogleShopping/composer.json +++ b/app/code/Magento/GoogleShopping/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-google-shopping", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", "magento/module-backend": "0.42.0-beta2", diff --git a/app/code/Magento/GroupedImportExport/composer.json b/app/code/Magento/GroupedImportExport/composer.json index aaecfb8a7ef46..5359c2e40852b 100644 --- a/app/code/Magento/GroupedImportExport/composer.json +++ b/app/code/Magento/GroupedImportExport/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-grouped-import-export", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-catalog": "0.42.0-beta2", "magento/module-import-export": "0.42.0-beta2", "magento/module-catalog-import-export": "0.42.0-beta2", diff --git a/app/code/Magento/GroupedProduct/composer.json b/app/code/Magento/GroupedProduct/composer.json index ed6dc4ddd57ef..b561a85f6c937 100644 --- a/app/code/Magento/GroupedProduct/composer.json +++ b/app/code/Magento/GroupedProduct/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-grouped-product", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-catalog": "0.42.0-beta2", "magento/module-catalog-inventory": "0.42.0-beta2", diff --git a/app/code/Magento/ImportExport/composer.json b/app/code/Magento/ImportExport/composer.json index 0333fadc33c60..1b8e6a7b0ecf1 100644 --- a/app/code/Magento/ImportExport/composer.json +++ b/app/code/Magento/ImportExport/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-import-export", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", "magento/module-backend": "0.42.0-beta2", diff --git a/app/code/Magento/Indexer/composer.json b/app/code/Magento/Indexer/composer.json index 1a2e3bcba0755..5e3bb6e770a29 100644 --- a/app/code/Magento/Indexer/composer.json +++ b/app/code/Magento/Indexer/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-indexer", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-backend": "0.42.0-beta2", "magento/module-page-cache": "0.42.0-beta2", "magento/framework": "0.42.0-beta2", diff --git a/app/code/Magento/Integration/composer.json b/app/code/Magento/Integration/composer.json index d30a365c4c991..137b4a9ec0f77 100644 --- a/app/code/Magento/Integration/composer.json +++ b/app/code/Magento/Integration/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-integration", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", "magento/module-backend": "0.42.0-beta2", diff --git a/app/code/Magento/LayeredNavigation/composer.json b/app/code/Magento/LayeredNavigation/composer.json index aadf43d71c1d2..c10e066ff7f41 100644 --- a/app/code/Magento/LayeredNavigation/composer.json +++ b/app/code/Magento/LayeredNavigation/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-layered-navigation", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-catalog": "0.42.0-beta2", "magento/module-backend": "0.42.0-beta2", "magento/framework": "0.42.0-beta2", diff --git a/app/code/Magento/Log/composer.json b/app/code/Magento/Log/composer.json index 9f97050e77e98..ff4c94dc8b7eb 100644 --- a/app/code/Magento/Log/composer.json +++ b/app/code/Magento/Log/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-log", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", "magento/module-customer": "0.42.0-beta2", diff --git a/app/code/Magento/Msrp/composer.json b/app/code/Magento/Msrp/composer.json index 4644a21f2c486..8dee927a58200 100644 --- a/app/code/Magento/Msrp/composer.json +++ b/app/code/Magento/Msrp/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-msrp", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-bundle": "0.42.0-beta2", "magento/module-catalog": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", diff --git a/app/code/Magento/Multishipping/composer.json b/app/code/Magento/Multishipping/composer.json index 4b6f7bd24aca0..9a5bcae1c1f72 100644 --- a/app/code/Magento/Multishipping/composer.json +++ b/app/code/Magento/Multishipping/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-multishipping", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", "magento/module-checkout": "0.42.0-beta2", diff --git a/app/code/Magento/Newsletter/composer.json b/app/code/Magento/Newsletter/composer.json index 8e8c5ea8d79ba..ea4feace2fb9e 100644 --- a/app/code/Magento/Newsletter/composer.json +++ b/app/code/Magento/Newsletter/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-newsletter", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", "magento/module-customer": "0.42.0-beta2", diff --git a/app/code/Magento/OfflinePayments/composer.json b/app/code/Magento/OfflinePayments/composer.json index 3e14de61e13f8..ea087cab96f2a 100644 --- a/app/code/Magento/OfflinePayments/composer.json +++ b/app/code/Magento/OfflinePayments/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-offline-payments", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-payment": "0.42.0-beta2", "magento/framework": "0.42.0-beta2", "magento/magento-composer-installer": "*" diff --git a/app/code/Magento/OfflineShipping/composer.json b/app/code/Magento/OfflineShipping/composer.json index 013eee21a918d..5af2a94f7746f 100644 --- a/app/code/Magento/OfflineShipping/composer.json +++ b/app/code/Magento/OfflineShipping/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-offline-shipping", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-backend": "0.42.0-beta2", "magento/module-shipping": "0.42.0-beta2", diff --git a/app/code/Magento/PageCache/composer.json b/app/code/Magento/PageCache/composer.json index 1fa0f7dbb2486..add78ab7eb4b4 100644 --- a/app/code/Magento/PageCache/composer.json +++ b/app/code/Magento/PageCache/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-page-cache", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-backend": "0.42.0-beta2", "magento/framework": "0.42.0-beta2", diff --git a/app/code/Magento/Payment/composer.json b/app/code/Magento/Payment/composer.json index bda90a3cbc12e..5cb066b85ac21 100644 --- a/app/code/Magento/Payment/composer.json +++ b/app/code/Magento/Payment/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-payment", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", "magento/module-sales": "0.42.0-beta2", diff --git a/app/code/Magento/Persistent/composer.json b/app/code/Magento/Persistent/composer.json index e9dfbcdca9f43..8f6e755b02418 100644 --- a/app/code/Magento/Persistent/composer.json +++ b/app/code/Magento/Persistent/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-persistent", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-checkout": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", diff --git a/app/code/Magento/ProductAlert/composer.json b/app/code/Magento/ProductAlert/composer.json index ce27de2532c3e..5a79a3241b9bc 100644 --- a/app/code/Magento/ProductAlert/composer.json +++ b/app/code/Magento/ProductAlert/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-product-alert", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-catalog": "0.42.0-beta2", "magento/module-customer": "0.42.0-beta2", diff --git a/app/code/Magento/Reports/composer.json b/app/code/Magento/Reports/composer.json index 1784a532b0e7c..212b61ec13e9b 100644 --- a/app/code/Magento/Reports/composer.json +++ b/app/code/Magento/Reports/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-reports", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-eav": "0.42.0-beta2", "magento/module-customer": "0.42.0-beta2", diff --git a/app/code/Magento/RequireJs/composer.json b/app/code/Magento/RequireJs/composer.json index 7b1ca1f8af0d8..81c777f89b8a3 100644 --- a/app/code/Magento/RequireJs/composer.json +++ b/app/code/Magento/RequireJs/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-require-js", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/framework": "0.42.0-beta2", "magento/magento-composer-installer": "*" }, diff --git a/app/code/Magento/Review/composer.json b/app/code/Magento/Review/composer.json index c0aba7261db0a..cf132b880d540 100644 --- a/app/code/Magento/Review/composer.json +++ b/app/code/Magento/Review/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-review", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-catalog": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", diff --git a/app/code/Magento/Rss/composer.json b/app/code/Magento/Rss/composer.json index 55830ff619d63..7689827c4d129 100644 --- a/app/code/Magento/Rss/composer.json +++ b/app/code/Magento/Rss/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-rss", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-backend": "0.42.0-beta2", "magento/framework": "0.42.0-beta2", diff --git a/app/code/Magento/Rule/composer.json b/app/code/Magento/Rule/composer.json index cabe83db1fee9..75c666cbdddf5 100644 --- a/app/code/Magento/Rule/composer.json +++ b/app/code/Magento/Rule/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-rule", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-eav": "0.42.0-beta2", "magento/module-catalog": "0.42.0-beta2", diff --git a/app/code/Magento/Sales/composer.json b/app/code/Magento/Sales/composer.json index 5220cd715a079..5d54dd97fa69a 100644 --- a/app/code/Magento/Sales/composer.json +++ b/app/code/Magento/Sales/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-sales", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-catalog": "0.42.0-beta2", "magento/module-customer": "0.42.0-beta2", diff --git a/app/code/Magento/SalesRule/composer.json b/app/code/Magento/SalesRule/composer.json index 5017f8928d7bc..83db72961867b 100644 --- a/app/code/Magento/SalesRule/composer.json +++ b/app/code/Magento/SalesRule/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-sales-rule", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-rule": "0.42.0-beta2", "magento/module-catalog": "0.42.0-beta2", diff --git a/app/code/Magento/Search/composer.json b/app/code/Magento/Search/composer.json index 5043405ad17cf..9e0361285b65c 100644 --- a/app/code/Magento/Search/composer.json +++ b/app/code/Magento/Search/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-search", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/framework": "0.42.0-beta2", "magento/module-backend": "0.42.0-beta2", "magento/module-store": "0.42.0-beta2", diff --git a/app/code/Magento/Sendfriend/composer.json b/app/code/Magento/Sendfriend/composer.json index b9fc79a750c35..6c683ec12f030 100644 --- a/app/code/Magento/Sendfriend/composer.json +++ b/app/code/Magento/Sendfriend/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-sendfriend", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-catalog": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", diff --git a/app/code/Magento/Shipping/composer.json b/app/code/Magento/Shipping/composer.json index 36a2294310b4d..d25b1b11c3eaa 100644 --- a/app/code/Magento/Shipping/composer.json +++ b/app/code/Magento/Shipping/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-shipping", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", "magento/module-catalog": "0.42.0-beta2", diff --git a/app/code/Magento/Sitemap/composer.json b/app/code/Magento/Sitemap/composer.json index 6394181c86c42..5724b659a5d39 100644 --- a/app/code/Magento/Sitemap/composer.json +++ b/app/code/Magento/Sitemap/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-sitemap", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-catalog": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", diff --git a/app/code/Magento/Store/composer.json b/app/code/Magento/Store/composer.json index 4ea7b85cd29a9..bdbb6454aeb44 100644 --- a/app/code/Magento/Store/composer.json +++ b/app/code/Magento/Store/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-store", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-core": "0.42.0-beta2", "magento/module-directory": "0.42.0-beta2", "magento/module-ui": "0.42.0-beta2", diff --git a/app/code/Magento/Tax/composer.json b/app/code/Magento/Tax/composer.json index 47a035e7a77e8..a191202b106cf 100644 --- a/app/code/Magento/Tax/composer.json +++ b/app/code/Magento/Tax/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-tax", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-catalog": "0.42.0-beta2", "magento/module-customer": "0.42.0-beta2", diff --git a/app/code/Magento/TaxImportExport/composer.json b/app/code/Magento/TaxImportExport/composer.json index e3af939b3c2cc..ddd37363dcc79 100644 --- a/app/code/Magento/TaxImportExport/composer.json +++ b/app/code/Magento/TaxImportExport/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-tax-import-export", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-tax": "0.42.0-beta2", "magento/module-backend": "0.42.0-beta2", "magento/module-directory": "0.42.0-beta2", diff --git a/app/code/Magento/Theme/composer.json b/app/code/Magento/Theme/composer.json index 1f40aae7fd2fa..83382efba9ece 100644 --- a/app/code/Magento/Theme/composer.json +++ b/app/code/Magento/Theme/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-theme", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", "magento/module-customer": "0.42.0-beta2", diff --git a/app/code/Magento/Translation/composer.json b/app/code/Magento/Translation/composer.json index 58011a9b5fc14..09f99127a6797 100644 --- a/app/code/Magento/Translation/composer.json +++ b/app/code/Magento/Translation/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-translation", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-core": "0.42.0-beta2", "magento/module-store": "0.42.0-beta2", "magento/module-backend": "0.42.0-beta2", diff --git a/app/code/Magento/Ui/composer.json b/app/code/Magento/Ui/composer.json index a718cf1994aa1..0c4b4d39acc17 100644 --- a/app/code/Magento/Ui/composer.json +++ b/app/code/Magento/Ui/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-ui", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-backend": "0.42.0-beta2", "magento/module-store": "0.42.0-beta2", "magento/framework": "0.42.0-beta2", diff --git a/app/code/Magento/Ups/composer.json b/app/code/Magento/Ups/composer.json index 70e71fd6080eb..6d5cd59b0e5f1 100644 --- a/app/code/Magento/Ups/composer.json +++ b/app/code/Magento/Ups/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-ups", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", "magento/module-backend": "0.42.0-beta2", diff --git a/app/code/Magento/UrlRewrite/composer.json b/app/code/Magento/UrlRewrite/composer.json index 9944ab44a7311..08061d572a0e5 100644 --- a/app/code/Magento/UrlRewrite/composer.json +++ b/app/code/Magento/UrlRewrite/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-url-rewrite", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-catalog": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", "magento/module-store": "0.42.0-beta2", diff --git a/app/code/Magento/User/composer.json b/app/code/Magento/User/composer.json index aecb049734881..724837ef944e1 100644 --- a/app/code/Magento/User/composer.json +++ b/app/code/Magento/User/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-user", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-authorization": "0.42.0-beta2", "magento/module-backend": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", diff --git a/app/code/Magento/Usps/composer.json b/app/code/Magento/Usps/composer.json index 14d5771423781..634a35df11d29 100644 --- a/app/code/Magento/Usps/composer.json +++ b/app/code/Magento/Usps/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-usps", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-shipping": "0.42.0-beta2", "magento/module-directory": "0.42.0-beta2", diff --git a/app/code/Magento/Webapi/composer.json b/app/code/Magento/Webapi/composer.json index 3d520c28732b0..c48b11c132197 100644 --- a/app/code/Magento/Webapi/composer.json +++ b/app/code/Magento/Webapi/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-webapi", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-authorization": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", diff --git a/app/code/Magento/Weee/composer.json b/app/code/Magento/Weee/composer.json index acee54fa4cca8..e336e1b1e2f7b 100644 --- a/app/code/Magento/Weee/composer.json +++ b/app/code/Magento/Weee/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-weee", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-catalog": "0.42.0-beta2", "magento/module-tax": "0.42.0-beta2", diff --git a/app/code/Magento/Widget/composer.json b/app/code/Magento/Widget/composer.json index 29a3df7341354..cebd2066c8330 100644 --- a/app/code/Magento/Widget/composer.json +++ b/app/code/Magento/Widget/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-widget", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-cms": "0.42.0-beta2", "magento/module-core": "0.42.0-beta2", diff --git a/app/code/Magento/Wishlist/composer.json b/app/code/Magento/Wishlist/composer.json index d72686c8a1e3e..91d03094d7ee1 100644 --- a/app/code/Magento/Wishlist/composer.json +++ b/app/code/Magento/Wishlist/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-wishlist", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta2", "magento/module-customer": "0.42.0-beta2", "magento/module-catalog": "0.42.0-beta2", diff --git a/app/design/adminhtml/Magento/backend/composer.json b/app/design/adminhtml/Magento/backend/composer.json index 25b1fd38c70e0..d1cf354e9ded1 100644 --- a/app/design/adminhtml/Magento/backend/composer.json +++ b/app/design/adminhtml/Magento/backend/composer.json @@ -2,7 +2,7 @@ "name": "magento/theme-adminhtml-backend", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/framework": "0.42.0-beta2", "magento/magento-composer-installer": "*" }, diff --git a/app/design/frontend/Magento/blank/composer.json b/app/design/frontend/Magento/blank/composer.json index ddfe84f6f985e..2bf7be122bb65 100644 --- a/app/design/frontend/Magento/blank/composer.json +++ b/app/design/frontend/Magento/blank/composer.json @@ -2,7 +2,7 @@ "name": "magento/theme-frontend-blank", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/framework": "0.42.0-beta2", "magento/magento-composer-installer": "*" }, diff --git a/app/design/frontend/Magento/luma/composer.json b/app/design/frontend/Magento/luma/composer.json index f4ae793c2219c..2339f39769b6b 100644 --- a/app/design/frontend/Magento/luma/composer.json +++ b/app/design/frontend/Magento/luma/composer.json @@ -2,7 +2,7 @@ "name": "magento/theme-frontend-luma", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/theme-frontend-blank": "0.42.0-beta2", "magento/framework": "0.42.0-beta2", "magento/magento-composer-installer": "*" diff --git a/composer.json b/composer.json index 8668bc7f26695..7d8ad9dd964c8 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,7 @@ "AFL-3.0" ], "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "zendframework/zend-stdlib": "2.3.1", "zendframework/zend-code": "2.3.1", "zendframework/zend-server": "2.3.1", diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer1.json b/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer1.json index ba3e319204ac8..4fe637e35fcd3 100644 --- a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer1.json +++ b/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer1.json @@ -2,7 +2,7 @@ "name": "magento/module-module1", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-core": "0.1.0-alpha103", "magento/module-module2": "0.1.0-alpha103" }, diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer2.json b/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer2.json index 3b45c34a4994f..a7b58c71e34c7 100644 --- a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer2.json +++ b/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer2.json @@ -2,7 +2,7 @@ "name": "magento/module-module2", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-core": "0.1.0-alpha103", "magento/module-module3": "0.1.0-alpha103" }, diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer3.json b/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer3.json index 9501dd68bb121..4619c88460d9b 100644 --- a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer3.json +++ b/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer3.json @@ -2,7 +2,7 @@ "name": "magento/module-module1", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0" + "php": "~5.4.11|~5.5.0|~5.6.0" }, "type": "magento2-module", "version": "0.1.0-alpha103" diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer4.json b/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer4.json index 723f4f9e6cdf5..441ed7e5af1aa 100644 --- a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer4.json +++ b/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer4.json @@ -2,7 +2,7 @@ "name": "magento/module-module1", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-core": "0.1.0-alpha103", "magento/module-module2": "0.1.0-alpha103" }, diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer5.json b/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer5.json index 8df20906f117c..a630787a56681 100644 --- a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer5.json +++ b/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer5.json @@ -2,7 +2,7 @@ "name": "magento/module-module2", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-core": "0.1.0-alpha103", "magento/module-module1": "0.1.0-alpha103" }, diff --git a/dev/tests/integration/testsuite/Magento/Widget/_files/design/adminhtml/magento_basic/composer.json b/dev/tests/integration/testsuite/Magento/Widget/_files/design/adminhtml/magento_basic/composer.json index 16bcf44b85c2c..4a5c0d27cd304 100644 --- a/dev/tests/integration/testsuite/Magento/Widget/_files/design/adminhtml/magento_basic/composer.json +++ b/dev/tests/integration/testsuite/Magento/Widget/_files/design/adminhtml/magento_basic/composer.json @@ -2,7 +2,7 @@ "name": "magento/admin-Magento_Catalog", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/framework": "0.1.0-alpha103", "magento/magento-composer-installer": "*" }, diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/_files/frontend/magento_iphone/composer.json b/dev/tests/unit/testsuite/Magento/Core/Model/_files/frontend/magento_iphone/composer.json index fa9ae3e082f96..1d60a88e8431e 100644 --- a/dev/tests/unit/testsuite/Magento/Core/Model/_files/frontend/magento_iphone/composer.json +++ b/dev/tests/unit/testsuite/Magento/Core/Model/_files/frontend/magento_iphone/composer.json @@ -2,7 +2,7 @@ "name": "magento/frontend-magento_iphone", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/framework": "0.1.0-alpha103", "magento/magento-composer-installer": "*" }, diff --git a/lib/internal/Magento/Framework/composer.json b/lib/internal/Magento/Framework/composer.json index 2d0570bae3b5d..69072d0345dd1 100644 --- a/lib/internal/Magento/Framework/composer.json +++ b/lib/internal/Magento/Framework/composer.json @@ -8,7 +8,7 @@ "AFL-3.0" ], "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "ext-spl": "*", "ext-dom": "*", "ext-simplexml": "*", From 6f490fe4b3736bbffddb32eb37278aff1ccb43b4 Mon Sep 17 00:00:00 2001 From: Safwan Khan Date: Thu, 8 Jan 2015 11:32:43 -0600 Subject: [PATCH 34/44] MAGETWO-32363: Update composer files for PHP 5.6 - Updated composer.lock --- composer.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index 805bbf13580a0..57a8a150f2242 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "27bff88b2a866343d0e0bc06fc52080f", + "hash": "6fa42719525f72454c4c706f02f102cb", "packages": [ { "name": "composer/composer", @@ -3144,7 +3144,7 @@ }, "prefer-stable": false, "platform": { - "php": "~5.4.11|~5.5.0" + "php": "~5.4.11|~5.5.0|~5.6.0" }, "platform-dev": { "lib-libxml": "*", From 5edc6b0916c461d40ee9490be85ad1d360c7b96f Mon Sep 17 00:00:00 2001 From: Safwan Khan Date: Thu, 8 Jan 2015 12:07:44 -0600 Subject: [PATCH 35/44] MAGETWO-32363: Update composer files for PHP 5.6 - Correction on composer.lock --- composer.lock | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index 57a8a150f2242..540794633a976 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "6fa42719525f72454c4c706f02f102cb", + "hash": "d784dd3070bb6f45bc8f1793feecb191", "packages": [ { "name": "composer/composer", @@ -118,7 +118,7 @@ "email": "justin.rainbow@gmail.com" }, { - "name": "Robert Schönthal", + "name": "Robert Schönthal", "email": "robert.schoenthal@gmail.com", "homepage": "http://digitalkaoz.net" } @@ -1621,7 +1621,7 @@ "license": [ "BSD-3-Clause" ], - "description": "a component that aids in manipulating and validating » Uniform Resource Identifiers (URIs)", + "description": "a component that aids in manipulating and validating » Uniform Resource Identifiers (URIs)", "keywords": [ "uri", "zf2" @@ -1863,7 +1863,7 @@ ], "authors": [ { - "name": "Dariusz Rumiński", + "name": "Dariusz RumiÅ„ski", "email": "dariusz.ruminski@gmail.com" }, { @@ -3143,6 +3143,7 @@ "phpmd/phpmd": 0 }, "prefer-stable": false, + "prefer-lowest": false, "platform": { "php": "~5.4.11|~5.5.0|~5.6.0" }, From 074d7a19b6a895a9bceba65e7ee5551f43e36e1f Mon Sep 17 00:00:00 2001 From: Safwan Khan Date: Thu, 8 Jan 2015 15:49:38 -0600 Subject: [PATCH 36/44] MAGETWO-32363: Update composer files for PHP 5.6 - Correction on composer.lock --- composer.lock | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index 540794633a976..49e3d462858c2 100644 --- a/composer.lock +++ b/composer.lock @@ -118,7 +118,7 @@ "email": "justin.rainbow@gmail.com" }, { - "name": "Robert Schönthal", + "name": "Robert Schönthal", "email": "robert.schoenthal@gmail.com", "homepage": "http://digitalkaoz.net" } @@ -1621,7 +1621,7 @@ "license": [ "BSD-3-Clause" ], - "description": "a component that aids in manipulating and validating » Uniform Resource Identifiers (URIs)", + "description": "a component that aids in manipulating and validating » Uniform Resource Identifiers (URIs)", "keywords": [ "uri", "zf2" @@ -1863,7 +1863,7 @@ ], "authors": [ { - "name": "Dariusz RumiÅ„ski", + "name": "Dariusz Rumiński", "email": "dariusz.ruminski@gmail.com" }, { @@ -3143,7 +3143,6 @@ "phpmd/phpmd": 0 }, "prefer-stable": false, - "prefer-lowest": false, "platform": { "php": "~5.4.11|~5.5.0|~5.6.0" }, From 605f6c773eeeff3f879e3590eebb727b3cc09b7c Mon Sep 17 00:00:00 2001 From: Safwan Khan Date: Fri, 9 Jan 2015 11:56:32 -0600 Subject: [PATCH 37/44] MAGETWO-32363: Update composer files for PHP 5.6 - Added configuration for PHP 5.6 in Travis CI --- .travis.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.travis.yml b/.travis.yml index 3b0108dd1abc7..acf548ea4b840 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ language: php php: - 5.4 - 5.5 + - 5.6 env: - TEST_SUITE=unit - TEST_SUITE=integration @@ -14,6 +15,12 @@ matrix: env: TEST_SUITE=static_phpcs - php: 5.4 env: TEST_SUITE=static_annotation + - php: 5.6 + env: TEST_SUITE=static_phpcs + - php: 5.6 + env: TEST_SUITE=static_annotation + allow_failures: + - php: 5.6 before_install: - sudo apt-get update -qq - sudo apt-get install -y -qq postfix From 2204c99a65c988d18d3c33e41e82b897810dc1ea Mon Sep 17 00:00:00 2001 From: Safwan Khan Date: Fri, 9 Jan 2015 13:50:30 -0600 Subject: [PATCH 38/44] MAGETWO-32363: Update composer files for PHP 5.6 - Change based on CR suggestion. --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index acf548ea4b840..75d26bdfa7d10 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,8 +19,6 @@ matrix: env: TEST_SUITE=static_phpcs - php: 5.6 env: TEST_SUITE=static_annotation - allow_failures: - - php: 5.6 before_install: - sudo apt-get update -qq - sudo apt-get install -y -qq postfix From 48ac9d9248a3ccfbd43408c15ee503e9fe73d639 Mon Sep 17 00:00:00 2001 From: Bryant Luk Date: Fri, 9 Jan 2015 10:51:00 -0600 Subject: [PATCH 39/44] MAGETWO-32442: Data object plugin fails when docblock is not found - Make all DataProcessorObject client usages specify the type to serialize --- .../Magento/Checkout/Model/Type/Onepage.php | 4 ++-- .../Customer/Block/Adminhtml/Edit/Form.php | 6 ++++- .../Block/Adminhtml/Edit/Tab/Account.php | 6 ++++- .../Controller/Adminhtml/Index/Validate.php | 6 ++++- .../Customer/Model/AccountManagement.php | 2 +- .../Magento/Customer/Model/Address/Mapper.php | 2 +- .../Customer/Model/Customer/Mapper.php | 2 +- .../Model/Resource/CustomerRepository.php | 4 +++- .../Resource/Group/Grid/ServiceCollection.php | 2 +- .../Adminhtml/Order/Create/Form/Account.php | 2 +- app/code/Magento/Sales/Model/Quote.php | 4 +++- .../Controller/Adminhtml/GroupTest.php | 3 ++- .../Customer/Model/AccountManagementTest.php | 17 +++++++++++--- .../Customer/Model/CustomerMetadataTest.php | 8 +++++-- .../Model/Resource/CustomerRepositoryTest.php | 12 ++++++++-- .../testsuite/Magento/Weee/Model/TaxTest.php | 2 +- .../Block/Adminhtml/Edit/Tab/AccountTest.php | 1 + .../Api/ExtensibleDataObjectConverter.php | 22 ++++++++++++++----- .../Api/SimpleDataObjectConverter.php | 7 ++++-- 19 files changed, 83 insertions(+), 29 deletions(-) diff --git a/app/code/Magento/Checkout/Model/Type/Onepage.php b/app/code/Magento/Checkout/Model/Type/Onepage.php index ea05ce051088d..beac9ba502982 100644 --- a/app/code/Magento/Checkout/Model/Type/Onepage.php +++ b/app/code/Magento/Checkout/Model/Type/Onepage.php @@ -529,7 +529,7 @@ protected function _validateCustomerData(array $data) $quote = $this->getQuote(); $isCustomerNew = !$quote->getCustomerId(); $customer = $quote->getCustomer(); - $customerData = $this->extensibleDataObjectConverter->toFlatArray($customer); + $customerData = $this->extensibleDataObjectConverter->toFlatArray($customer, [], '\Magento\Customer\Api\Data\CustomerInterface'); /** @var Form $customerForm */ $customerForm = $this->_formFactory->create( @@ -593,7 +593,7 @@ protected function _validateCustomerData(array $data) $this->_objectCopyService->copyFieldsetToTarget( 'customer_account', 'to_quote', - $this->extensibleDataObjectConverter->toFlatArray($customer), + $this->extensibleDataObjectConverter->toFlatArray($customer, [], '\Magento\Customer\Api\Data\CustomerInterface'), $quote ); diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Form.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Form.php index 8fefa1e92e961..bab73f62213d2 100644 --- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Form.php +++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Form.php @@ -71,7 +71,11 @@ protected function _prepareForm() $form->addField('id', 'hidden', ['name' => 'customer_id']); $customer = $this->_customerRepository->getById($customerId); $form->setValues( - $this->_extensibleDataObjectConverter->toFlatArray($customer) + $this->_extensibleDataObjectConverter->toFlatArray( + $customer, + [], + '\Magento\Customer\Api\Data\CustomerInterface' + ) )->addValues( ['customer_id' => $customerId] ); diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Account.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Account.php index 5763f818dc0c2..7b5d60df23065 100644 --- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Account.php +++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Account.php @@ -171,7 +171,11 @@ protected function _customizeFieldset($fieldset) ); $form->getElement('website_id')->setRenderer($renderer); - $accountData = $this->_extensibleDataObjectConverter->toFlatArray($this->_getCustomerDataObject()); + $accountData = $this->_extensibleDataObjectConverter->toFlatArray( + $this->_getCustomerDataObject(), + [], + '\Magento\Customer\Api\Data\CustomerInterface' + ); if ($this->_getCustomerDataObject()->getId()) { $customerFormFields = $this->_addEditCustomerFormFields($fieldset); diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Validate.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Validate.php index cd250d3fa0abf..21f521425101a 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Validate.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Validate.php @@ -28,7 +28,11 @@ protected function _validateCustomer($response) $customerForm = $this->_formFactory->create( 'customer', 'adminhtml_customer', - $this->_extensibleDataObjectConverter->toFlatArray($customer), + $this->_extensibleDataObjectConverter->toFlatArray( + $customer, + [], + '\Magento\Customer\Api\Data\CustomerInterface' + ), true ); $customerForm->setInvisibleIgnored(true); diff --git a/app/code/Magento/Customer/Model/AccountManagement.php b/app/code/Magento/Customer/Model/AccountManagement.php index 4117585521568..4946c7dc46aeb 100644 --- a/app/code/Magento/Customer/Model/AccountManagement.php +++ b/app/code/Magento/Customer/Model/AccountManagement.php @@ -682,7 +682,7 @@ protected function createPasswordHash($password) public function validate(\Magento\Customer\Api\Data\CustomerInterface $customer) { $customerErrors = $this->validator->validateData( - $this->extensibleDataObjectConverter->toFlatArray($customer), + $this->extensibleDataObjectConverter->toFlatArray($customer, [], '\Magento\Customer\Api\Data\CustomerInterface'), [], 'customer' ); diff --git a/app/code/Magento/Customer/Model/Address/Mapper.php b/app/code/Magento/Customer/Model/Address/Mapper.php index 3f3154d05e395..ab15cbd8797c4 100644 --- a/app/code/Magento/Customer/Model/Address/Mapper.php +++ b/app/code/Magento/Customer/Model/Address/Mapper.php @@ -36,7 +36,7 @@ public function __construct(ExtensibleDataObjectConverter $extensibleDataObjectC */ public function toFlatArray($addressDataObject) { - $flatAddressArray = $this->extensibleDataObjectConverter->toFlatArray($addressDataObject); + $flatAddressArray = $this->extensibleDataObjectConverter->toFlatArray($addressDataObject, [], '\Magento\Customer\Api\Data\AddressInterface'); //preserve street $street = $addressDataObject->getStreet(); if (!empty($street) && is_array($street)) { diff --git a/app/code/Magento/Customer/Model/Customer/Mapper.php b/app/code/Magento/Customer/Model/Customer/Mapper.php index d0755b47948a1..23987c7e3be7f 100644 --- a/app/code/Magento/Customer/Model/Customer/Mapper.php +++ b/app/code/Magento/Customer/Model/Customer/Mapper.php @@ -35,7 +35,7 @@ public function __construct(ExtensibleDataObjectConverter $extensibleDataObjectC */ public function toFlatArray(CustomerInterface $customer) { - $flatArray = $this->extensibleDataObjectConverter->toNestedArray($customer); + $flatArray = $this->extensibleDataObjectConverter->toNestedArray($customer, [], '\Magento\Customer\Api\Data\CustomerInterface'); unset($flatArray["addresses"]); return ConvertArray::toFlatArray($flatArray); } diff --git a/app/code/Magento/Customer/Model/Resource/CustomerRepository.php b/app/code/Magento/Customer/Model/Resource/CustomerRepository.php index d55b6b246efb5..c711b2a77a834 100644 --- a/app/code/Magento/Customer/Model/Resource/CustomerRepository.php +++ b/app/code/Magento/Customer/Model/Resource/CustomerRepository.php @@ -124,7 +124,9 @@ public function save(\Magento\Customer\Api\Data\CustomerInterface $customer, $pa { $this->validate($customer); $customerData = $this->extensibleDataObjectConverter->toFlatArray( - $this->customerBuilder->populate($customer)->setAddresses([])->create() + $this->customerBuilder->populate($customer)->setAddresses([])->create(), + [], + '\Magento\Customer\Api\Data\CustomerInterface' ); $customerModel = $this->customerFactory->create(['data' => $customerData]); $storeId = $customerModel->getStoreId(); diff --git a/app/code/Magento/Customer/Model/Resource/Group/Grid/ServiceCollection.php b/app/code/Magento/Customer/Model/Resource/Group/Grid/ServiceCollection.php index f1d63cfbe41ab..0cd9735267eb7 100644 --- a/app/code/Magento/Customer/Model/Resource/Group/Grid/ServiceCollection.php +++ b/app/code/Magento/Customer/Model/Resource/Group/Grid/ServiceCollection.php @@ -66,7 +66,7 @@ public function loadData($printQuery = false, $logQuery = false) $groups = $searchResults->getItems(); foreach ($groups as $group) { $groupItem = new \Magento\Framework\Object(); - $groupItem->addData($this->simpleDataObjectConverter->toFlatArray($group)); + $groupItem->addData($this->simpleDataObjectConverter->toFlatArray($group, '\Magento\Customer\Api\Data\GroupInterface')); $this->_addItem($groupItem); } $this->_setIsLoaded(); diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php index 38ff541a8c157..a71ca2c0da615 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php @@ -160,7 +160,7 @@ public function getFormValues() } catch (\Exception $e) { /** If customer does not exist do nothing. */ } - $data = isset($customer) ? $this->_extensibleDataObjectConverter->toFlatArray($customer) : []; + $data = isset($customer) ? $this->_extensibleDataObjectConverter->toFlatArray($customer, [], '\Magento\Customer\Api\Data\CustomerInterface') : []; foreach ($this->getQuote()->getData() as $key => $value) { if (strpos($key, 'customer_') === 0) { $data[substr($key, 9)] = $value; diff --git a/app/code/Magento/Sales/Model/Quote.php b/app/code/Magento/Sales/Model/Quote.php index 2a3013319bd2f..549b5761bea24 100644 --- a/app/code/Magento/Sales/Model/Quote.php +++ b/app/code/Magento/Sales/Model/Quote.php @@ -683,7 +683,9 @@ public function setCustomer(\Magento\Customer\Api\Data\CustomerInterface $custom $this->setCustomerId($customer->getId()); $customerData = $this->objectFactory->create( $this->extensibleDataObjectConverter->toFlatArray( - $this->customerBuilder->populate($customer)->setAddresses([])->create() + $this->customerBuilder->populate($customer)->setAddresses([])->create(), + [], + '\Magento\Customer\Api\Data\CustomerInterface' ) ); $this->_objectCopyService->copyFieldsetToTarget('customer_account', 'to_quote', $customerData, $this); diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/GroupTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/GroupTest.php index 11b78b08dad09..4c1f95339233a 100644 --- a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/GroupTest.php +++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/GroupTest.php @@ -145,7 +145,8 @@ public function testSaveActionExistingGroup() $simpleDataObjectConverter = Bootstrap::getObjectManager() ->get('Magento\Framework\Api\SimpleDataObjectConverter'); $customerGroupData = $simpleDataObjectConverter->toFlatArray( - $this->groupRepository->getById($groupId) + $this->groupRepository->getById($groupId), + 'Magento\Customer\Api\Data\GroupInterface' ); ksort($customerGroupData); diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/AccountManagementTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/AccountManagementTest.php index cd889aae2acb7..282e962f56b1d 100755 --- a/dev/tests/integration/testsuite/Magento/Customer/Model/AccountManagementTest.php +++ b/dev/tests/integration/testsuite/Magento/Customer/Model/AccountManagementTest.php @@ -598,8 +598,16 @@ public function testCreateNonexistingCustomer() 'aPassword', true ); - $attributesBefore = $this->extensibleDataObjectConverter->toFlatArray($existingCustomer); - $attributesAfter = $this->extensibleDataObjectConverter->toFlatArray($customerAfter); + $attributesBefore = $this->extensibleDataObjectConverter->toFlatArray( + $existingCustomer, + [], + '\Magento\Customer\Api\Data\CustomerInterface' + ); + $attributesAfter = $this->extensibleDataObjectConverter->toFlatArray( + $customerAfter, + [], + '\Magento\Customer\Api\Data\CustomerInterface' + ); // ignore 'updated_at' unset($attributesBefore['updated_at']); unset($attributesAfter['updated_at']); @@ -669,7 +677,10 @@ public function testCreateCustomerInServiceVsInModel() $simpleDataObjectConverter = Bootstrap::getObjectManager() ->get('Magento\Framework\Api\SimpleDataObjectConverter'); - $dataInService = $simpleDataObjectConverter->toFlatArray($savedCustomer); + $dataInService = $simpleDataObjectConverter->toFlatArray( + $savedCustomer, + 'Magento\Customer\Api\Data\CustomerInterface' + ); $expectedDifferences = [ 'created_at', 'updated_at', diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php index 6ef87661dbb82..5c82c1583ed80 100644 --- a/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php +++ b/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php @@ -119,7 +119,7 @@ public function testGetCustomerAttributeMetadata() 'id' => 1, 'website_id' => 1, 'store_id' => 1, - 'group_id' => '1', + 'group_id' => 1, 'firstname' => 'John', 'lastname' => 'Smith', 'email' => 'customer@example.com', @@ -131,7 +131,11 @@ public function testGetCustomerAttributeMetadata() $customer = $this->customerRepository->getById(1); $this->assertNotNull($customer); - $attributes = $this->_extensibleDataObjectConverter->toFlatArray($customer); + $attributes = $this->_extensibleDataObjectConverter->toFlatArray( + $customer, + [], + '\Magento\Customer\Api\Data\CustomerInterface' + ); $this->assertNotEmpty($attributes); foreach ($attributes as $attributeCode => $attributeValue) { diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/Resource/CustomerRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/Resource/CustomerRepositoryTest.php index 24210493d4d8e..a371e918a15d5 100644 --- a/dev/tests/integration/testsuite/Magento/Customer/Model/Resource/CustomerRepositoryTest.php +++ b/dev/tests/integration/testsuite/Magento/Customer/Model/Resource/CustomerRepositoryTest.php @@ -140,8 +140,16 @@ public function testUpdateCustomer() $this->assertEquals('Admin', $customerAfter->getCreatedIn()); $passwordFromFixture = 'password'; $this->accountManagement->authenticate($customerAfter->getEmail(), $passwordFromFixture); - $attributesBefore = $this->converter->toFlatArray($customerBefore); - $attributesAfter = $this->converter->toFlatArray($customerAfter); + $attributesBefore = $this->converter->toFlatArray( + $customerBefore, + [], + '\Magento\Customer\Api\Data\CustomerInterface' + ); + $attributesAfter = $this->converter->toFlatArray( + $customerAfter, + [], + '\Magento\Customer\Api\Data\CustomerInterface' + ); // ignore 'updated_at' unset($attributesBefore['updated_at']); unset($attributesAfter['updated_at']); diff --git a/dev/tests/integration/testsuite/Magento/Weee/Model/TaxTest.php b/dev/tests/integration/testsuite/Magento/Weee/Model/TaxTest.php index 551e7165081fa..edb892c1cbd59 100644 --- a/dev/tests/integration/testsuite/Magento/Weee/Model/TaxTest.php +++ b/dev/tests/integration/testsuite/Magento/Weee/Model/TaxTest.php @@ -57,7 +57,7 @@ public function testGetProductWeeeAttributes() ['metadataService' => $customerMetadataService] ); $expected = $this->_extensibleDataObjectConverter->toFlatArray( - $customerRepository->getById(1) + $customerRepository->getById(1), [], '\Magento\Customer\Api\Data\CustomerInterface' ); $customerBuilder->populateWithArray($expected); $customerDataSet = $customerBuilder->create(); diff --git a/dev/tests/unit/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/AccountTest.php b/dev/tests/unit/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/AccountTest.php index 0cce2cb3e3fc5..0f53b44136d04 100644 --- a/dev/tests/unit/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/AccountTest.php +++ b/dev/tests/unit/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/AccountTest.php @@ -186,6 +186,7 @@ private function _setupStoreMode($customerData, $isSingleStoreMode, $canModifyCu 'adminhtml_customer', $this->extensibleDataObjectConverterMock->toFlatArray( $customerObject, + [], '\Magento\Customer\Api\Data\CustomerInterface' ) ) diff --git a/lib/internal/Magento/Framework/Api/ExtensibleDataObjectConverter.php b/lib/internal/Magento/Framework/Api/ExtensibleDataObjectConverter.php index db3d287668fa2..ae5c48190e056 100644 --- a/lib/internal/Magento/Framework/Api/ExtensibleDataObjectConverter.php +++ b/lib/internal/Magento/Framework/Api/ExtensibleDataObjectConverter.php @@ -31,11 +31,17 @@ public function __construct(DataObjectProcessor $dataObjectProcessor) * * @param ExtensibleDataInterface $dataObject * @param string[] $skipCustomAttributes + * @param string $dataObjectType * @return array */ - public function toNestedArray(ExtensibleDataInterface $dataObject, $skipCustomAttributes = []) - { - $dataObjectType = get_class($dataObject); + public function toNestedArray( + ExtensibleDataInterface $dataObject, + $skipCustomAttributes = [], + $dataObjectType = null + ) { + if ($dataObjectType == null) { + $dataObjectType = get_class($dataObject); + } $dataObjectArray = $this->dataObjectProcessor->buildOutputDataArray($dataObject, $dataObjectType); //process custom attributes if present if (!empty($dataObjectArray[AbstractExtensibleObject::CUSTOM_ATTRIBUTES_KEY])) { @@ -57,11 +63,15 @@ public function toNestedArray(ExtensibleDataInterface $dataObject, $skipCustomAt * * @param ExtensibleDataInterface $dataObject * @param string[] $skipCustomAttributes + * @param string $dataObjectType * @return array */ - public function toFlatArray(ExtensibleDataInterface $dataObject, $skipCustomAttributes = []) - { - $dataObjectArray = $this->toNestedArray($dataObject, $skipCustomAttributes); + public function toFlatArray( + ExtensibleDataInterface $dataObject, + $skipCustomAttributes = [], + $dataObjectType = null + ) { + $dataObjectArray = $this->toNestedArray($dataObject, $skipCustomAttributes, $dataObjectType); return ConvertArray::toFlatArray($dataObjectArray); } diff --git a/lib/internal/Magento/Framework/Api/SimpleDataObjectConverter.php b/lib/internal/Magento/Framework/Api/SimpleDataObjectConverter.php index c55d1d99ab7b0..411ded3e02eba 100644 --- a/lib/internal/Magento/Framework/Api/SimpleDataObjectConverter.php +++ b/lib/internal/Magento/Framework/Api/SimpleDataObjectConverter.php @@ -26,11 +26,14 @@ public function __construct(DataObjectProcessor $dataObjectProcessor) * Convert nested array into flat array. * * @param ExtensibleDataInterface $dataObject + * @param string $dataObjectType * @return array */ - public function toFlatArray(ExtensibleDataInterface $dataObject) + public function toFlatArray(ExtensibleDataInterface $dataObject, $dataObjectType = null) { - $dataObjectType = get_class($dataObject); + if ($dataObjectType === null) { + $dataObjectType = get_class($dataObject); + } $data = $this->dataObjectProcessor->buildOutputDataArray($dataObject, $dataObjectType); return ConvertArray::toFlatArray($data); } From 2654240127ede8fceb9ed947264ccdb0f7878c9d Mon Sep 17 00:00:00 2001 From: Eddie Lau Date: Mon, 12 Jan 2015 11:05:15 -0600 Subject: [PATCH 40/44] MAGETWO-31950: Contribution to CE Mainline - corrected composer.lock and composer.json files --- app/code/Magento/Catalog/composer.json | 2 +- app/code/Magento/CatalogImportExport/composer.json | 2 +- app/code/Magento/CatalogInventory/composer.json | 2 +- app/code/Magento/CatalogRule/composer.json | 2 +- app/code/Magento/CatalogSearch/composer.json | 2 +- app/code/Magento/CatalogUrlRewrite/composer.json | 2 +- app/code/Magento/CatalogWidget/composer.json | 2 +- app/code/Magento/Centinel/composer.json | 2 +- app/code/Magento/Checkout/composer.json | 2 +- app/code/Magento/CheckoutAgreements/composer.json | 2 +- app/code/Magento/Cms/composer.json | 2 +- app/code/Magento/CmsUrlRewrite/composer.json | 2 +- app/code/Magento/ConfigurableImportExport/composer.json | 2 +- app/code/Magento/ConfigurableProduct/composer.json | 2 +- app/code/Magento/Contact/composer.json | 2 +- app/code/Magento/Core/composer.json | 2 +- app/code/Magento/Cron/composer.json | 2 +- app/code/Magento/CurrencySymbol/composer.json | 2 +- app/code/Magento/Customer/composer.json | 2 +- app/code/Magento/CustomerImportExport/composer.json | 2 +- app/code/Magento/DesignEditor/composer.json | 2 +- app/code/Magento/Dhl/composer.json | 2 +- app/code/Magento/Directory/composer.json | 2 +- app/code/Magento/Downloadable/composer.json | 2 +- app/code/Magento/Eav/composer.json | 2 +- app/code/Magento/Email/composer.json | 2 +- app/code/Magento/Fedex/composer.json | 2 +- app/code/Magento/GiftMessage/composer.json | 2 +- app/code/Magento/GoogleAdwords/composer.json | 2 +- app/code/Magento/GoogleAnalytics/composer.json | 2 +- app/code/Magento/GoogleOptimizer/composer.json | 2 +- app/code/Magento/GoogleShopping/composer.json | 2 +- app/code/Magento/GroupedImportExport/composer.json | 2 +- app/code/Magento/GroupedProduct/composer.json | 2 +- app/code/Magento/ImportExport/composer.json | 2 +- app/code/Magento/Indexer/composer.json | 2 +- app/code/Magento/Integration/composer.json | 2 +- app/code/Magento/LayeredNavigation/composer.json | 2 +- app/code/Magento/Log/composer.json | 2 +- app/code/Magento/Msrp/composer.json | 2 +- app/code/Magento/Multishipping/composer.json | 2 +- app/code/Magento/Newsletter/composer.json | 2 +- app/code/Magento/OfflinePayments/composer.json | 2 +- app/code/Magento/OfflineShipping/composer.json | 2 +- app/code/Magento/PageCache/composer.json | 2 +- app/code/Magento/Payment/composer.json | 2 +- app/code/Magento/Persistent/composer.json | 2 +- app/code/Magento/ProductAlert/composer.json | 2 +- app/code/Magento/Reports/composer.json | 2 +- app/code/Magento/RequireJs/composer.json | 2 +- app/code/Magento/Review/composer.json | 2 +- app/code/Magento/Rss/composer.json | 2 +- app/code/Magento/Rule/composer.json | 2 +- app/code/Magento/Sales/composer.json | 2 +- app/code/Magento/SalesRule/composer.json | 2 +- app/code/Magento/Search/composer.json | 2 +- app/code/Magento/Sendfriend/composer.json | 2 +- app/code/Magento/Shipping/composer.json | 2 +- app/code/Magento/Sitemap/composer.json | 2 +- app/code/Magento/Store/composer.json | 2 +- app/code/Magento/Tax/composer.json | 2 +- app/code/Magento/TaxImportExport/composer.json | 2 +- app/code/Magento/Theme/composer.json | 2 +- app/code/Magento/Translation/composer.json | 2 +- app/code/Magento/Ui/composer.json | 2 +- app/code/Magento/Ups/composer.json | 2 +- app/code/Magento/UrlRewrite/composer.json | 2 +- app/code/Magento/User/composer.json | 2 +- app/code/Magento/Usps/composer.json | 2 +- app/code/Magento/Webapi/composer.json | 2 +- app/code/Magento/Weee/composer.json | 2 +- app/code/Magento/Widget/composer.json | 2 +- app/code/Magento/Wishlist/composer.json | 2 +- app/design/adminhtml/Magento/backend/composer.json | 2 +- app/design/frontend/Magento/blank/composer.json | 2 +- app/design/frontend/Magento/luma/composer.json | 2 +- composer.lock | 5 +++-- 77 files changed, 79 insertions(+), 78 deletions(-) diff --git a/app/code/Magento/Catalog/composer.json b/app/code/Magento/Catalog/composer.json index 91175da5e7367..360e14b27de53 100644 --- a/app/code/Magento/Catalog/composer.json +++ b/app/code/Magento/Catalog/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-catalog", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-eav": "0.42.0-beta3", "magento/module-cms": "0.42.0-beta3", diff --git a/app/code/Magento/CatalogImportExport/composer.json b/app/code/Magento/CatalogImportExport/composer.json index eeb8648ddd4ca..b494e210bef94 100644 --- a/app/code/Magento/CatalogImportExport/composer.json +++ b/app/code/Magento/CatalogImportExport/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-catalog-import-export", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-core": "0.42.0-beta3", "magento/module-catalog": "0.42.0-beta3", "magento/module-eav": "0.42.0-beta3", diff --git a/app/code/Magento/CatalogInventory/composer.json b/app/code/Magento/CatalogInventory/composer.json index e8f04fc3a78e2..c226936f18f7b 100644 --- a/app/code/Magento/CatalogInventory/composer.json +++ b/app/code/Magento/CatalogInventory/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-catalog-inventory", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-catalog": "0.42.0-beta3", "magento/module-customer": "0.42.0-beta3", diff --git a/app/code/Magento/CatalogRule/composer.json b/app/code/Magento/CatalogRule/composer.json index 969c2d6fe508b..77813109ca80a 100644 --- a/app/code/Magento/CatalogRule/composer.json +++ b/app/code/Magento/CatalogRule/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-catalog-rule", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-rule": "0.42.0-beta3", "magento/module-catalog": "0.42.0-beta3", diff --git a/app/code/Magento/CatalogSearch/composer.json b/app/code/Magento/CatalogSearch/composer.json index cdf03092c052b..1820067884907 100644 --- a/app/code/Magento/CatalogSearch/composer.json +++ b/app/code/Magento/CatalogSearch/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-catalog-search", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-catalog": "0.42.0-beta3", "magento/module-search": "0.42.0-beta3", diff --git a/app/code/Magento/CatalogUrlRewrite/composer.json b/app/code/Magento/CatalogUrlRewrite/composer.json index 6fe7f7bf36502..51e3cb2ed671e 100644 --- a/app/code/Magento/CatalogUrlRewrite/composer.json +++ b/app/code/Magento/CatalogUrlRewrite/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-catalog-url-rewrite", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-backend": "0.42.0-beta3", "magento/module-catalog": "0.42.0-beta3", "magento/module-catalog-import-export": "0.42.0-beta3", diff --git a/app/code/Magento/CatalogWidget/composer.json b/app/code/Magento/CatalogWidget/composer.json index fd48c7c899588..0c728e7ef139c 100644 --- a/app/code/Magento/CatalogWidget/composer.json +++ b/app/code/Magento/CatalogWidget/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-catalog-widget", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-catalog": "0.42.0-beta3", "magento/module-widget": "0.42.0-beta3", "magento/module-backend": "0.42.0-beta3", diff --git a/app/code/Magento/Centinel/composer.json b/app/code/Magento/Centinel/composer.json index cb24895c5bef8..23ce3a4a76fa1 100644 --- a/app/code/Magento/Centinel/composer.json +++ b/app/code/Magento/Centinel/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-centinel", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-checkout": "0.42.0-beta3", "magento/module-core": "0.42.0-beta3", diff --git a/app/code/Magento/Checkout/composer.json b/app/code/Magento/Checkout/composer.json index 5ff87c86c62da..5571403235562 100644 --- a/app/code/Magento/Checkout/composer.json +++ b/app/code/Magento/Checkout/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-checkout", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-sales": "0.42.0-beta3", "magento/module-authorization": "0.42.0-beta3", diff --git a/app/code/Magento/CheckoutAgreements/composer.json b/app/code/Magento/CheckoutAgreements/composer.json index 90429b6faec2f..0e41b386f1a71 100644 --- a/app/code/Magento/CheckoutAgreements/composer.json +++ b/app/code/Magento/CheckoutAgreements/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-checkout-agreements", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-checkout": "0.42.0-beta3", "magento/module-store": "0.42.0-beta3", "magento/module-backend": "0.42.0-beta3", diff --git a/app/code/Magento/Cms/composer.json b/app/code/Magento/Cms/composer.json index c1b4f3cb82ba0..1bab1473f233a 100644 --- a/app/code/Magento/Cms/composer.json +++ b/app/code/Magento/Cms/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-cms", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-core": "0.42.0-beta3", "magento/module-theme": "0.42.0-beta3", diff --git a/app/code/Magento/CmsUrlRewrite/composer.json b/app/code/Magento/CmsUrlRewrite/composer.json index e5f0e68d9e21a..8566a9d1e0b73 100644 --- a/app/code/Magento/CmsUrlRewrite/composer.json +++ b/app/code/Magento/CmsUrlRewrite/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-cms-url-rewrite", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-cms": "0.42.0-beta3", "magento/module-store": "0.42.0-beta3", "magento/module-url-rewrite": "0.42.0-beta3", diff --git a/app/code/Magento/ConfigurableImportExport/composer.json b/app/code/Magento/ConfigurableImportExport/composer.json index 1ec2eb7039530..350b1f9762dae 100644 --- a/app/code/Magento/ConfigurableImportExport/composer.json +++ b/app/code/Magento/ConfigurableImportExport/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-configurable-import-export", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-catalog": "0.42.0-beta3", "magento/module-catalog-import-export": "0.42.0-beta3", "magento/module-eav": "0.42.0-beta3", diff --git a/app/code/Magento/ConfigurableProduct/composer.json b/app/code/Magento/ConfigurableProduct/composer.json index 36971f7dbd7a9..40614acdc7e88 100644 --- a/app/code/Magento/ConfigurableProduct/composer.json +++ b/app/code/Magento/ConfigurableProduct/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-configurable-product", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-catalog": "0.42.0-beta3", "magento/module-catalog-inventory": "0.42.0-beta3", diff --git a/app/code/Magento/Contact/composer.json b/app/code/Magento/Contact/composer.json index 7b8189d62e197..e746193309c4f 100644 --- a/app/code/Magento/Contact/composer.json +++ b/app/code/Magento/Contact/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-contact", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-customer": "0.42.0-beta3", "magento/module-backend": "0.42.0-beta3", diff --git a/app/code/Magento/Core/composer.json b/app/code/Magento/Core/composer.json index 72ba792362df4..3d356da4d534d 100644 --- a/app/code/Magento/Core/composer.json +++ b/app/code/Magento/Core/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-core", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-backend": "0.42.0-beta3", "magento/module-cron": "0.42.0-beta3", diff --git a/app/code/Magento/Cron/composer.json b/app/code/Magento/Cron/composer.json index c3cdb1c2c8172..5d0310756d4a3 100644 --- a/app/code/Magento/Cron/composer.json +++ b/app/code/Magento/Cron/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-cron", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-backend": "0.42.0-beta3", "magento/framework": "0.42.0-beta3", diff --git a/app/code/Magento/CurrencySymbol/composer.json b/app/code/Magento/CurrencySymbol/composer.json index 4853345442d1a..fe027d918ba32 100644 --- a/app/code/Magento/CurrencySymbol/composer.json +++ b/app/code/Magento/CurrencySymbol/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-currency-symbol", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-page-cache": "0.42.0-beta3", "magento/module-directory": "0.42.0-beta3", diff --git a/app/code/Magento/Customer/composer.json b/app/code/Magento/Customer/composer.json index 82de4e2d55c2e..6a8f9941fef46 100644 --- a/app/code/Magento/Customer/composer.json +++ b/app/code/Magento/Customer/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-customer", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-eav": "0.42.0-beta3", "magento/module-directory": "0.42.0-beta3", diff --git a/app/code/Magento/CustomerImportExport/composer.json b/app/code/Magento/CustomerImportExport/composer.json index 8c75a2a8de2a2..286d4febae3a2 100644 --- a/app/code/Magento/CustomerImportExport/composer.json +++ b/app/code/Magento/CustomerImportExport/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-customer-import-export", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-backend": "0.42.0-beta3", "magento/module-core": "0.42.0-beta3", "magento/module-customer": "0.42.0-beta3", diff --git a/app/code/Magento/DesignEditor/composer.json b/app/code/Magento/DesignEditor/composer.json index f5b72a0874ab3..356553a6cc3b6 100644 --- a/app/code/Magento/DesignEditor/composer.json +++ b/app/code/Magento/DesignEditor/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-design-editor", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-theme": "0.42.0-beta3", "magento/module-backend": "0.42.0-beta3", diff --git a/app/code/Magento/Dhl/composer.json b/app/code/Magento/Dhl/composer.json index b2e95071a8a03..c9d78cbed3b5a 100644 --- a/app/code/Magento/Dhl/composer.json +++ b/app/code/Magento/Dhl/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-dhl", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-shipping": "0.42.0-beta3", "magento/module-backend": "0.42.0-beta3", diff --git a/app/code/Magento/Directory/composer.json b/app/code/Magento/Directory/composer.json index 088239d85ec08..58c7f5ad1dda2 100644 --- a/app/code/Magento/Directory/composer.json +++ b/app/code/Magento/Directory/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-directory", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-core": "0.42.0-beta3", "magento/module-backend": "0.42.0-beta3", diff --git a/app/code/Magento/Downloadable/composer.json b/app/code/Magento/Downloadable/composer.json index 466cd720eb5ae..c8c0562e88873 100644 --- a/app/code/Magento/Downloadable/composer.json +++ b/app/code/Magento/Downloadable/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-downloadable", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-catalog": "0.42.0-beta3", "magento/module-core": "0.42.0-beta3", diff --git a/app/code/Magento/Eav/composer.json b/app/code/Magento/Eav/composer.json index 21bcb29c6c088..c60d271e7cf02 100644 --- a/app/code/Magento/Eav/composer.json +++ b/app/code/Magento/Eav/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-eav", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-core": "0.42.0-beta3", "magento/module-backend": "0.42.0-beta3", diff --git a/app/code/Magento/Email/composer.json b/app/code/Magento/Email/composer.json index 240a491b71ecf..9afda3f5b33af 100644 --- a/app/code/Magento/Email/composer.json +++ b/app/code/Magento/Email/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-email", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-core": "0.42.0-beta3", "magento/module-cms": "0.42.0-beta3", diff --git a/app/code/Magento/Fedex/composer.json b/app/code/Magento/Fedex/composer.json index 88de88ae2fae4..c4bb50094eda0 100644 --- a/app/code/Magento/Fedex/composer.json +++ b/app/code/Magento/Fedex/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-fedex", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-shipping": "0.42.0-beta3", "magento/module-directory": "0.42.0-beta3", diff --git a/app/code/Magento/GiftMessage/composer.json b/app/code/Magento/GiftMessage/composer.json index 3ecf20cb4c879..2f330a2b6f519 100644 --- a/app/code/Magento/GiftMessage/composer.json +++ b/app/code/Magento/GiftMessage/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-gift-message", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-catalog": "0.42.0-beta3", "magento/module-checkout": "0.42.0-beta3", diff --git a/app/code/Magento/GoogleAdwords/composer.json b/app/code/Magento/GoogleAdwords/composer.json index 56844a6388978..0e10e7361b8b5 100644 --- a/app/code/Magento/GoogleAdwords/composer.json +++ b/app/code/Magento/GoogleAdwords/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-google-adwords", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-sales": "0.42.0-beta3", "magento/framework": "0.42.0-beta3", diff --git a/app/code/Magento/GoogleAnalytics/composer.json b/app/code/Magento/GoogleAnalytics/composer.json index 8670a99b812d9..ad2a5c677de09 100644 --- a/app/code/Magento/GoogleAnalytics/composer.json +++ b/app/code/Magento/GoogleAnalytics/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-google-analytics", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-sales": "0.42.0-beta3", "magento/framework": "0.42.0-beta3", diff --git a/app/code/Magento/GoogleOptimizer/composer.json b/app/code/Magento/GoogleOptimizer/composer.json index 19d885ce706a0..6f3640d73b6b3 100644 --- a/app/code/Magento/GoogleOptimizer/composer.json +++ b/app/code/Magento/GoogleOptimizer/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-google-optimizer", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-google-analytics": "0.42.0-beta3", "magento/module-catalog": "0.42.0-beta3", diff --git a/app/code/Magento/GoogleShopping/composer.json b/app/code/Magento/GoogleShopping/composer.json index 8423766d54ee5..38e35843f414a 100644 --- a/app/code/Magento/GoogleShopping/composer.json +++ b/app/code/Magento/GoogleShopping/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-google-shopping", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-core": "0.42.0-beta3", "magento/module-backend": "0.42.0-beta3", diff --git a/app/code/Magento/GroupedImportExport/composer.json b/app/code/Magento/GroupedImportExport/composer.json index 8516d96ce021c..f53791499fbd2 100644 --- a/app/code/Magento/GroupedImportExport/composer.json +++ b/app/code/Magento/GroupedImportExport/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-grouped-import-export", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-catalog": "0.42.0-beta3", "magento/module-import-export": "0.42.0-beta3", "magento/module-catalog-import-export": "0.42.0-beta3", diff --git a/app/code/Magento/GroupedProduct/composer.json b/app/code/Magento/GroupedProduct/composer.json index 29b4d88ed9369..d276a035dacf7 100644 --- a/app/code/Magento/GroupedProduct/composer.json +++ b/app/code/Magento/GroupedProduct/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-grouped-product", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-catalog": "0.42.0-beta3", "magento/module-catalog-inventory": "0.42.0-beta3", diff --git a/app/code/Magento/ImportExport/composer.json b/app/code/Magento/ImportExport/composer.json index eff9685455645..89e4b1aab9805 100644 --- a/app/code/Magento/ImportExport/composer.json +++ b/app/code/Magento/ImportExport/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-import-export", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-core": "0.42.0-beta3", "magento/module-backend": "0.42.0-beta3", diff --git a/app/code/Magento/Indexer/composer.json b/app/code/Magento/Indexer/composer.json index 37888cf563d46..98cc0400270d6 100644 --- a/app/code/Magento/Indexer/composer.json +++ b/app/code/Magento/Indexer/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-indexer", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-backend": "0.42.0-beta3", "magento/module-page-cache": "0.42.0-beta3", "magento/framework": "0.42.0-beta3", diff --git a/app/code/Magento/Integration/composer.json b/app/code/Magento/Integration/composer.json index e338720c70a04..39da0e6194a83 100644 --- a/app/code/Magento/Integration/composer.json +++ b/app/code/Magento/Integration/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-integration", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-core": "0.42.0-beta3", "magento/module-backend": "0.42.0-beta3", diff --git a/app/code/Magento/LayeredNavigation/composer.json b/app/code/Magento/LayeredNavigation/composer.json index 49573c19c395f..a4cf2dc2cef49 100644 --- a/app/code/Magento/LayeredNavigation/composer.json +++ b/app/code/Magento/LayeredNavigation/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-layered-navigation", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-catalog": "0.42.0-beta3", "magento/module-backend": "0.42.0-beta3", "magento/framework": "0.42.0-beta3", diff --git a/app/code/Magento/Log/composer.json b/app/code/Magento/Log/composer.json index 0d6c624364076..4bf9ba061b87f 100644 --- a/app/code/Magento/Log/composer.json +++ b/app/code/Magento/Log/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-log", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-core": "0.42.0-beta3", "magento/module-customer": "0.42.0-beta3", diff --git a/app/code/Magento/Msrp/composer.json b/app/code/Magento/Msrp/composer.json index bdb16ee62dd3f..3d83446f5e40c 100644 --- a/app/code/Magento/Msrp/composer.json +++ b/app/code/Magento/Msrp/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-msrp", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-bundle": "0.42.0-beta3", "magento/module-catalog": "0.42.0-beta3", "magento/module-core": "0.42.0-beta3", diff --git a/app/code/Magento/Multishipping/composer.json b/app/code/Magento/Multishipping/composer.json index dd36c4b2060c4..756598d1fa2a9 100644 --- a/app/code/Magento/Multishipping/composer.json +++ b/app/code/Magento/Multishipping/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-multishipping", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-core": "0.42.0-beta3", "magento/module-checkout": "0.42.0-beta3", diff --git a/app/code/Magento/Newsletter/composer.json b/app/code/Magento/Newsletter/composer.json index b27b3b6fcfb71..4c9e57f393230 100644 --- a/app/code/Magento/Newsletter/composer.json +++ b/app/code/Magento/Newsletter/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-newsletter", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-core": "0.42.0-beta3", "magento/module-customer": "0.42.0-beta3", diff --git a/app/code/Magento/OfflinePayments/composer.json b/app/code/Magento/OfflinePayments/composer.json index 9b5d5235860fe..ebd7adb688e87 100644 --- a/app/code/Magento/OfflinePayments/composer.json +++ b/app/code/Magento/OfflinePayments/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-offline-payments", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-payment": "0.42.0-beta3", "magento/framework": "0.42.0-beta3", "magento/magento-composer-installer": "*" diff --git a/app/code/Magento/OfflineShipping/composer.json b/app/code/Magento/OfflineShipping/composer.json index e9e7ef8f54fb3..f233c74afbce1 100644 --- a/app/code/Magento/OfflineShipping/composer.json +++ b/app/code/Magento/OfflineShipping/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-offline-shipping", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-backend": "0.42.0-beta3", "magento/module-shipping": "0.42.0-beta3", diff --git a/app/code/Magento/PageCache/composer.json b/app/code/Magento/PageCache/composer.json index b3041fb04b4bb..ea05fb95664ae 100644 --- a/app/code/Magento/PageCache/composer.json +++ b/app/code/Magento/PageCache/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-page-cache", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-backend": "0.42.0-beta3", "magento/framework": "0.42.0-beta3", diff --git a/app/code/Magento/Payment/composer.json b/app/code/Magento/Payment/composer.json index cc11964c6765c..1f55fcdc3a829 100644 --- a/app/code/Magento/Payment/composer.json +++ b/app/code/Magento/Payment/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-payment", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-core": "0.42.0-beta3", "magento/module-sales": "0.42.0-beta3", diff --git a/app/code/Magento/Persistent/composer.json b/app/code/Magento/Persistent/composer.json index cba2e8d19e77e..022dc88e2fc3d 100644 --- a/app/code/Magento/Persistent/composer.json +++ b/app/code/Magento/Persistent/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-persistent", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-checkout": "0.42.0-beta3", "magento/module-core": "0.42.0-beta3", diff --git a/app/code/Magento/ProductAlert/composer.json b/app/code/Magento/ProductAlert/composer.json index f467753113522..b001db5d77d92 100644 --- a/app/code/Magento/ProductAlert/composer.json +++ b/app/code/Magento/ProductAlert/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-product-alert", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-catalog": "0.42.0-beta3", "magento/module-customer": "0.42.0-beta3", diff --git a/app/code/Magento/Reports/composer.json b/app/code/Magento/Reports/composer.json index 4b4917b2b885e..817eb609ddfed 100644 --- a/app/code/Magento/Reports/composer.json +++ b/app/code/Magento/Reports/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-reports", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-eav": "0.42.0-beta3", "magento/module-customer": "0.42.0-beta3", diff --git a/app/code/Magento/RequireJs/composer.json b/app/code/Magento/RequireJs/composer.json index 549d96bb95fa3..4c029c1c34159 100644 --- a/app/code/Magento/RequireJs/composer.json +++ b/app/code/Magento/RequireJs/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-require-js", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/framework": "0.42.0-beta3", "magento/magento-composer-installer": "*" }, diff --git a/app/code/Magento/Review/composer.json b/app/code/Magento/Review/composer.json index c880a35a57661..ec6e7e8629c79 100644 --- a/app/code/Magento/Review/composer.json +++ b/app/code/Magento/Review/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-review", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-catalog": "0.42.0-beta3", "magento/module-core": "0.42.0-beta3", diff --git a/app/code/Magento/Rss/composer.json b/app/code/Magento/Rss/composer.json index b094f07e3c2ee..74952b18d3133 100644 --- a/app/code/Magento/Rss/composer.json +++ b/app/code/Magento/Rss/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-rss", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-backend": "0.42.0-beta3", "magento/framework": "0.42.0-beta3", diff --git a/app/code/Magento/Rule/composer.json b/app/code/Magento/Rule/composer.json index f6329429fd35d..023d077408adc 100644 --- a/app/code/Magento/Rule/composer.json +++ b/app/code/Magento/Rule/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-rule", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-eav": "0.42.0-beta3", "magento/module-catalog": "0.42.0-beta3", diff --git a/app/code/Magento/Sales/composer.json b/app/code/Magento/Sales/composer.json index 7d8b5af849848..dd52c6dec79cb 100644 --- a/app/code/Magento/Sales/composer.json +++ b/app/code/Magento/Sales/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-sales", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-catalog": "0.42.0-beta3", "magento/module-customer": "0.42.0-beta3", diff --git a/app/code/Magento/SalesRule/composer.json b/app/code/Magento/SalesRule/composer.json index 01578977b6d0a..0bc6963fbfe82 100644 --- a/app/code/Magento/SalesRule/composer.json +++ b/app/code/Magento/SalesRule/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-sales-rule", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-rule": "0.42.0-beta3", "magento/module-catalog": "0.42.0-beta3", diff --git a/app/code/Magento/Search/composer.json b/app/code/Magento/Search/composer.json index 14b98f899019a..3b6df7b57463c 100644 --- a/app/code/Magento/Search/composer.json +++ b/app/code/Magento/Search/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-search", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/framework": "0.42.0-beta3", "magento/module-backend": "0.42.0-beta3", "magento/module-store": "0.42.0-beta3", diff --git a/app/code/Magento/Sendfriend/composer.json b/app/code/Magento/Sendfriend/composer.json index a88aa094e39d4..79e1041b4822d 100644 --- a/app/code/Magento/Sendfriend/composer.json +++ b/app/code/Magento/Sendfriend/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-sendfriend", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-catalog": "0.42.0-beta3", "magento/module-core": "0.42.0-beta3", diff --git a/app/code/Magento/Shipping/composer.json b/app/code/Magento/Shipping/composer.json index 4b5b85bf70fac..08a1e9d7969cd 100644 --- a/app/code/Magento/Shipping/composer.json +++ b/app/code/Magento/Shipping/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-shipping", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-core": "0.42.0-beta3", "magento/module-catalog": "0.42.0-beta3", diff --git a/app/code/Magento/Sitemap/composer.json b/app/code/Magento/Sitemap/composer.json index 9855debc8e8dd..b22d1586a32d6 100644 --- a/app/code/Magento/Sitemap/composer.json +++ b/app/code/Magento/Sitemap/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-sitemap", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-catalog": "0.42.0-beta3", "magento/module-core": "0.42.0-beta3", diff --git a/app/code/Magento/Store/composer.json b/app/code/Magento/Store/composer.json index 4533617012e78..e089091493ed4 100644 --- a/app/code/Magento/Store/composer.json +++ b/app/code/Magento/Store/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-store", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-core": "0.42.0-beta3", "magento/module-directory": "0.42.0-beta3", "magento/module-ui": "0.42.0-beta3", diff --git a/app/code/Magento/Tax/composer.json b/app/code/Magento/Tax/composer.json index ab8e020070b34..5c54feeea3e74 100644 --- a/app/code/Magento/Tax/composer.json +++ b/app/code/Magento/Tax/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-tax", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-catalog": "0.42.0-beta3", "magento/module-customer": "0.42.0-beta3", diff --git a/app/code/Magento/TaxImportExport/composer.json b/app/code/Magento/TaxImportExport/composer.json index 918d877d1dbab..d49ee464fd3e6 100644 --- a/app/code/Magento/TaxImportExport/composer.json +++ b/app/code/Magento/TaxImportExport/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-tax-import-export", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-tax": "0.42.0-beta3", "magento/module-backend": "0.42.0-beta3", "magento/module-directory": "0.42.0-beta3", diff --git a/app/code/Magento/Theme/composer.json b/app/code/Magento/Theme/composer.json index 0326e580986db..9b67f6efa161a 100644 --- a/app/code/Magento/Theme/composer.json +++ b/app/code/Magento/Theme/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-theme", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-core": "0.42.0-beta3", "magento/module-customer": "0.42.0-beta3", diff --git a/app/code/Magento/Translation/composer.json b/app/code/Magento/Translation/composer.json index 6e4e8611f7d04..259dadd131c12 100644 --- a/app/code/Magento/Translation/composer.json +++ b/app/code/Magento/Translation/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-translation", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-core": "0.42.0-beta3", "magento/module-store": "0.42.0-beta3", "magento/module-backend": "0.42.0-beta3", diff --git a/app/code/Magento/Ui/composer.json b/app/code/Magento/Ui/composer.json index 5cf8c3a3c1c09..efe3403132d45 100644 --- a/app/code/Magento/Ui/composer.json +++ b/app/code/Magento/Ui/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-ui", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-backend": "0.42.0-beta3", "magento/module-store": "0.42.0-beta3", "magento/framework": "0.42.0-beta3", diff --git a/app/code/Magento/Ups/composer.json b/app/code/Magento/Ups/composer.json index 29d0e8402b6e1..42d5f994aeb4d 100644 --- a/app/code/Magento/Ups/composer.json +++ b/app/code/Magento/Ups/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-ups", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-core": "0.42.0-beta3", "magento/module-backend": "0.42.0-beta3", diff --git a/app/code/Magento/UrlRewrite/composer.json b/app/code/Magento/UrlRewrite/composer.json index 45565518903cb..a108f1b23a17f 100644 --- a/app/code/Magento/UrlRewrite/composer.json +++ b/app/code/Magento/UrlRewrite/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-url-rewrite", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-catalog": "0.42.0-beta3", "magento/module-core": "0.42.0-beta3", "magento/module-store": "0.42.0-beta3", diff --git a/app/code/Magento/User/composer.json b/app/code/Magento/User/composer.json index b99e2d40a5cf5..4bfac9339fc56 100644 --- a/app/code/Magento/User/composer.json +++ b/app/code/Magento/User/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-user", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-authorization": "0.42.0-beta3", "magento/module-backend": "0.42.0-beta3", "magento/module-core": "0.42.0-beta3", diff --git a/app/code/Magento/Usps/composer.json b/app/code/Magento/Usps/composer.json index 65df78205d6dd..b7c72cec3da72 100644 --- a/app/code/Magento/Usps/composer.json +++ b/app/code/Magento/Usps/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-usps", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-shipping": "0.42.0-beta3", "magento/module-directory": "0.42.0-beta3", diff --git a/app/code/Magento/Webapi/composer.json b/app/code/Magento/Webapi/composer.json index 6802e87bff62d..755ecba204525 100644 --- a/app/code/Magento/Webapi/composer.json +++ b/app/code/Magento/Webapi/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-webapi", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-authorization": "0.42.0-beta3", "magento/module-core": "0.42.0-beta3", diff --git a/app/code/Magento/Weee/composer.json b/app/code/Magento/Weee/composer.json index 6e5f5cc7355f1..fb0b9a6779c99 100644 --- a/app/code/Magento/Weee/composer.json +++ b/app/code/Magento/Weee/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-weee", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-catalog": "0.42.0-beta3", "magento/module-tax": "0.42.0-beta3", diff --git a/app/code/Magento/Widget/composer.json b/app/code/Magento/Widget/composer.json index 699c31660c5d8..3a4c1b875c684 100644 --- a/app/code/Magento/Widget/composer.json +++ b/app/code/Magento/Widget/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-widget", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-cms": "0.42.0-beta3", "magento/module-core": "0.42.0-beta3", diff --git a/app/code/Magento/Wishlist/composer.json b/app/code/Magento/Wishlist/composer.json index c2cfe413a8556..d6dc5b534083e 100644 --- a/app/code/Magento/Wishlist/composer.json +++ b/app/code/Magento/Wishlist/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-wishlist", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-store": "0.42.0-beta3", "magento/module-customer": "0.42.0-beta3", "magento/module-catalog": "0.42.0-beta3", diff --git a/app/design/adminhtml/Magento/backend/composer.json b/app/design/adminhtml/Magento/backend/composer.json index 7f95ddc97973c..95c694e034fba 100644 --- a/app/design/adminhtml/Magento/backend/composer.json +++ b/app/design/adminhtml/Magento/backend/composer.json @@ -2,7 +2,7 @@ "name": "magento/theme-adminhtml-backend", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/framework": "0.42.0-beta3", "magento/magento-composer-installer": "*" }, diff --git a/app/design/frontend/Magento/blank/composer.json b/app/design/frontend/Magento/blank/composer.json index d906616da07e3..f6da390cca977 100644 --- a/app/design/frontend/Magento/blank/composer.json +++ b/app/design/frontend/Magento/blank/composer.json @@ -2,7 +2,7 @@ "name": "magento/theme-frontend-blank", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/framework": "0.42.0-beta3", "magento/magento-composer-installer": "*" }, diff --git a/app/design/frontend/Magento/luma/composer.json b/app/design/frontend/Magento/luma/composer.json index d0ac21fd996b3..3c8c3377313a6 100644 --- a/app/design/frontend/Magento/luma/composer.json +++ b/app/design/frontend/Magento/luma/composer.json @@ -2,7 +2,7 @@ "name": "magento/theme-frontend-luma", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/theme-frontend-blank": "0.42.0-beta3", "magento/framework": "0.42.0-beta3", "magento/magento-composer-installer": "*" diff --git a/composer.lock b/composer.lock index b2d6cf8b9bd13..f91dcc508eef9 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "19eac8fd6ecb4a7868d40ea31ad2a62b", + "hash": "0ea0b1b2f6f0a7fb58a4780375a1a440", "packages": [ { "name": "composer/composer", @@ -3143,8 +3143,9 @@ "phpmd/phpmd": 0 }, "prefer-stable": false, + "prefer-lowest": false, "platform": { - "php": "~5.4.11|~5.5.0" + "php": "~5.4.11|~5.5.0|~5.6.0" }, "platform-dev": { "lib-libxml": "*", From a6d0a0537c431bc0a9c6afcae29291ed85804896 Mon Sep 17 00:00:00 2001 From: Anup Dugar Date: Mon, 12 Jan 2015 11:06:08 -0600 Subject: [PATCH 41/44] MAGETWO-31999: oAuth issue [from github] - URemove unused optional parameter --- .../unit/testsuite/Magento/Oauth/OauthInputExceptionTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tests/unit/testsuite/Magento/Oauth/OauthInputExceptionTest.php b/dev/tests/unit/testsuite/Magento/Oauth/OauthInputExceptionTest.php index abbeb29c974c4..f5ee087e099ca 100644 --- a/dev/tests/unit/testsuite/Magento/Oauth/OauthInputExceptionTest.php +++ b/dev/tests/unit/testsuite/Magento/Oauth/OauthInputExceptionTest.php @@ -12,7 +12,7 @@ public function testGetAggregatedErrorMessage() foreach (['field1', 'field2'] as $param) { $exception->addError(OauthInputException::REQUIRED_FIELD, ['fieldName' => $param]); } - $exception->addError('Message with period.', ['fieldName' => 'field3']); + $exception->addError('Message with period.'); $this->assertEquals( 'field1 is a required field, field2 is a required field, Message with period', From b3094a3ec3b0a303b928f6d63162c678041ac216 Mon Sep 17 00:00:00 2001 From: Anup Dugar Date: Mon, 12 Jan 2015 15:51:51 -0600 Subject: [PATCH 42/44] MAGETWO-31999: oAuth issue [from github] - Copying and Copyright Year Update --- .../unit/testsuite/Magento/Oauth/OauthInputExceptionTest.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dev/tests/unit/testsuite/Magento/Oauth/OauthInputExceptionTest.php b/dev/tests/unit/testsuite/Magento/Oauth/OauthInputExceptionTest.php index f5ee087e099ca..6ed73ee0b7f97 100644 --- a/dev/tests/unit/testsuite/Magento/Oauth/OauthInputExceptionTest.php +++ b/dev/tests/unit/testsuite/Magento/Oauth/OauthInputExceptionTest.php @@ -1,6 +1,7 @@ Date: Mon, 12 Jan 2015 16:22:38 -0600 Subject: [PATCH 43/44] MAGETWO-31999: oAuth issue [from github] - Moved to the correct directory --- .../Magento/{ => Framework}/Oauth/OauthInputExceptionTest.php | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename dev/tests/unit/testsuite/Magento/{ => Framework}/Oauth/OauthInputExceptionTest.php (100%) diff --git a/dev/tests/unit/testsuite/Magento/Oauth/OauthInputExceptionTest.php b/dev/tests/unit/testsuite/Magento/Framework/Oauth/OauthInputExceptionTest.php similarity index 100% rename from dev/tests/unit/testsuite/Magento/Oauth/OauthInputExceptionTest.php rename to dev/tests/unit/testsuite/Magento/Framework/Oauth/OauthInputExceptionTest.php From a6825fa063c3ca8c5b7895875576ab5f28128530 Mon Sep 17 00:00:00 2001 From: Ievgen Shakhsuvarov Date: Tue, 13 Jan 2015 13:20:43 +0200 Subject: [PATCH 44/44] MAGETWO-26655: [TD] Compiler Can't Verify Case Sensitive Dependency --- .../Framework/Code/Reader/SourceArgumentsReaderTest.php | 3 ++- .../Code/Reader/_files/SourceArgumentsReaderTest.php.sample | 3 ++- .../Framework/Code/Validator/ConstructorArgumentTypesTest.php | 3 ++- .../Magento/Framework/Code/Reader/SourceArgumentsReader.php | 3 ++- .../Framework/Code/Validator/ConstructorArgumentTypes.php | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/SourceArgumentsReaderTest.php b/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/SourceArgumentsReaderTest.php index 92bef840df5d4..076d2ab396be5 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/SourceArgumentsReaderTest.php +++ b/dev/tests/integration/testsuite/Magento/Framework/Code/Reader/SourceArgumentsReaderTest.php @@ -1,6 +1,7 @@