From ef9d25538ebfed881b7bc579ea34d7d20b54e103 Mon Sep 17 00:00:00 2001 From: Vadim Zubovich Date: Thu, 4 Jun 2015 21:55:25 +0300 Subject: [PATCH 01/14] MAGNSWTC-2: Add product details renderer list support on Catalog category page. (cherry picked from commit ef69a948489681bec780a4ee8f46736449863007) --- .../Catalog/Block/Product/AbstractProduct.php | 43 +++++++++++++++++++ .../frontend/layout/catalog_category_view.xml | 3 ++ .../frontend/templates/product/list.phtml | 5 ++- 3 files changed, 49 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Catalog/Block/Product/AbstractProduct.php b/app/code/Magento/Catalog/Block/Product/AbstractProduct.php index 0b62afa09de34..dcab87ec01ab8 100644 --- a/app/code/Magento/Catalog/Block/Product/AbstractProduct.php +++ b/app/code/Magento/Catalog/Block/Product/AbstractProduct.php @@ -598,4 +598,47 @@ public function isRedirectToCartEnabled() \Magento\Store\Model\ScopeInterface::SCOPE_STORE ); } + + /** + * Retrieve product details html + * + * @param \Magento\Catalog\Model\Product $product + * @return mixed + */ + public function getDetailsHtml(\Magento\Catalog\Model\Product $product) + { + $renderer = $this + ->getDetailsRenderer($product->getTypeId()) + ->setProduct($product); + + return $renderer->toHtml(); + } + + /** + * @param null $type + * @return bool|\Magento\Framework\View\Element\AbstractBlock + */ + public function getDetailsRenderer($type = null) + { + if ($type === null) { + $type = 'default'; + } + $rendererList = $this->getDetailsRendererList(); + if (!$rendererList) { + throw new \RuntimeException('Details renderer list for block "' . $this->getNameInLayout() . '" is not defined'); + } + return $rendererList->getRenderer($type, 'default'); + } + + /** + * @return \Magento\Framework\View\Element\RendererList + */ + protected function getDetailsRendererList() + { + return $this->getDetailsRendererListName() ? $this->getLayout()->getBlock( + $this->getDetailsRendererListName() + ) : $this->getChildBlock( + 'details.renderers' + ); + } } diff --git a/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view.xml index f13c637c087fa..dbc1ff5933f3b 100644 --- a/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view.xml +++ b/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view.xml @@ -18,6 +18,9 @@ + + + diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml index 154454f16dbfe..98daed2a02672 100644 --- a/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml +++ b/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml @@ -69,6 +69,7 @@ $imageBlock = $block->getLayout()->createBlock('Magento\Catalog\Block\Product\I getReviewsSummaryHtml($_product, $templateType); ?> getProductPrice($_product) ?> + getDetailsHtml($_product); ?>
> @@ -94,7 +95,7 @@ $imageBlock = $block->getLayout()->createBlock('Magento\Catalog\Block\Product\I
> helper('Magento\Wishlist\Helper\Data')->isAllow()): ?> - getLayout()->createBlock('Magento\Catalog\Block\Product\I helper('Magento\Catalog\Helper\Product\Compare'); ?> - Date: Fri, 5 Jun 2015 22:39:10 +0300 Subject: [PATCH 02/14] MAGNSWTC-2: Add FrontendType - FrontendInputType bridge (cherry picked from commit 9b850fa6d963ec21e9ccb905f5dbe0ddf6eb622d) --- .../Resource/Product/Indexer/Eav/Source.php | 13 +++++- .../CatalogSearch/Model/Resource/Engine.php | 14 +++++- .../Eav/Model/Attribute/FrontendType.php | 45 +++++++++++++++++++ 3 files changed, 69 insertions(+), 3 deletions(-) create mode 100644 app/code/Magento/Eav/Model/Attribute/FrontendType.php diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Indexer/Eav/Source.php b/app/code/Magento/Catalog/Model/Resource/Product/Indexer/Eav/Source.php index 287847f4acf44..c2856a641f8ae 100644 --- a/app/code/Magento/Catalog/Model/Resource/Product/Indexer/Eav/Source.php +++ b/app/code/Magento/Catalog/Model/Resource/Product/Indexer/Eav/Source.php @@ -21,6 +21,11 @@ class Source extends AbstractEav */ protected $_resourceHelper; + /** + * @var \Magento\Eav\Model\Attribute\FrontendType + */ + protected $frontendType; + /** * Construct * @@ -35,9 +40,11 @@ public function __construct( \Magento\Eav\Model\Config $eavConfig, \Magento\Framework\Event\ManagerInterface $eventManager, \Magento\Catalog\Model\Resource\Helper $resourceHelper, + \Magento\Eav\Model\Attribute\FrontendType $frontendType, $resourcePrefix = null ) { $this->_resourceHelper = $resourceHelper; + $this->frontendType = $frontendType; parent::__construct($context, $eavConfig, $eventManager, $resourcePrefix); } @@ -71,9 +78,11 @@ protected function _getIndexableAttributes($multiSelect) ); if ($multiSelect == true) { - $select->where('ea.backend_type = ?', 'varchar')->where('ea.frontend_input = ?', 'multiselect'); + $select->where('ea.backend_type = ?', 'varchar') + ->where('ea.frontend_input in (?)', $this->frontendType->getInputs('multiselect')); } else { - $select->where('ea.backend_type = ?', 'int')->where('ea.frontend_input = ?', 'select'); + $select->where('ea.backend_type = ?', 'int') + ->where('ea.frontend_input in (?)', $this->frontendType->getInputs('select')); } return $this->_getReadAdapter()->fetchCol($select); diff --git a/app/code/Magento/CatalogSearch/Model/Resource/Engine.php b/app/code/Magento/CatalogSearch/Model/Resource/Engine.php index 8fb3a099d233d..134f1006f76d5 100644 --- a/app/code/Magento/CatalogSearch/Model/Resource/Engine.php +++ b/app/code/Magento/CatalogSearch/Model/Resource/Engine.php @@ -30,6 +30,11 @@ class Engine extends AbstractDb implements EngineInterface */ protected $productFactoryNames; + /** + * @var \Magento\Eav\Model\Attribute\FrontendType + */ + protected $frontendType; + /** * Catalog search data * @@ -51,11 +56,13 @@ public function __construct( \Magento\Catalog\Model\Product\Visibility $catalogProductVisibility, \Magento\CatalogSearch\Model\Resource\Advanced $searchResource, \Magento\CatalogSearch\Helper\Data $catalogSearchData, + \Magento\Eav\Model\Attribute\FrontendType $frontendType, $resourcePrefix = null ) { $this->_catalogProductVisibility = $catalogProductVisibility; $this->_searchResource = $searchResource; $this->_catalogSearchData = $catalogSearchData; + $this->frontendType = $frontendType; parent::__construct($context, $resourcePrefix); } @@ -148,10 +155,15 @@ public function allowAdvancedIndex() */ private function isTermFilterableAttribute($attribute) { + $inputTypes = array_merge( + $this->frontendType->getInputs('select'), + $this->frontendType->getInputs('multiselect') + ); + return ($attribute->getIsVisibleInAdvancedSearch() || $attribute->getIsFilterable() || $attribute->getIsFilterableInSearch()) - && in_array($attribute->getFrontendInput(), ['select', 'multiselect']); + && in_array($attribute->getFrontendInput(), $inputTypes); } /** diff --git a/app/code/Magento/Eav/Model/Attribute/FrontendType.php b/app/code/Magento/Eav/Model/Attribute/FrontendType.php new file mode 100644 index 0000000000000..0decac13cf98a --- /dev/null +++ b/app/code/Magento/Eav/Model/Attribute/FrontendType.php @@ -0,0 +1,45 @@ +config = $config; + } + + /** + * Return list of input types by frontend type + * + * @param $inputType + * @return string + */ + public function getType($inputType) + { + return array_search($inputType, $this->config); + } + + /** + * Return frontend type by input type + * + * @param string $frontendType + * @return string[] + */ + public function getInputs($frontendType) + { + if (isset($this->config[$frontendType]) && is_array($this->config[$frontendType])) { + return array_values($this->config[$frontendType]); + } + return [$frontendType]; + } +} From a107752efcdc1b8882fd08eafbccd0e790724463 Mon Sep 17 00:00:00 2001 From: Vadim Zubovich Date: Wed, 3 Jun 2015 20:18:24 +0300 Subject: [PATCH 03/14] Changes in CE (cherry picked from commit 081cb08102e5ddbc73c0207e61ca04ac52cb9885) --- .../Model/SuggestedAttributeList.php | 62 +++++++++++++++---- .../frontend/Magento/blank/etc/view.xml | 8 +++ app/design/frontend/Magento/luma/etc/view.xml | 8 +++ 3 files changed, 67 insertions(+), 11 deletions(-) diff --git a/app/code/Magento/ConfigurableProduct/Model/SuggestedAttributeList.php b/app/code/Magento/ConfigurableProduct/Model/SuggestedAttributeList.php index 5a47edceda3f8..610d597a08ad7 100644 --- a/app/code/Magento/ConfigurableProduct/Model/SuggestedAttributeList.php +++ b/app/code/Magento/ConfigurableProduct/Model/SuggestedAttributeList.php @@ -14,25 +14,45 @@ class SuggestedAttributeList * * @var \Magento\Catalog\Model\Resource\Product\Attribute\CollectionFactory */ - protected $_attributeColFactory; + protected $attributeCollectionFactory; /** * Catalog resource helper * * @var \Magento\Catalog\Model\Resource\Helper */ - protected $_resourceHelper; + protected $resourceHelper; /** - * @param \Magento\Catalog\Model\Resource\Product\Attribute\CollectionFactory $attributeColFactory + * Application Event Dispatcher + * + * @var \Magento\Framework\Event\ManagerInterface + */ + protected $eventManager; + + /** + * Object Factory + * + * @var \Magento\Framework\ObjectFactory + */ + protected $objectFactory; + + /** + * @param \Magento\Catalog\Model\Resource\Product\Attribute\CollectionFactory $attributeCollectionFactory * @param \Magento\Catalog\Model\Resource\Helper $resourceHelper + * @param \Magento\Framework\Event\ManagerInterface $eventManager + * @param \Magento\Framework\ObjectFactory $objectFactory */ public function __construct( - \Magento\Catalog\Model\Resource\Product\Attribute\CollectionFactory $attributeColFactory, - \Magento\Catalog\Model\Resource\Helper $resourceHelper + \Magento\Catalog\Model\Resource\Product\Attribute\CollectionFactory $attributeCollectionFactory, + \Magento\Catalog\Model\Resource\Helper $resourceHelper, + \Magento\Framework\Event\ManagerInterface $eventManager, + \Magento\Framework\ObjectFactory $objectFactory ) { - $this->_attributeColFactory = $attributeColFactory; - $this->_resourceHelper = $resourceHelper; + $this->attributeCollectionFactory = $attributeCollectionFactory; + $this->resourceHelper = $resourceHelper; + $this->objectFactory = $objectFactory; + $this->eventManager = $eventManager; } /** @@ -43,12 +63,14 @@ public function __construct( */ public function getSuggestedAttributes($labelPart) { - $escapedLabelPart = $this->_resourceHelper->addLikeEscape($labelPart, ['position' => 'any']); + $escapedLabelPart = $this->resourceHelper->addLikeEscape($labelPart, ['position' => 'any']); + $availableFrontendTypes = $this->getAvailableFrontendTypes(); + /** @var $collection \Magento\Catalog\Model\Resource\Product\Attribute\Collection */ - $collection = $this->_attributeColFactory->create(); + $collection = $this->attributeCollectionFactory->create(); $collection->addFieldToFilter( - 'frontend_input', - 'select' + 'main_table.frontend_input', + ['in' => $availableFrontendTypes->getData('values')] )->addFieldToFilter( 'frontend_label', ['like' => $escapedLabelPart] @@ -79,4 +101,22 @@ public function getSuggestedAttributes($labelPart) } return $result; } + + /** + * @return \Magento\Framework\Object + */ + private function getAvailableFrontendTypes() + { + $availableFrontendTypes = $this->objectFactory->create(); + $availableFrontendTypes->setData( + [ + 'values' => ['select'] + ] + ); + $this->eventManager->dispatch( + 'product_suggested_attribute_frontend_type_init_after', + ['types_dto' => $availableFrontendTypes] + ); + return $availableFrontendTypes; + } } diff --git a/app/design/frontend/Magento/blank/etc/view.xml b/app/design/frontend/Magento/blank/etc/view.xml index 84c78279b3c69..b9864e298b7df 100644 --- a/app/design/frontend/Magento/blank/etc/view.xml +++ b/app/design/frontend/Magento/blank/etc/view.xml @@ -185,6 +185,14 @@ 76 1 76 + + 30 + 0.8 + 20 + + 110 + 0.8 + 90 58 diff --git a/app/design/frontend/Magento/luma/etc/view.xml b/app/design/frontend/Magento/luma/etc/view.xml index a72c461ffa06f..1d3fb18268ee0 100644 --- a/app/design/frontend/Magento/luma/etc/view.xml +++ b/app/design/frontend/Magento/luma/etc/view.xml @@ -190,6 +190,14 @@ 76 1 76 + + 30 + 0.8 + 20 + + 110 + 0.8 + 90 58 From 961b3d3a2c573cee212b22437bd0d0914b8ab2e2 Mon Sep 17 00:00:00 2001 From: Vadim Zubovich Date: Tue, 9 Jun 2015 20:24:58 +0300 Subject: [PATCH 04/14] MAGNSWTC-42: Resolve naming issue for descendent classes --- app/code/Magento/Catalog/Block/Product/AbstractProduct.php | 2 +- .../Magento/Catalog/view/frontend/templates/product/list.phtml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Catalog/Block/Product/AbstractProduct.php b/app/code/Magento/Catalog/Block/Product/AbstractProduct.php index dcab87ec01ab8..016866f4f1ab1 100644 --- a/app/code/Magento/Catalog/Block/Product/AbstractProduct.php +++ b/app/code/Magento/Catalog/Block/Product/AbstractProduct.php @@ -605,7 +605,7 @@ public function isRedirectToCartEnabled() * @param \Magento\Catalog\Model\Product $product * @return mixed */ - public function getDetailsHtml(\Magento\Catalog\Model\Product $product) + public function getProductDetailsHtml(\Magento\Catalog\Model\Product $product) { $renderer = $this ->getDetailsRenderer($product->getTypeId()) diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml index 98daed2a02672..c376d81d7fae3 100644 --- a/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml +++ b/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml @@ -69,7 +69,7 @@ $imageBlock = $block->getLayout()->createBlock('Magento\Catalog\Block\Product\I getReviewsSummaryHtml($_product, $templateType); ?> getProductPrice($_product) ?> - getDetailsHtml($_product); ?> + getProductDetailsHtml($_product); ?>
> From 025e430150b9d2dd545df3c4cca208023402bba7 Mon Sep 17 00:00:00 2001 From: Alexandr Skrashuk Date: Wed, 10 Jun 2015 18:14:51 +0300 Subject: [PATCH 05/14] MAGNSWTCH-118: unittest - fix for additional construct incoming params --- .../Unit/Model/SuggestedAttributeListTest.php | 39 ++++++++++++++++++- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/SuggestedAttributeListTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/SuggestedAttributeListTest.php index cf9344a03bb5c..72ee34783301e 100644 --- a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/SuggestedAttributeListTest.php +++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/SuggestedAttributeListTest.php @@ -20,6 +20,16 @@ class SuggestedAttributeListTest extends \PHPUnit_Framework_TestCase */ protected $attributeFactoryMock; + /** + * @var \PHPUnit_Framework_MockObject_MockObject + */ + protected $eventManagerMock; + + /** + * @var \PHPUnit_Framework_MockObject_MockObject + */ + protected $objectFactoryMock; + /** * @var \PHPUnit_Framework_MockObject_MockObject */ @@ -53,6 +63,20 @@ protected function setUp() '', false ); + $this->eventManagerMock = $this->getMock( + '\Magento\Framework\Event\ManagerInterface', + [], + [], + '', + false + ); + $this->objectFactoryMock = $this->getMock( + '\Magento\Framework\ObjectFactory', + ['create'], + [], + '', + false + ); $this->collectionMock = $this->getMock( 'Magento\Catalog\Model\Resource\Product\Attribute\Collection', [], @@ -78,7 +102,7 @@ protected function setUp() $this->returnValue($this->collectionMock) ); $valueMap = [ - ['frontend_input', 'select', $this->collectionMock], + ['main_table.frontend_input', ['in' => 123 ], $this->collectionMock], ['frontend_label', ['like' => $this->labelPart], $this->collectionMock], ['is_user_defined', 1, $this->collectionMock], ['is_global', \Magento\Catalog\Model\Resource\Eav\Attribute::SCOPE_GLOBAL, $this->collectionMock], @@ -107,12 +131,19 @@ protected function setUp() ); $this->suggestedListModel = new \Magento\ConfigurableProduct\Model\SuggestedAttributeList( $this->attributeFactoryMock, - $this->resourceHelperMock + $this->resourceHelperMock, + $this->eventManagerMock, + $this->objectFactoryMock ); } public function testGetSuggestedAttributesIfTheyApplicable() { + $object = $this->getMock('\Magento\Framework\Object', [], [], '', false); + $object->expects($this->once())->method('setData'); + $object->expects($this->once())->method('getData')->willReturn(123); + $this->objectFactoryMock->expects($this->once())->method('create')->willReturn($object); + $source = $this->getMock( 'Magento\Eav\Model\Entity\Attribute\Source\AbstractSource', [], @@ -132,6 +163,10 @@ public function testGetSuggestedAttributesIfTheyApplicable() public function testGetSuggestedAttributesIfTheyNotApplicable() { + $object = $this->getMock('\Magento\Framework\Object', [], [], '', false); + $object->expects($this->once())->method('setData'); + $object->expects($this->once())->method('getData')->willReturn(123); + $this->objectFactoryMock->expects($this->once())->method('create')->willReturn($object); $this->attributeMock->expects($this->any())->method('getApplyTo')->will($this->returnValue(['simple'])); $this->attributeMock->expects($this->never())->method('getId'); $this->attributeMock->expects($this->never())->method('getFrontendLabel'); From 0713375d4e9f53bf3b04de462c1a2d9d8bce6f5c Mon Sep 17 00:00:00 2001 From: Alexandr Skrashuk Date: Thu, 11 Jun 2015 18:30:55 +0300 Subject: [PATCH 06/14] MAGNSWTCH-139: module added to composer json --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index d238b3a9cc5bb..2159bcf6a5c0a 100644 --- a/composer.json +++ b/composer.json @@ -131,6 +131,7 @@ "magento/module-shipping": "self.version", "magento/module-sitemap": "self.version", "magento/module-store": "self.version", + "magento/module-swatches": "self.version", "magento/module-tax": "self.version", "magento/module-tax-import-export": "self.version", "magento/module-theme": "self.version", From b03080d01387557e52a27e5d53cbdd94cd190d3e Mon Sep 17 00:00:00 2001 From: Vadim Zubovich Date: Mon, 15 Jun 2015 13:40:20 +0300 Subject: [PATCH 07/14] MAGNSWTCH-139: PR stabilization --- composer.json | 1 - dev/tests/static/testsuite/Magento/Test/Legacy/LayoutTest.php | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 76d5a7afa095d..16c402a54851f 100644 --- a/composer.json +++ b/composer.json @@ -132,7 +132,6 @@ "magento/module-shipping": "self.version", "magento/module-sitemap": "self.version", "magento/module-store": "self.version", - "magento/module-swatches": "self.version", "magento/module-tax": "self.version", "magento/module-tax-import-export": "self.version", "magento/module-theme": "self.version", diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/LayoutTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/LayoutTest.php index 28353e7f95313..751ffc6cb8c6f 100644 --- a/dev/tests/static/testsuite/Magento/Test/Legacy/LayoutTest.php +++ b/dev/tests/static/testsuite/Magento/Test/Legacy/LayoutTest.php @@ -349,7 +349,8 @@ public function getAllowedActionNodeMethods() 'setWrapperClass', 'unsetChild', 'unsetChildren', - 'updateButton' + 'updateButton', + 'setIsProductListingContext' ]; } } From b0a533d96c1d6f3c7722632c381c44aa53cc8812 Mon Sep 17 00:00:00 2001 From: Vadim Zubovich Date: Mon, 15 Jun 2015 14:00:58 +0300 Subject: [PATCH 08/14] MAGNSWTCH-139: PR stabilization - phpdocs fixes --- .../Catalog/Model/Resource/Product/Indexer/Eav/Source.php | 3 ++- app/code/Magento/Eav/Model/Attribute/FrontendType.php | 8 +++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Indexer/Eav/Source.php b/app/code/Magento/Catalog/Model/Resource/Product/Indexer/Eav/Source.php index c2856a641f8ae..caa0358591351 100644 --- a/app/code/Magento/Catalog/Model/Resource/Product/Indexer/Eav/Source.php +++ b/app/code/Magento/Catalog/Model/Resource/Product/Indexer/Eav/Source.php @@ -33,7 +33,8 @@ class Source extends AbstractEav * @param \Magento\Eav\Model\Config $eavConfig * @param \Magento\Framework\Event\ManagerInterface $eventManager * @param \Magento\Catalog\Model\Resource\Helper $resourceHelper - * @param string|null $resourcePrefix + * @param \Magento\Eav\Model\Attribute\FrontendType $frontendType + * @param null $resourcePrefix */ public function __construct( \Magento\Framework\Model\Resource\Db\Context $context, diff --git a/app/code/Magento/Eav/Model/Attribute/FrontendType.php b/app/code/Magento/Eav/Model/Attribute/FrontendType.php index 0decac13cf98a..798f19e6e1655 100644 --- a/app/code/Magento/Eav/Model/Attribute/FrontendType.php +++ b/app/code/Magento/Eav/Model/Attribute/FrontendType.php @@ -11,8 +11,14 @@ */ class FrontendType { + /** + * @var array + */ private $config; + /** + * @param array $config + */ public function __construct($config = []) { $this->config = $config; @@ -21,7 +27,7 @@ public function __construct($config = []) /** * Return list of input types by frontend type * - * @param $inputType + * @param string $inputType * @return string */ public function getType($inputType) From 528a394b21ab483ae8d14cb9b38555e0e847eeb3 Mon Sep 17 00:00:00 2001 From: Vadim Zubovich Date: Mon, 15 Jun 2015 14:15:20 +0300 Subject: [PATCH 09/14] MAGNSWTCH-139: composer.lock updated --- composer.lock | 627 +++++++++++++++++++++++++++++--------------------- 1 file changed, 360 insertions(+), 267 deletions(-) diff --git a/composer.lock b/composer.lock index cabae2f7f0851..89bae8e9e2559 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "1d4847958d7943ffae419e92ebd75c11", + "hash": "aafa184489a3748b29fb8dfff12437cc", "packages": [ { "name": "composer/composer", @@ -76,20 +76,20 @@ }, { "name": "justinrainbow/json-schema", - "version": "1.4.1", + "version": "1.4.2", "source": { "type": "git", "url": "https://github.com/justinrainbow/json-schema.git", - "reference": "2465fe486c864e30badaa4d005ebdf89dbc503f3" + "reference": "7dfe4f1db8a62be3dd35710efce663537d515653" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/2465fe486c864e30badaa4d005ebdf89dbc503f3", - "reference": "2465fe486c864e30badaa4d005ebdf89dbc503f3", + "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/7dfe4f1db8a62be3dd35710efce663537d515653", + "reference": "7dfe4f1db8a62be3dd35710efce663537d515653", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": ">=5.3.2" }, "require-dev": { "json-schema/json-schema-test-suite": "1.1.0", @@ -138,7 +138,7 @@ "json", "schema" ], - "time": "2015-03-27 16:41:39" + "time": "2015-06-14 20:01:28" }, { "name": "magento/magento-composer-installer", @@ -261,7 +261,7 @@ "ZF1", "framework" ], - "time": "2015-02-06 17:25:45" + "time": "2015-06-02 08:04:41" }, { "name": "monolog/monolog", @@ -480,16 +480,16 @@ }, { "name": "symfony/console", - "version": "v2.7.0", + "version": "v2.7.1", "source": { "type": "git", "url": "https://github.com/symfony/Console.git", - "reference": "7f0bec04961c61c961df0cb8c2ae88dbfd83f399" + "reference": "564398bc1f33faf92fc2ec86859983d30eb81806" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Console/zipball/7f0bec04961c61c961df0cb8c2ae88dbfd83f399", - "reference": "7f0bec04961c61c961df0cb8c2ae88dbfd83f399", + "url": "https://api.github.com/repos/symfony/Console/zipball/564398bc1f33faf92fc2ec86859983d30eb81806", + "reference": "564398bc1f33faf92fc2ec86859983d30eb81806", "shasum": "" }, "require": { @@ -533,20 +533,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2015-05-29 16:22:24" + "time": "2015-06-10 15:30:22" }, { "name": "symfony/finder", - "version": "v2.7.0", + "version": "v2.7.1", "source": { "type": "git", "url": "https://github.com/symfony/Finder.git", - "reference": "ccb8ed8339cf24824f2ef35dacec30d92ff44368" + "reference": "c13a40d638aeede1e8400f8c956c7f9246c05f75" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Finder/zipball/ccb8ed8339cf24824f2ef35dacec30d92ff44368", - "reference": "ccb8ed8339cf24824f2ef35dacec30d92ff44368", + "url": "https://api.github.com/repos/symfony/Finder/zipball/c13a40d638aeede1e8400f8c956c7f9246c05f75", + "reference": "c13a40d638aeede1e8400f8c956c7f9246c05f75", "shasum": "" }, "require": { @@ -582,20 +582,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2015-05-15 14:02:48" + "time": "2015-06-04 20:11:48" }, { "name": "symfony/process", - "version": "v2.7.0", + "version": "v2.7.1", "source": { "type": "git", "url": "https://github.com/symfony/Process.git", - "reference": "e0a82b58e36afc60f8e79b8bc85a22bb064077c1" + "reference": "552d8efdc80980cbcca50b28d626ac8e36e3cdd1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Process/zipball/e0a82b58e36afc60f8e79b8bc85a22bb064077c1", - "reference": "e0a82b58e36afc60f8e79b8bc85a22bb064077c1", + "url": "https://api.github.com/repos/symfony/Process/zipball/552d8efdc80980cbcca50b28d626ac8e36e3cdd1", + "reference": "552d8efdc80980cbcca50b28d626ac8e36e3cdd1", "shasum": "" }, "require": { @@ -631,7 +631,7 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2015-05-15 13:33:16" + "time": "2015-06-08 09:37:21" }, { "name": "tubalmartin/cssmin", @@ -682,13 +682,13 @@ "version": "2.4.0", "source": { "type": "git", - "url": "https://github.com/zendframework/Component_ZendCode.git", - "reference": "cfd5951ff4348e4430850560416c7ddb755f95d3" + "url": "https://github.com/zendframework/zend-code.git", + "reference": "0ed94f842ba60cdc900c46a61bdbd7ac95a3e140" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/Component_ZendCode/zipball/cfd5951ff4348e4430850560416c7ddb755f95d3", - "reference": "cfd5951ff4348e4430850560416c7ddb755f95d3", + "url": "https://api.github.com/repos/zendframework/zend-code/zipball/0ed94f842ba60cdc900c46a61bdbd7ac95a3e140", + "reference": "0ed94f842ba60cdc900c46a61bdbd7ac95a3e140", "shasum": "" }, "require": { @@ -697,6 +697,9 @@ }, "require-dev": { "doctrine/common": ">=2.1", + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "satooshi/php-coveralls": "dev-master", "zendframework/zend-stdlib": "self.version" }, "suggest": { @@ -712,7 +715,7 @@ }, "autoload": { "psr-4": { - "Zend\\Code\\": "" + "Zend\\Code\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -720,25 +723,25 @@ "BSD-3-Clause" ], "description": "provides facilities to generate arbitrary code using an object oriented interface", - "homepage": "https://github.com/zendframework/zf2", + "homepage": "https://github.com/zendframework/zend-code", "keywords": [ "code", "zf2" ], - "time": "2015-04-01 17:59:08" + "time": "2015-03-31 15:39:14" }, { "name": "zendframework/zend-config", "version": "2.4.0", "source": { "type": "git", - "url": "https://github.com/zendframework/Component_ZendConfig.git", - "reference": "8682fe4e2923b383bb6472fc84b5796a07589163" + "url": "https://github.com/zendframework/zend-config.git", + "reference": "95f3a4b3fa85d49e6f060183122de4596fa6d29d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/Component_ZendConfig/zipball/8682fe4e2923b383bb6472fc84b5796a07589163", - "reference": "8682fe4e2923b383bb6472fc84b5796a07589163", + "url": "https://api.github.com/repos/zendframework/zend-config/zipball/95f3a4b3fa85d49e6f060183122de4596fa6d29d", + "reference": "95f3a4b3fa85d49e6f060183122de4596fa6d29d", "shasum": "" }, "require": { @@ -746,6 +749,9 @@ "zendframework/zend-stdlib": "self.version" }, "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "satooshi/php-coveralls": "dev-master", "zendframework/zend-filter": "self.version", "zendframework/zend-i18n": "self.version", "zendframework/zend-json": "self.version", @@ -766,7 +772,7 @@ }, "autoload": { "psr-4": { - "Zend\\Config\\": "" + "Zend\\Config\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -774,31 +780,36 @@ "BSD-3-Clause" ], "description": "provides a nested object property based user interface for accessing this configuration data within application code", - "homepage": "https://github.com/zendframework/zf2", + "homepage": "https://github.com/zendframework/zend-config", "keywords": [ "config", "zf2" ], - "time": "2015-04-01 17:59:31" + "time": "2015-03-25 20:55:48" }, { "name": "zendframework/zend-console", "version": "2.4.0", "source": { "type": "git", - "url": "https://github.com/zendframework/Component_ZendConsole.git", - "reference": "94ab6663b07e19f20b3319ecf317bd72b6a72dca" + "url": "https://github.com/zendframework/zend-console.git", + "reference": "54823d9ba6f8ce39046384ee5a043b5b3d5f56d7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/Component_ZendConsole/zipball/94ab6663b07e19f20b3319ecf317bd72b6a72dca", - "reference": "94ab6663b07e19f20b3319ecf317bd72b6a72dca", + "url": "https://api.github.com/repos/zendframework/zend-console/zipball/54823d9ba6f8ce39046384ee5a043b5b3d5f56d7", + "reference": "54823d9ba6f8ce39046384ee5a043b5b3d5f56d7", "shasum": "" }, "require": { "php": ">=5.3.23", "zendframework/zend-stdlib": "self.version" }, + "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "satooshi/php-coveralls": "dev-master" + }, "suggest": { "zendframework/zend-filter": "To support DefaultRouteMatcher usage", "zendframework/zend-validator": "To support DefaultRouteMatcher usage" @@ -812,32 +823,32 @@ }, "autoload": { "psr-4": { - "Zend\\Console\\": "" + "Zend\\Console\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], - "homepage": "https://github.com/zendframework/zf2", + "homepage": "https://github.com/zendframework/zend-console", "keywords": [ "console", "zf2" ], - "time": "2015-04-01 17:59:48" + "time": "2015-03-25 20:55:48" }, { "name": "zendframework/zend-di", "version": "2.4.0", "source": { "type": "git", - "url": "https://github.com/zendframework/Component_ZendDi.git", - "reference": "0811f2a67ad0b50dfb8d602ed67cde0b82249190" + "url": "https://github.com/zendframework/zend-di.git", + "reference": "b9f8de081adecf71a003a569e9ba76c0a4c00bf2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/Component_ZendDi/zipball/0811f2a67ad0b50dfb8d602ed67cde0b82249190", - "reference": "0811f2a67ad0b50dfb8d602ed67cde0b82249190", + "url": "https://api.github.com/repos/zendframework/zend-di/zipball/b9f8de081adecf71a003a569e9ba76c0a4c00bf2", + "reference": "b9f8de081adecf71a003a569e9ba76c0a4c00bf2", "shasum": "" }, "require": { @@ -846,6 +857,9 @@ "zendframework/zend-stdlib": "self.version" }, "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "satooshi/php-coveralls": "dev-master", "zendframework/zend-servicemanager": "self.version" }, "suggest": { @@ -860,37 +874,42 @@ }, "autoload": { "psr-4": { - "Zend\\Di\\": "" + "Zend\\Di\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], - "homepage": "https://github.com/zendframework/zf2", + "homepage": "https://github.com/zendframework/zend-di", "keywords": [ "di", "zf2" ], - "time": "2015-04-01 18:01:30" + "time": "2015-03-25 20:55:48" }, { "name": "zendframework/zend-escaper", "version": "2.4.0", "source": { "type": "git", - "url": "https://github.com/zendframework/Component_ZendEscaper.git", - "reference": "65b3328627362b0be1d5e9067bc846511d1fbc96" + "url": "https://github.com/zendframework/zend-escaper.git", + "reference": "15e5769e4fcdb4bf07ebd76500810e7070e23a97" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/Component_ZendEscaper/zipball/65b3328627362b0be1d5e9067bc846511d1fbc96", - "reference": "65b3328627362b0be1d5e9067bc846511d1fbc96", + "url": "https://api.github.com/repos/zendframework/zend-escaper/zipball/15e5769e4fcdb4bf07ebd76500810e7070e23a97", + "reference": "15e5769e4fcdb4bf07ebd76500810e7070e23a97", "shasum": "" }, "require": { "php": ">=5.3.23" }, + "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "satooshi/php-coveralls": "dev-master" + }, "type": "library", "extra": { "branch-alias": { @@ -900,38 +919,43 @@ }, "autoload": { "psr-4": { - "Zend\\Escaper\\": "" + "Zend\\Escaper\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], - "homepage": "https://github.com/zendframework/zf2", + "homepage": "https://github.com/zendframework/zend-escaper", "keywords": [ "escaper", "zf2" ], - "time": "2015-04-01 18:02:07" + "time": "2015-03-23 18:29:14" }, { "name": "zendframework/zend-eventmanager", "version": "2.4.0", "source": { "type": "git", - "url": "https://github.com/zendframework/Component_ZendEventManager.git", - "reference": "38df5b567d4ff4d22144745c503ba0502d0d5695" + "url": "https://github.com/zendframework/zend-eventmanager.git", + "reference": "58d21c95c7005a527262fd536499195f104e83f9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/Component_ZendEventManager/zipball/38df5b567d4ff4d22144745c503ba0502d0d5695", - "reference": "38df5b567d4ff4d22144745c503ba0502d0d5695", + "url": "https://api.github.com/repos/zendframework/zend-eventmanager/zipball/58d21c95c7005a527262fd536499195f104e83f9", + "reference": "58d21c95c7005a527262fd536499195f104e83f9", "shasum": "" }, "require": { "php": ">=5.3.23", "zendframework/zend-stdlib": "self.version" }, + "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "satooshi/php-coveralls": "dev-master" + }, "type": "library", "extra": { "branch-alias": { @@ -941,32 +965,32 @@ }, "autoload": { "psr-4": { - "Zend\\EventManager\\": "" + "Zend\\EventManager\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], - "homepage": "https://github.com/zendframework/zf2", + "homepage": "https://github.com/zendframework/zend-event-manager", "keywords": [ "eventmanager", "zf2" ], - "time": "2015-04-01 18:05:26" + "time": "2015-03-23 18:29:14" }, { "name": "zendframework/zend-filter", "version": "2.4.0", "source": { "type": "git", - "url": "https://github.com/zendframework/Component_ZendFilter.git", - "reference": "b13741a88553351fc52472de529b57b580b8f6f1" + "url": "https://github.com/zendframework/zend-filter.git", + "reference": "6d8aed2da81b62a04747346c4370562cdbe34595" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/Component_ZendFilter/zipball/b13741a88553351fc52472de529b57b580b8f6f1", - "reference": "b13741a88553351fc52472de529b57b580b8f6f1", + "url": "https://api.github.com/repos/zendframework/zend-filter/zipball/6d8aed2da81b62a04747346c4370562cdbe34595", + "reference": "6d8aed2da81b62a04747346c4370562cdbe34595", "shasum": "" }, "require": { @@ -974,6 +998,9 @@ "zendframework/zend-stdlib": "self.version" }, "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "satooshi/php-coveralls": "dev-master", "zendframework/zend-crypt": "self.version", "zendframework/zend-servicemanager": "self.version", "zendframework/zend-uri": "self.version" @@ -993,7 +1020,7 @@ }, "autoload": { "psr-4": { - "Zend\\Filter\\": "" + "Zend\\Filter\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -1001,25 +1028,25 @@ "BSD-3-Clause" ], "description": "provides a set of commonly needed data filters", - "homepage": "https://github.com/zendframework/zf2", + "homepage": "https://github.com/zendframework/zend-filter", "keywords": [ "filter", "zf2" ], - "time": "2015-04-01 18:09:25" + "time": "2015-03-25 20:55:48" }, { "name": "zendframework/zend-form", "version": "2.4.0", "source": { "type": "git", - "url": "https://github.com/zendframework/Component_ZendForm.git", - "reference": "09f5bd46ffbf783df22281898e2175b291bd43a3" + "url": "https://github.com/zendframework/zend-form.git", + "reference": "bca0db55718355d25c2c10fdd41a83561f1c94b3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/Component_ZendForm/zipball/09f5bd46ffbf783df22281898e2175b291bd43a3", - "reference": "09f5bd46ffbf783df22281898e2175b291bd43a3", + "url": "https://api.github.com/repos/zendframework/zend-form/zipball/bca0db55718355d25c2c10fdd41a83561f1c94b3", + "reference": "bca0db55718355d25c2c10fdd41a83561f1c94b3", "shasum": "" }, "require": { @@ -1028,6 +1055,9 @@ "zendframework/zend-stdlib": "self.version" }, "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "satooshi/php-coveralls": "dev-master", "zendframework/zend-captcha": "self.version", "zendframework/zend-code": "self.version", "zendframework/zend-eventmanager": "self.version", @@ -1058,32 +1088,32 @@ }, "autoload": { "psr-4": { - "Zend\\Form\\": "" + "Zend\\Form\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], - "homepage": "https://github.com/zendframework/zf2", + "homepage": "https://github.com/zendframework/zend-form", "keywords": [ "form", "zf2" ], - "time": "2015-04-01 18:09:25" + "time": "2015-03-28 20:29:18" }, { "name": "zendframework/zend-http", "version": "2.4.0", "source": { "type": "git", - "url": "https://github.com/zendframework/Component_ZendHttp.git", - "reference": "ee6220609845b32d1b2873c9ac694aef56d508f5" + "url": "https://github.com/zendframework/zend-http.git", + "reference": "9c6047a0bdb3094d3ea07a215ff929cc47de4deb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/Component_ZendHttp/zipball/ee6220609845b32d1b2873c9ac694aef56d508f5", - "reference": "ee6220609845b32d1b2873c9ac694aef56d508f5", + "url": "https://api.github.com/repos/zendframework/zend-http/zipball/9c6047a0bdb3094d3ea07a215ff929cc47de4deb", + "reference": "9c6047a0bdb3094d3ea07a215ff929cc47de4deb", "shasum": "" }, "require": { @@ -1093,6 +1123,11 @@ "zendframework/zend-uri": "self.version", "zendframework/zend-validator": "self.version" }, + "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "satooshi/php-coveralls": "dev-master" + }, "type": "library", "extra": { "branch-alias": { @@ -1102,7 +1137,7 @@ }, "autoload": { "psr-4": { - "Zend\\Http\\": "" + "Zend\\Http\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -1110,25 +1145,25 @@ "BSD-3-Clause" ], "description": "provides an easy interface for performing Hyper-Text Transfer Protocol (HTTP) requests", - "homepage": "https://github.com/zendframework/zf2", + "homepage": "https://github.com/zendframework/zend-http", "keywords": [ "http", "zf2" ], - "time": "2015-04-01 18:09:25" + "time": "2015-03-27 15:46:30" }, { "name": "zendframework/zend-i18n", "version": "2.4.0", "source": { "type": "git", - "url": "https://github.com/zendframework/Component_ZendI18n.git", - "reference": "33051775d9a8c341fe3b77d1f3daa0e921e2f4bd" + "url": "https://github.com/zendframework/zend-i18n.git", + "reference": "9aebc5287373a802540d75fe5508417f866c2e52" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/Component_ZendI18n/zipball/33051775d9a8c341fe3b77d1f3daa0e921e2f4bd", - "reference": "33051775d9a8c341fe3b77d1f3daa0e921e2f4bd", + "url": "https://api.github.com/repos/zendframework/zend-i18n/zipball/9aebc5287373a802540d75fe5508417f866c2e52", + "reference": "9aebc5287373a802540d75fe5508417f866c2e52", "shasum": "" }, "require": { @@ -1136,6 +1171,9 @@ "zendframework/zend-stdlib": "self.version" }, "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "satooshi/php-coveralls": "dev-master", "zendframework/zend-cache": "self.version", "zendframework/zend-config": "self.version", "zendframework/zend-eventmanager": "self.version", @@ -1164,32 +1202,32 @@ }, "autoload": { "psr-4": { - "Zend\\I18n\\": "" + "Zend\\I18n\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], - "homepage": "https://github.com/zendframework/zf2", + "homepage": "https://github.com/zendframework/zend-i18n", "keywords": [ "i18n", "zf2" ], - "time": "2015-04-01 18:09:26" + "time": "2015-03-25 20:55:48" }, { "name": "zendframework/zend-inputfilter", "version": "2.4.0", "source": { "type": "git", - "url": "https://github.com/zendframework/Component_ZendInputFilter.git", - "reference": "16856fec61f285e41e5492235220a4dec06ab90f" + "url": "https://github.com/zendframework/zend-inputfilter.git", + "reference": "4b1398f3635fae3cc5e873c5bb067274f3d10a93" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/Component_ZendInputFilter/zipball/16856fec61f285e41e5492235220a4dec06ab90f", - "reference": "16856fec61f285e41e5492235220a4dec06ab90f", + "url": "https://api.github.com/repos/zendframework/zend-inputfilter/zipball/4b1398f3635fae3cc5e873c5bb067274f3d10a93", + "reference": "4b1398f3635fae3cc5e873c5bb067274f3d10a93", "shasum": "" }, "require": { @@ -1199,6 +1237,9 @@ "zendframework/zend-validator": "self.version" }, "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "satooshi/php-coveralls": "dev-master", "zendframework/zend-servicemanager": "self.version" }, "suggest": { @@ -1213,32 +1254,32 @@ }, "autoload": { "psr-4": { - "Zend\\InputFilter\\": "" + "Zend\\InputFilter\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], - "homepage": "https://github.com/zendframework/zf2", + "homepage": "https://github.com/zendframework/zend-input-filter", "keywords": [ "inputfilter", "zf2" ], - "time": "2015-04-01 18:09:26" + "time": "2015-03-23 18:29:14" }, { "name": "zendframework/zend-json", "version": "2.4.0", "source": { "type": "git", - "url": "https://github.com/zendframework/Component_ZendJson.git", - "reference": "76aeb27e4baf39799e5ca3cf6f2fdd6748ee930c" + "url": "https://github.com/zendframework/zend-json.git", + "reference": "2d845e151c1b9a237cf1899ac31e17fb10bd1e3f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/Component_ZendJson/zipball/76aeb27e4baf39799e5ca3cf6f2fdd6748ee930c", - "reference": "76aeb27e4baf39799e5ca3cf6f2fdd6748ee930c", + "url": "https://api.github.com/repos/zendframework/zend-json/zipball/2d845e151c1b9a237cf1899ac31e17fb10bd1e3f", + "reference": "2d845e151c1b9a237cf1899ac31e17fb10bd1e3f", "shasum": "" }, "require": { @@ -1246,6 +1287,9 @@ "zendframework/zend-stdlib": "self.version" }, "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "satooshi/php-coveralls": "dev-master", "zendframework/zend-http": "self.version", "zendframework/zend-server": "self.version" }, @@ -1263,7 +1307,7 @@ }, "autoload": { "psr-4": { - "Zend\\Json\\": "" + "Zend\\Json\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -1271,30 +1315,35 @@ "BSD-3-Clause" ], "description": "provides convenience methods for serializing native PHP to JSON and decoding JSON to native PHP", - "homepage": "https://github.com/zendframework/zf2", + "homepage": "https://github.com/zendframework/zend-json", "keywords": [ "json", "zf2" ], - "time": "2015-04-01 18:09:26" + "time": "2015-03-25 20:55:48" }, { "name": "zendframework/zend-loader", "version": "2.4.0", "source": { "type": "git", - "url": "https://github.com/zendframework/Component_ZendLoader.git", - "reference": "6868b8a0c346f17fb97724c3a63aa2cbf6b94865" + "url": "https://github.com/zendframework/zend-loader.git", + "reference": "65de2c7a56f8eee633c6bf1cfab73e45648880d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/Component_ZendLoader/zipball/6868b8a0c346f17fb97724c3a63aa2cbf6b94865", - "reference": "6868b8a0c346f17fb97724c3a63aa2cbf6b94865", + "url": "https://api.github.com/repos/zendframework/zend-loader/zipball/65de2c7a56f8eee633c6bf1cfab73e45648880d4", + "reference": "65de2c7a56f8eee633c6bf1cfab73e45648880d4", "shasum": "" }, "require": { "php": ">=5.3.23" }, + "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "satooshi/php-coveralls": "dev-master" + }, "type": "library", "extra": { "branch-alias": { @@ -1304,32 +1353,32 @@ }, "autoload": { "psr-4": { - "Zend\\Loader\\": "" + "Zend\\Loader\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], - "homepage": "https://github.com/zendframework/zf2", + "homepage": "https://github.com/zendframework/zend-loader", "keywords": [ "loader", "zf2" ], - "time": "2015-04-01 18:09:26" + "time": "2015-03-23 18:29:14" }, { "name": "zendframework/zend-log", "version": "2.4.0", "source": { "type": "git", - "url": "https://github.com/zendframework/Component_ZendLog.git", - "reference": "2d5d20fd45470506bdaff727c46dc25fe953146e" + "url": "https://github.com/zendframework/zend-log.git", + "reference": "002e3c810cad7e31e51c9895e9e3cb6fbd312cdd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/Component_ZendLog/zipball/2d5d20fd45470506bdaff727c46dc25fe953146e", - "reference": "2d5d20fd45470506bdaff727c46dc25fe953146e", + "url": "https://api.github.com/repos/zendframework/zend-log/zipball/002e3c810cad7e31e51c9895e9e3cb6fbd312cdd", + "reference": "002e3c810cad7e31e51c9895e9e3cb6fbd312cdd", "shasum": "" }, "require": { @@ -1338,6 +1387,9 @@ "zendframework/zend-stdlib": "self.version" }, "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "satooshi/php-coveralls": "dev-master", "zendframework/zend-console": "self.version", "zendframework/zend-db": "self.version", "zendframework/zend-escaper": "self.version", @@ -1361,7 +1413,7 @@ }, "autoload": { "psr-4": { - "Zend\\Log\\": "" + "Zend\\Log\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -1369,31 +1421,36 @@ "BSD-3-Clause" ], "description": "component for general purpose logging", - "homepage": "https://github.com/zendframework/zf2", + "homepage": "https://github.com/zendframework/zend-log", "keywords": [ "log", "logging", "zf2" ], - "time": "2015-04-01 18:09:26" + "time": "2015-03-25 20:55:48" }, { "name": "zendframework/zend-math", "version": "2.4.0", "source": { "type": "git", - "url": "https://github.com/zendframework/Component_ZendMath.git", - "reference": "634123f83ca90b6613f132d0d100e6b5e9890a29" + "url": "https://github.com/zendframework/zend-math.git", + "reference": "f41fe4acfd809c14f2a802d1aa45dec8fcd2cc73" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/Component_ZendMath/zipball/634123f83ca90b6613f132d0d100e6b5e9890a29", - "reference": "634123f83ca90b6613f132d0d100e6b5e9890a29", + "url": "https://api.github.com/repos/zendframework/zend-math/zipball/f41fe4acfd809c14f2a802d1aa45dec8fcd2cc73", + "reference": "f41fe4acfd809c14f2a802d1aa45dec8fcd2cc73", "shasum": "" }, "require": { "php": ">=5.3.23" }, + "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "satooshi/php-coveralls": "dev-master" + }, "suggest": { "ext-bcmath": "If using the bcmath functionality", "ext-gmp": "If using the gmp functionality", @@ -1409,32 +1466,32 @@ }, "autoload": { "psr-4": { - "Zend\\Math\\": "" + "Zend\\Math\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], - "homepage": "https://github.com/zendframework/zf2", + "homepage": "https://github.com/zendframework/zend-math", "keywords": [ "math", "zf2" ], - "time": "2015-04-01 18:09:27" + "time": "2015-03-23 18:29:14" }, { "name": "zendframework/zend-modulemanager", "version": "2.4.0", "source": { "type": "git", - "url": "https://github.com/zendframework/Component_ZendModuleManager.git", - "reference": "cbe16b0eafe734a062ed0182381e64b9c953dccf" + "url": "https://github.com/zendframework/zend-modulemanager.git", + "reference": "af7ae3cd29a1efb73cc66ae1081e606039d5c20f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/Component_ZendModuleManager/zipball/cbe16b0eafe734a062ed0182381e64b9c953dccf", - "reference": "cbe16b0eafe734a062ed0182381e64b9c953dccf", + "url": "https://api.github.com/repos/zendframework/zend-modulemanager/zipball/af7ae3cd29a1efb73cc66ae1081e606039d5c20f", + "reference": "af7ae3cd29a1efb73cc66ae1081e606039d5c20f", "shasum": "" }, "require": { @@ -1443,6 +1500,9 @@ "zendframework/zend-stdlib": "self.version" }, "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "satooshi/php-coveralls": "dev-master", "zendframework/zend-config": "self.version", "zendframework/zend-console": "self.version", "zendframework/zend-loader": "self.version", @@ -1464,32 +1524,32 @@ }, "autoload": { "psr-4": { - "Zend\\ModuleManager\\": "" + "Zend\\ModuleManager\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], - "homepage": "https://github.com/zendframework/zf2", + "homepage": "https://github.com/zendframework/zend-module-manager", "keywords": [ "modulemanager", "zf2" ], - "time": "2015-04-01 18:09:27" + "time": "2015-03-23 18:29:14" }, { "name": "zendframework/zend-mvc", "version": "2.4.0", "source": { "type": "git", - "url": "https://github.com/zendframework/Component_ZendMvc.git", - "reference": "bfff0f5f9e4d925ee13b8c159c9d6ae7e0db5412" + "url": "https://github.com/zendframework/zend-mvc.git", + "reference": "0b4a4a829b30be510a3f215c4ff00c703ee8b431" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/Component_ZendMvc/zipball/bfff0f5f9e4d925ee13b8c159c9d6ae7e0db5412", - "reference": "bfff0f5f9e4d925ee13b8c159c9d6ae7e0db5412", + "url": "https://api.github.com/repos/zendframework/zend-mvc/zipball/0b4a4a829b30be510a3f215c4ff00c703ee8b431", + "reference": "0b4a4a829b30be510a3f215c4ff00c703ee8b431", "shasum": "" }, "require": { @@ -1500,6 +1560,9 @@ "zendframework/zend-stdlib": "self.version" }, "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "satooshi/php-coveralls": "dev-master", "zendframework/zend-authentication": "self.version", "zendframework/zend-console": "self.version", "zendframework/zend-di": "self.version", @@ -1548,32 +1611,32 @@ }, "autoload": { "psr-4": { - "Zend\\Mvc\\": "" + "Zend\\Mvc\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], - "homepage": "https://github.com/zendframework/zf2", + "homepage": "https://github.com/zendframework/zend-mvc", "keywords": [ "mvc", "zf2" ], - "time": "2015-04-01 18:09:27" + "time": "2015-03-26 18:55:14" }, { "name": "zendframework/zend-serializer", "version": "2.4.0", "source": { "type": "git", - "url": "https://github.com/zendframework/Component_ZendSerializer.git", - "reference": "a46960854d6326f0036d98c9abc7a79e36e25928" + "url": "https://github.com/zendframework/zend-serializer.git", + "reference": "3c531789a9882a5deb721356a7bd2642b65d4b09" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/Component_ZendSerializer/zipball/a46960854d6326f0036d98c9abc7a79e36e25928", - "reference": "a46960854d6326f0036d98c9abc7a79e36e25928", + "url": "https://api.github.com/repos/zendframework/zend-serializer/zipball/3c531789a9882a5deb721356a7bd2642b65d4b09", + "reference": "3c531789a9882a5deb721356a7bd2642b65d4b09", "shasum": "" }, "require": { @@ -1583,6 +1646,9 @@ "zendframework/zend-stdlib": "self.version" }, "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "satooshi/php-coveralls": "dev-master", "zendframework/zend-servicemanager": "self.version" }, "suggest": { @@ -1597,7 +1663,7 @@ }, "autoload": { "psr-4": { - "Zend\\Serializer\\": "" + "Zend\\Serializer\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -1605,25 +1671,25 @@ "BSD-3-Clause" ], "description": "provides an adapter based interface to simply generate storable representation of PHP types by different facilities, and recover", - "homepage": "https://github.com/zendframework/zf2", + "homepage": "https://github.com/zendframework/zend-serializer", "keywords": [ "serializer", "zf2" ], - "time": "2015-04-01 18:09:28" + "time": "2015-03-25 20:55:48" }, { "name": "zendframework/zend-server", "version": "2.4.0", "source": { "type": "git", - "url": "https://github.com/zendframework/Component_ZendServer.git", - "reference": "fc73c34490908ba143af3c57c7e166b40c4b9f8e" + "url": "https://github.com/zendframework/zend-server.git", + "reference": "d11ff0bd529d202022823d4accf5983cbd50fc49" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/Component_ZendServer/zipball/fc73c34490908ba143af3c57c7e166b40c4b9f8e", - "reference": "fc73c34490908ba143af3c57c7e166b40c4b9f8e", + "url": "https://api.github.com/repos/zendframework/zend-server/zipball/d11ff0bd529d202022823d4accf5983cbd50fc49", + "reference": "d11ff0bd529d202022823d4accf5983cbd50fc49", "shasum": "" }, "require": { @@ -1631,6 +1697,11 @@ "zendframework/zend-code": "self.version", "zendframework/zend-stdlib": "self.version" }, + "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "satooshi/php-coveralls": "dev-master" + }, "type": "library", "extra": { "branch-alias": { @@ -1640,38 +1711,41 @@ }, "autoload": { "psr-4": { - "Zend\\Server\\": "" + "Zend\\Server\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], - "homepage": "https://github.com/zendframework/zf2", + "homepage": "https://github.com/zendframework/zend-server", "keywords": [ "server", "zf2" ], - "time": "2015-04-01 18:09:28" + "time": "2015-03-25 20:55:48" }, { "name": "zendframework/zend-servicemanager", "version": "2.4.0", "source": { "type": "git", - "url": "https://github.com/zendframework/Component_ZendServiceManager.git", - "reference": "d3c27c708a148a30608f313a5b7a61a531bd9cb9" + "url": "https://github.com/zendframework/zend-servicemanager.git", + "reference": "57cf99fa5ac08c05a135a8d0d676c52a5e450083" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/Component_ZendServiceManager/zipball/d3c27c708a148a30608f313a5b7a61a531bd9cb9", - "reference": "d3c27c708a148a30608f313a5b7a61a531bd9cb9", + "url": "https://api.github.com/repos/zendframework/zend-servicemanager/zipball/57cf99fa5ac08c05a135a8d0d676c52a5e450083", + "reference": "57cf99fa5ac08c05a135a8d0d676c52a5e450083", "shasum": "" }, "require": { "php": ">=5.3.23" }, "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "satooshi/php-coveralls": "dev-master", "zendframework/zend-di": "self.version" }, "suggest": { @@ -1687,32 +1761,32 @@ }, "autoload": { "psr-4": { - "Zend\\ServiceManager\\": "" + "Zend\\ServiceManager\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], - "homepage": "https://github.com/zendframework/zf2", + "homepage": "https://github.com/zendframework/zend-service-manager", "keywords": [ "servicemanager", "zf2" ], - "time": "2015-04-01 18:09:28" + "time": "2015-03-23 18:29:14" }, { "name": "zendframework/zend-soap", "version": "2.4.0", "source": { "type": "git", - "url": "https://github.com/zendframework/Component_ZendSoap.git", - "reference": "e42b900798ea95a9063fa4922da976d8b3a8ab6f" + "url": "https://github.com/zendframework/zend-soap.git", + "reference": "a599463aba97ce247faf3fb443e3c7858b46449b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/Component_ZendSoap/zipball/e42b900798ea95a9063fa4922da976d8b3a8ab6f", - "reference": "e42b900798ea95a9063fa4922da976d8b3a8ab6f", + "url": "https://api.github.com/repos/zendframework/zend-soap/zipball/a599463aba97ce247faf3fb443e3c7858b46449b", + "reference": "a599463aba97ce247faf3fb443e3c7858b46449b", "shasum": "" }, "require": { @@ -1722,6 +1796,9 @@ "zendframework/zend-uri": "self.version" }, "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "satooshi/php-coveralls": "dev-master", "zendframework/zend-http": "self.version" }, "suggest": { @@ -1736,38 +1813,41 @@ }, "autoload": { "psr-4": { - "Zend\\Soap\\": "" + "Zend\\Soap\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], - "homepage": "https://github.com/zendframework/zf2", + "homepage": "https://github.com/zendframework/zend-soap", "keywords": [ "soap", "zf2" ], - "time": "2015-04-01 18:09:29" + "time": "2015-03-25 20:55:48" }, { "name": "zendframework/zend-stdlib", "version": "2.4.0", "source": { "type": "git", - "url": "https://github.com/zendframework/Component_ZendStdlib.git", - "reference": "eab586f4c18af3fa63c977611939f1f4a3cf1030" + "url": "https://github.com/zendframework/zend-stdlib.git", + "reference": "cf05c5ba75606e47ffee91cedc72778da46f74c3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/Component_ZendStdlib/zipball/eab586f4c18af3fa63c977611939f1f4a3cf1030", - "reference": "eab586f4c18af3fa63c977611939f1f4a3cf1030", + "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/cf05c5ba75606e47ffee91cedc72778da46f74c3", + "reference": "cf05c5ba75606e47ffee91cedc72778da46f74c3", "shasum": "" }, "require": { "php": ">=5.3.23" }, "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "satooshi/php-coveralls": "dev-master", "zendframework/zend-eventmanager": "self.version", "zendframework/zend-filter": "self.version", "zendframework/zend-serializer": "self.version", @@ -1788,32 +1868,32 @@ }, "autoload": { "psr-4": { - "Zend\\Stdlib\\": "" + "Zend\\Stdlib\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], - "homepage": "https://github.com/zendframework/zf2", + "homepage": "https://github.com/zendframework/zend-stdlib", "keywords": [ "stdlib", "zf2" ], - "time": "2015-04-01 18:09:29" + "time": "2015-03-25 20:55:48" }, { "name": "zendframework/zend-text", "version": "2.4.0", "source": { "type": "git", - "url": "https://github.com/zendframework/Component_ZendText.git", - "reference": "35f519e20e575a331c2ee554e5a555a59ce4b9e2" + "url": "https://github.com/zendframework/zend-text.git", + "reference": "d962ea25647b20527f3ca34ae225bbc885dabfc7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/Component_ZendText/zipball/35f519e20e575a331c2ee554e5a555a59ce4b9e2", - "reference": "35f519e20e575a331c2ee554e5a555a59ce4b9e2", + "url": "https://api.github.com/repos/zendframework/zend-text/zipball/d962ea25647b20527f3ca34ae225bbc885dabfc7", + "reference": "d962ea25647b20527f3ca34ae225bbc885dabfc7", "shasum": "" }, "require": { @@ -1821,6 +1901,11 @@ "zendframework/zend-servicemanager": "self.version", "zendframework/zend-stdlib": "self.version" }, + "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "satooshi/php-coveralls": "dev-master" + }, "type": "library", "extra": { "branch-alias": { @@ -1830,32 +1915,32 @@ }, "autoload": { "psr-4": { - "Zend\\Text\\": "" + "Zend\\Text\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], - "homepage": "https://github.com/zendframework/zf2", + "homepage": "https://github.com/zendframework/zend-text", "keywords": [ "text", "zf2" ], - "time": "2015-04-01 18:09:29" + "time": "2015-03-25 20:55:48" }, { "name": "zendframework/zend-uri", "version": "2.4.0", "source": { "type": "git", - "url": "https://github.com/zendframework/Component_ZendUri.git", - "reference": "53f5b162b293f80de8b951eece8e08be83c4fe16" + "url": "https://github.com/zendframework/zend-uri.git", + "reference": "bd9e625639415376f6a82551c73328448d7bc7d1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/Component_ZendUri/zipball/53f5b162b293f80de8b951eece8e08be83c4fe16", - "reference": "53f5b162b293f80de8b951eece8e08be83c4fe16", + "url": "https://api.github.com/repos/zendframework/zend-uri/zipball/bd9e625639415376f6a82551c73328448d7bc7d1", + "reference": "bd9e625639415376f6a82551c73328448d7bc7d1", "shasum": "" }, "require": { @@ -1863,6 +1948,11 @@ "zendframework/zend-escaper": "self.version", "zendframework/zend-validator": "self.version" }, + "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "satooshi/php-coveralls": "dev-master" + }, "type": "library", "extra": { "branch-alias": { @@ -1872,7 +1962,7 @@ }, "autoload": { "psr-4": { - "Zend\\Uri\\": "" + "Zend\\Uri\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -1880,25 +1970,25 @@ "BSD-3-Clause" ], "description": "a component that aids in manipulating and validating » Uniform Resource Identifiers (URIs)", - "homepage": "https://github.com/zendframework/zf2", + "homepage": "https://github.com/zendframework/zend-uri", "keywords": [ "uri", "zf2" ], - "time": "2015-04-01 18:09:29" + "time": "2015-03-25 20:55:48" }, { "name": "zendframework/zend-validator", "version": "2.4.0", "source": { "type": "git", - "url": "https://github.com/zendframework/Component_ZendValidator.git", - "reference": "eb678d20256f120a72ca27276bbb2875841701ab" + "url": "https://github.com/zendframework/zend-validator.git", + "reference": "45fac2545a0f2eb66d71cb7966feee481e7c475f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/Component_ZendValidator/zipball/eb678d20256f120a72ca27276bbb2875841701ab", - "reference": "eb678d20256f120a72ca27276bbb2875841701ab", + "url": "https://api.github.com/repos/zendframework/zend-validator/zipball/45fac2545a0f2eb66d71cb7966feee481e7c475f", + "reference": "45fac2545a0f2eb66d71cb7966feee481e7c475f", "shasum": "" }, "require": { @@ -1906,6 +1996,9 @@ "zendframework/zend-stdlib": "self.version" }, "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "satooshi/php-coveralls": "dev-master", "zendframework/zend-db": "self.version", "zendframework/zend-filter": "self.version", "zendframework/zend-i18n": "self.version", @@ -1933,7 +2026,7 @@ }, "autoload": { "psr-4": { - "Zend\\Validator\\": "" + "Zend\\Validator\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -1941,25 +2034,25 @@ "BSD-3-Clause" ], "description": "provides a set of commonly needed validators", - "homepage": "https://github.com/zendframework/zf2", + "homepage": "https://github.com/zendframework/zend-validator", "keywords": [ "validator", "zf2" ], - "time": "2015-04-01 18:09:30" + "time": "2015-03-25 20:55:48" }, { "name": "zendframework/zend-view", "version": "2.4.0", "source": { "type": "git", - "url": "https://github.com/zendframework/Component_ZendView.git", - "reference": "e119b4b5f082af58a96eb206e782b62c193227bf" + "url": "https://github.com/zendframework/zend-view.git", + "reference": "37beb1ad46e530f627b4b6c3716efd728e976ba9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/Component_ZendView/zipball/e119b4b5f082af58a96eb206e782b62c193227bf", - "reference": "e119b4b5f082af58a96eb206e782b62c193227bf", + "url": "https://api.github.com/repos/zendframework/zend-view/zipball/37beb1ad46e530f627b4b6c3716efd728e976ba9", + "reference": "37beb1ad46e530f627b4b6c3716efd728e976ba9", "shasum": "" }, "require": { @@ -1969,6 +2062,9 @@ "zendframework/zend-stdlib": "self.version" }, "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "satooshi/php-coveralls": "dev-master", "zendframework/zend-authentication": "self.version", "zendframework/zend-escaper": "self.version", "zendframework/zend-feed": "self.version", @@ -2007,7 +2103,7 @@ }, "autoload": { "psr-4": { - "Zend\\View\\": "" + "Zend\\View\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -2015,27 +2111,27 @@ "BSD-3-Clause" ], "description": "provides a system of helpers, output filters, and variable escaping", - "homepage": "https://github.com/zendframework/zf2", + "homepage": "https://github.com/zendframework/zend-view", "keywords": [ "view", "zf2" ], - "time": "2015-04-01 18:09:30" + "time": "2015-03-25 20:55:48" } ], "packages-dev": [ { "name": "doctrine/instantiator", - "version": "1.0.4", + "version": "1.0.5", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "f976e5de371104877ebc89bd8fecb0019ed9c119" + "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/f976e5de371104877ebc89bd8fecb0019ed9c119", - "reference": "f976e5de371104877ebc89bd8fecb0019ed9c119", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d", + "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d", "shasum": "" }, "require": { @@ -2046,7 +2142,7 @@ "ext-pdo": "*", "ext-phar": "*", "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "2.0.*@ALPHA" + "squizlabs/php_codesniffer": "~2.0" }, "type": "library", "extra": { @@ -2055,8 +2151,8 @@ } }, "autoload": { - "psr-0": { - "Doctrine\\Instantiator\\": "src" + "psr-4": { + "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" } }, "notification-url": "https://packagist.org/downloads/", @@ -2076,20 +2172,20 @@ "constructor", "instantiate" ], - "time": "2014-10-13 12:58:55" + "time": "2015-06-14 21:17:01" }, { "name": "fabpot/php-cs-fixer", - "version": "v1.8.1", + "version": "v1.9", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "c1e28e95a978e967dade5469a4bf88162faa67bf" + "reference": "ef528b9d3f1dd66197baabf8f77c8402c62bb9fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/c1e28e95a978e967dade5469a4bf88162faa67bf", - "reference": "c1e28e95a978e967dade5469a4bf88162faa67bf", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/ef528b9d3f1dd66197baabf8f77c8402c62bb9fc", + "reference": "ef528b9d3f1dd66197baabf8f77c8402c62bb9fc", "shasum": "" }, "require": { @@ -2130,7 +2226,7 @@ } ], "description": "A tool to automatically fix PHP code style", - "time": "2015-05-29 06:10:12" + "time": "2015-06-13 09:30:19" }, { "name": "league/climate", @@ -2497,16 +2593,16 @@ }, { "name": "phpunit/php-timer", - "version": "1.0.5", + "version": "1.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c" + "reference": "83fe1bdc5d47658b727595c14da140da92b3d66d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/19689d4354b295ee3d8c54b4f42c3efb69cbc17c", - "reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/83fe1bdc5d47658b727595c14da140da92b3d66d", + "reference": "83fe1bdc5d47658b727595c14da140da92b3d66d", "shasum": "" }, "require": { @@ -2515,13 +2611,10 @@ "type": "library", "autoload": { "classmap": [ - "PHP/" + "src/" ] }, "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "" - ], "license": [ "BSD-3-Clause" ], @@ -2537,20 +2630,20 @@ "keywords": [ "timer" ], - "time": "2013-08-02 07:42:54" + "time": "2015-06-13 07:35:30" }, { "name": "phpunit/php-token-stream", - "version": "1.4.1", + "version": "1.4.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "eab81d02569310739373308137284e0158424330" + "reference": "db63be1159c81df649cd0260e30249a586d4129e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/eab81d02569310739373308137284e0158424330", - "reference": "eab81d02569310739373308137284e0158424330", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/db63be1159c81df649cd0260e30249a586d4129e", + "reference": "db63be1159c81df649cd0260e30249a586d4129e", "shasum": "" }, "require": { @@ -2586,7 +2679,7 @@ "keywords": [ "tokenizer" ], - "time": "2015-04-08 04:46:07" + "time": "2015-06-12 07:34:24" }, { "name": "phpunit/phpunit", @@ -2664,16 +2757,16 @@ }, { "name": "phpunit/phpunit-mock-objects", - "version": "2.3.3", + "version": "2.3.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "253c005852591fd547fc18cd5b7b43a1ec82d8f7" + "reference": "92408bb1968a81b3217a6fdf6c1a198da83caa35" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/253c005852591fd547fc18cd5b7b43a1ec82d8f7", - "reference": "253c005852591fd547fc18cd5b7b43a1ec82d8f7", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/92408bb1968a81b3217a6fdf6c1a198da83caa35", + "reference": "92408bb1968a81b3217a6fdf6c1a198da83caa35", "shasum": "" }, "require": { @@ -2715,7 +2808,7 @@ "mock", "xunit" ], - "time": "2015-05-29 05:19:18" + "time": "2015-06-11 15:55:48" }, { "name": "sebastian/comparator", @@ -3167,16 +3260,16 @@ }, { "name": "symfony/config", - "version": "v2.7.0", + "version": "v2.7.1", "source": { "type": "git", "url": "https://github.com/symfony/Config.git", - "reference": "537e9912063e66aa70cbcddd7d6e6e8db61d98e4" + "reference": "58ded81f1f582a87c528ef3dae9a859f78b5f374" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Config/zipball/537e9912063e66aa70cbcddd7d6e6e8db61d98e4", - "reference": "537e9912063e66aa70cbcddd7d6e6e8db61d98e4", + "url": "https://api.github.com/repos/symfony/Config/zipball/58ded81f1f582a87c528ef3dae9a859f78b5f374", + "reference": "58ded81f1f582a87c528ef3dae9a859f78b5f374", "shasum": "" }, "require": { @@ -3213,20 +3306,20 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "time": "2015-05-15 13:33:16" + "time": "2015-06-11 14:06:56" }, { "name": "symfony/dependency-injection", - "version": "v2.7.0", + "version": "v2.7.1", "source": { "type": "git", "url": "https://github.com/symfony/DependencyInjection.git", - "reference": "137bf489c5151c7eb1e4b7dd34a123f9a74b966d" + "reference": "1a409e52a38ec891de0a7a61a191d1c62080b69d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/137bf489c5151c7eb1e4b7dd34a123f9a74b966d", - "reference": "137bf489c5151c7eb1e4b7dd34a123f9a74b966d", + "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/1a409e52a38ec891de0a7a61a191d1c62080b69d", + "reference": "1a409e52a38ec891de0a7a61a191d1c62080b69d", "shasum": "" }, "require": { @@ -3273,20 +3366,20 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "https://symfony.com", - "time": "2015-05-29 14:44:44" + "time": "2015-06-11 19:13:11" }, { "name": "symfony/event-dispatcher", - "version": "v2.7.0", + "version": "v2.7.1", "source": { "type": "git", "url": "https://github.com/symfony/EventDispatcher.git", - "reference": "687039686d0e923429ba6e958d0baa920cd5d458" + "reference": "be3c5ff8d503c46768aeb78ce6333051aa6f26d9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/687039686d0e923429ba6e958d0baa920cd5d458", - "reference": "687039686d0e923429ba6e958d0baa920cd5d458", + "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/be3c5ff8d503c46768aeb78ce6333051aa6f26d9", + "reference": "be3c5ff8d503c46768aeb78ce6333051aa6f26d9", "shasum": "" }, "require": { @@ -3331,20 +3424,20 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2015-05-02 15:21:08" + "time": "2015-06-08 09:37:21" }, { "name": "symfony/filesystem", - "version": "v2.7.0", + "version": "v2.7.1", "source": { "type": "git", "url": "https://github.com/symfony/Filesystem.git", - "reference": "ae4551fd6d4d4f51f2e7390fbc902fbd67f3b7ba" + "reference": "a0d43eb3e17d4f4c6990289805a488a0482a07f3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Filesystem/zipball/ae4551fd6d4d4f51f2e7390fbc902fbd67f3b7ba", - "reference": "ae4551fd6d4d4f51f2e7390fbc902fbd67f3b7ba", + "url": "https://api.github.com/repos/symfony/Filesystem/zipball/a0d43eb3e17d4f4c6990289805a488a0482a07f3", + "reference": "a0d43eb3e17d4f4c6990289805a488a0482a07f3", "shasum": "" }, "require": { @@ -3380,20 +3473,20 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2015-05-15 13:33:16" + "time": "2015-06-08 09:37:21" }, { "name": "symfony/stopwatch", - "version": "v2.7.0", + "version": "v2.7.1", "source": { "type": "git", "url": "https://github.com/symfony/Stopwatch.git", - "reference": "7702945bceddc0e1f744519abb8a2baeb94bd5ce" + "reference": "c653f1985f6c2b7dbffd04d48b9c0a96aaef814b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Stopwatch/zipball/7702945bceddc0e1f744519abb8a2baeb94bd5ce", - "reference": "7702945bceddc0e1f744519abb8a2baeb94bd5ce", + "url": "https://api.github.com/repos/symfony/Stopwatch/zipball/c653f1985f6c2b7dbffd04d48b9c0a96aaef814b", + "reference": "c653f1985f6c2b7dbffd04d48b9c0a96aaef814b", "shasum": "" }, "require": { @@ -3429,20 +3522,20 @@ ], "description": "Symfony Stopwatch Component", "homepage": "https://symfony.com", - "time": "2015-05-02 15:21:08" + "time": "2015-06-04 20:11:48" }, { "name": "symfony/yaml", - "version": "v2.7.0", + "version": "v2.7.1", "source": { "type": "git", "url": "https://github.com/symfony/Yaml.git", - "reference": "4a29a5248aed4fb45f626a7bbbd330291492f5c3" + "reference": "9808e75c609a14f6db02f70fccf4ca4aab53c160" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Yaml/zipball/4a29a5248aed4fb45f626a7bbbd330291492f5c3", - "reference": "4a29a5248aed4fb45f626a7bbbd330291492f5c3", + "url": "https://api.github.com/repos/symfony/Yaml/zipball/9808e75c609a14f6db02f70fccf4ca4aab53c160", + "reference": "9808e75c609a14f6db02f70fccf4ca4aab53c160", "shasum": "" }, "require": { @@ -3478,7 +3571,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2015-05-02 15:21:08" + "time": "2015-06-10 15:30:22" } ], "aliases": [], From 0d55c65b47134b892d3cfae0c1de655cbda8b853 Mon Sep 17 00:00:00 2001 From: Vadim Zubovich Date: Mon, 15 Jun 2015 16:12:00 +0300 Subject: [PATCH 10/14] MAGNSWTCH-139: PR stabilization - fix phpdoc --- app/code/Magento/CatalogSearch/Model/Resource/Engine.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/CatalogSearch/Model/Resource/Engine.php b/app/code/Magento/CatalogSearch/Model/Resource/Engine.php index 134f1006f76d5..d2b406c61bd6b 100644 --- a/app/code/Magento/CatalogSearch/Model/Resource/Engine.php +++ b/app/code/Magento/CatalogSearch/Model/Resource/Engine.php @@ -44,12 +44,13 @@ class Engine extends AbstractDb implements EngineInterface /** * Construct - * + * * @param \Magento\Framework\Model\Resource\Db\Context $context * @param \Magento\Catalog\Model\Product\Visibility $catalogProductVisibility * @param Advanced $searchResource * @param \Magento\CatalogSearch\Helper\Data $catalogSearchData - * @param string|null $resourcePrefix + * @param \Magento\Eav\Model\Attribute\FrontendType $frontendType + * @param null $resourcePrefix */ public function __construct( \Magento\Framework\Model\Resource\Db\Context $context, From c2a2f84f8c5ac9a60c55f723e1f8f82283afa144 Mon Sep 17 00:00:00 2001 From: Vadim Zubovich Date: Mon, 15 Jun 2015 18:04:52 +0300 Subject: [PATCH 11/14] MAGNSWTCH-139: PR stabilization - Applied patch from Magento Architect --- .../Resource/Product/Indexer/Eav/Source.php | 13 +---- .../CatalogSearch/Model/Resource/Engine.php | 16 +----- .../Attribute/Edit/Options/Options.php | 2 +- .../Eav/Model/Attribute/FrontendType.php | 51 ------------------- 4 files changed, 5 insertions(+), 77 deletions(-) delete mode 100644 app/code/Magento/Eav/Model/Attribute/FrontendType.php diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Indexer/Eav/Source.php b/app/code/Magento/Catalog/Model/Resource/Product/Indexer/Eav/Source.php index caa0358591351..8ed386a0bac4b 100644 --- a/app/code/Magento/Catalog/Model/Resource/Product/Indexer/Eav/Source.php +++ b/app/code/Magento/Catalog/Model/Resource/Product/Indexer/Eav/Source.php @@ -21,11 +21,6 @@ class Source extends AbstractEav */ protected $_resourceHelper; - /** - * @var \Magento\Eav\Model\Attribute\FrontendType - */ - protected $frontendType; - /** * Construct * @@ -41,11 +36,9 @@ public function __construct( \Magento\Eav\Model\Config $eavConfig, \Magento\Framework\Event\ManagerInterface $eventManager, \Magento\Catalog\Model\Resource\Helper $resourceHelper, - \Magento\Eav\Model\Attribute\FrontendType $frontendType, $resourcePrefix = null ) { $this->_resourceHelper = $resourceHelper; - $this->frontendType = $frontendType; parent::__construct($context, $eavConfig, $eventManager, $resourcePrefix); } @@ -79,11 +72,9 @@ protected function _getIndexableAttributes($multiSelect) ); if ($multiSelect == true) { - $select->where('ea.backend_type = ?', 'varchar') - ->where('ea.frontend_input in (?)', $this->frontendType->getInputs('multiselect')); + $select->where('ea.backend_type = ?', 'varchar')->where('ea.frontend_input = ?', 'multiselect'); } else { - $select->where('ea.backend_type = ?', 'int') - ->where('ea.frontend_input in (?)', $this->frontendType->getInputs('select')); + $select->where('ea.backend_type = ?', 'int')->where('ea.frontend_input = ?', 'select'); } return $this->_getReadAdapter()->fetchCol($select); diff --git a/app/code/Magento/CatalogSearch/Model/Resource/Engine.php b/app/code/Magento/CatalogSearch/Model/Resource/Engine.php index d2b406c61bd6b..b72636f830e20 100644 --- a/app/code/Magento/CatalogSearch/Model/Resource/Engine.php +++ b/app/code/Magento/CatalogSearch/Model/Resource/Engine.php @@ -30,11 +30,6 @@ class Engine extends AbstractDb implements EngineInterface */ protected $productFactoryNames; - /** - * @var \Magento\Eav\Model\Attribute\FrontendType - */ - protected $frontendType; - /** * Catalog search data * @@ -44,7 +39,7 @@ class Engine extends AbstractDb implements EngineInterface /** * Construct - * + * * @param \Magento\Framework\Model\Resource\Db\Context $context * @param \Magento\Catalog\Model\Product\Visibility $catalogProductVisibility * @param Advanced $searchResource @@ -57,13 +52,11 @@ public function __construct( \Magento\Catalog\Model\Product\Visibility $catalogProductVisibility, \Magento\CatalogSearch\Model\Resource\Advanced $searchResource, \Magento\CatalogSearch\Helper\Data $catalogSearchData, - \Magento\Eav\Model\Attribute\FrontendType $frontendType, $resourcePrefix = null ) { $this->_catalogProductVisibility = $catalogProductVisibility; $this->_searchResource = $searchResource; $this->_catalogSearchData = $catalogSearchData; - $this->frontendType = $frontendType; parent::__construct($context, $resourcePrefix); } @@ -156,15 +149,10 @@ public function allowAdvancedIndex() */ private function isTermFilterableAttribute($attribute) { - $inputTypes = array_merge( - $this->frontendType->getInputs('select'), - $this->frontendType->getInputs('multiselect') - ); - return ($attribute->getIsVisibleInAdvancedSearch() || $attribute->getIsFilterable() || $attribute->getIsFilterableInSearch()) - && in_array($attribute->getFrontendInput(), $inputTypes); + && in_array($attribute->getFrontendInput(), ['select', 'multiselect']); } /** diff --git a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Options/Options.php b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Options/Options.php index 13a9b831f2b43..d25fdcc5d8bb8 100644 --- a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Options/Options.php +++ b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Options/Options.php @@ -268,7 +268,7 @@ public function getStoreOptionValues($storeId) * * @return \Magento\Eav\Model\Entity\Attribute\AbstractAttribute */ - private function getAttributeObject() + protected function getAttributeObject() { return $this->_registry->registry('entity_attribute'); } diff --git a/app/code/Magento/Eav/Model/Attribute/FrontendType.php b/app/code/Magento/Eav/Model/Attribute/FrontendType.php deleted file mode 100644 index 798f19e6e1655..0000000000000 --- a/app/code/Magento/Eav/Model/Attribute/FrontendType.php +++ /dev/null @@ -1,51 +0,0 @@ -config = $config; - } - - /** - * Return list of input types by frontend type - * - * @param string $inputType - * @return string - */ - public function getType($inputType) - { - return array_search($inputType, $this->config); - } - - /** - * Return frontend type by input type - * - * @param string $frontendType - * @return string[] - */ - public function getInputs($frontendType) - { - if (isset($this->config[$frontendType]) && is_array($this->config[$frontendType])) { - return array_values($this->config[$frontendType]); - } - return [$frontendType]; - } -} From e5ce8b3cbf66ea3a7c27ffe3a9320b6be206d27e Mon Sep 17 00:00:00 2001 From: Vadim Zubovich Date: Tue, 16 Jun 2015 17:19:23 +0300 Subject: [PATCH 12/14] MAGNSWTCH-139: Added Details renderer support for Search results pages --- .../Catalog/Block/Product/AbstractProduct.php | 17 +++++++++-------- .../layout/catalogsearch_advanced_result.xml | 3 +++ .../layout/catalogsearch_result_index.xml | 3 +++ 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/app/code/Magento/Catalog/Block/Product/AbstractProduct.php b/app/code/Magento/Catalog/Block/Product/AbstractProduct.php index 016866f4f1ab1..08617d3ebd8d4 100644 --- a/app/code/Magento/Catalog/Block/Product/AbstractProduct.php +++ b/app/code/Magento/Catalog/Block/Product/AbstractProduct.php @@ -607,11 +607,12 @@ public function isRedirectToCartEnabled() */ public function getProductDetailsHtml(\Magento\Catalog\Model\Product $product) { - $renderer = $this - ->getDetailsRenderer($product->getTypeId()) - ->setProduct($product); - - return $renderer->toHtml(); + $renderer = $this->getDetailsRenderer($product->getTypeId()); + if ($renderer) { + $renderer->setProduct($product); + return $renderer->toHtml(); + } + return ''; } /** @@ -624,10 +625,10 @@ public function getDetailsRenderer($type = null) $type = 'default'; } $rendererList = $this->getDetailsRendererList(); - if (!$rendererList) { - throw new \RuntimeException('Details renderer list for block "' . $this->getNameInLayout() . '" is not defined'); + if ($rendererList) { + return $rendererList->getRenderer($type, 'default'); } - return $rendererList->getRenderer($type, 'default'); + return null; } /** diff --git a/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_advanced_result.xml b/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_advanced_result.xml index 4fe368190cb1e..5dc1857a43c04 100644 --- a/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_advanced_result.xml +++ b/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_advanced_result.xml @@ -22,6 +22,9 @@ product_list_toolbar + + + diff --git a/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_result_index.xml b/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_result_index.xml index b3c7f66aef610..34a0e54cfc942 100644 --- a/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_result_index.xml +++ b/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_result_index.xml @@ -23,6 +23,9 @@ product_list_toolbar + + + From abdf9e26be0c62fb95e4064ad3f3b0a04a9010dc Mon Sep 17 00:00:00 2001 From: Vadim Zubovich Date: Thu, 18 Jun 2015 16:47:32 +0300 Subject: [PATCH 13/14] MAGNSWTCH-139: PR stabilization - fixed functional test fail --- .../Catalog/Test/Handler/CatalogProductAttribute/Curl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/Curl.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/Curl.php index 692126a34d1d3..531996bb5b186 100644 --- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/Curl.php +++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/Curl.php @@ -90,7 +90,7 @@ public function persist(FixtureInterface $fixture = null) if ($fixture->hasData('options')) { $optionsData = $fixture->getData()['options']; - foreach ($matches[1] as $key => $optionId) { + foreach (array_unique($matches[1]) as $key => $optionId) { $optionsData[$key]['id'] = $optionId; } $resultData['options'] = $optionsData; From 3e7abab413caed48340a4a4b429094c3dc5acfd5 Mon Sep 17 00:00:00 2001 From: Vadim Zubovich Date: Fri, 19 Jun 2015 12:27:45 +0300 Subject: [PATCH 14/14] MAGNSWTCH-139: PR stabilization - fixed phpdoc issues --- .../Catalog/Model/Resource/Product/Indexer/Eav/Source.php | 3 +-- app/code/Magento/CatalogSearch/Model/Resource/Engine.php | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Indexer/Eav/Source.php b/app/code/Magento/Catalog/Model/Resource/Product/Indexer/Eav/Source.php index 8ed386a0bac4b..287847f4acf44 100644 --- a/app/code/Magento/Catalog/Model/Resource/Product/Indexer/Eav/Source.php +++ b/app/code/Magento/Catalog/Model/Resource/Product/Indexer/Eav/Source.php @@ -28,8 +28,7 @@ class Source extends AbstractEav * @param \Magento\Eav\Model\Config $eavConfig * @param \Magento\Framework\Event\ManagerInterface $eventManager * @param \Magento\Catalog\Model\Resource\Helper $resourceHelper - * @param \Magento\Eav\Model\Attribute\FrontendType $frontendType - * @param null $resourcePrefix + * @param string|null $resourcePrefix */ public function __construct( \Magento\Framework\Model\Resource\Db\Context $context, diff --git a/app/code/Magento/CatalogSearch/Model/Resource/Engine.php b/app/code/Magento/CatalogSearch/Model/Resource/Engine.php index b72636f830e20..8fb3a099d233d 100644 --- a/app/code/Magento/CatalogSearch/Model/Resource/Engine.php +++ b/app/code/Magento/CatalogSearch/Model/Resource/Engine.php @@ -44,8 +44,7 @@ class Engine extends AbstractDb implements EngineInterface * @param \Magento\Catalog\Model\Product\Visibility $catalogProductVisibility * @param Advanced $searchResource * @param \Magento\CatalogSearch\Helper\Data $catalogSearchData - * @param \Magento\Eav\Model\Attribute\FrontendType $frontendType - * @param null $resourcePrefix + * @param string|null $resourcePrefix */ public function __construct( \Magento\Framework\Model\Resource\Db\Context $context,