diff --git a/app/code/Magento/Backend/Block/Widget/Button/Toolbar.php b/app/code/Magento/Backend/Block/Widget/Button/Toolbar.php
old mode 100644
new mode 100755
diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
old mode 100644
new mode 100755
index dfbaf3a62420ae7bd225f9d0df9e27f73f530910..b2322a48b34c26c8341c84044eb41c8f15682fb8
--- a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
@@ -197,7 +197,43 @@ class Toolbar extends \Magento\Framework\View\Element\Template
$this->getCurrentOrder(),
$this->getCurrentDirection()
)->addAttributeToSort('entity_id', $this->getCurrentDirection());
- } else {
+ }else if($this->getCurrentOrder() == 'rate') {
+
+ if ($this->getCurrentDirection() == 'desc') {
+ $this->_collection->getSelect()->joinLeft(
+ 'review_entity_summary',
+ 'e.entity_id = review_entity_summary.entity_pk_value',
+ array('vote_count' => 'AVG(review_entity_summary.rating_summary)'))
+ ->group('e.entity_id')
+ ->order('vote_count desc');
+ } else {
+ $this->_collection->getSelect()->joinLeft(
+ 'review_entity_summary',
+ 'e.entity_id = review_entity_summary.entity_pk_value',
+ array('vote_count' => 'AVG(review_entity_summary.rating_summary)'))
+ ->group('e.entity_id')
+ ->order('vote_count asc');
+ }
+
+ }else if($this->getCurrentOrder() == 'popular') {
+
+ if ($this->getCurrentDirection() == 'desc') {
+ $this->_collection->getSelect()->joinLeft(
+ 'sales_order_item',
+ 'e.entity_id = sales_order_item.product_id',
+ array('qty_ordered'=>'SUM(sales_order_item.qty_ordered)'))
+ ->group('e.entity_id')
+ ->order('qty_ordered desc');
+ } else {
+ $this->_collection->getSelect()->joinLeft(
+ 'sales_order_item',
+ 'e.entity_id = sales_order_item.product_id',
+ array('qty_ordered'=>'SUM(sales_order_item.qty_ordered)'))
+ ->group('e.entity_id')
+ ->order('qty_ordered asc');
+ }
+
+ }else{
$this->_collection->setOrder($this->getCurrentOrder(), $this->getCurrentDirection());
}
}
@@ -722,4 +758,14 @@ class Toolbar extends \Magento\Framework\View\Element\Template
}
return $this;
}
+
+ public function afterGetAttributeUsedForSortByArray(
+ \Magento\Catalog\Model\Config $catalogConfig,
+ $options) {
+
+ $options['rate'] = __('Rating');
+ $options['popular'] = __('Popularity');
+ return $options;
+
+ }
}
diff --git a/app/code/Magento/Catalog/Model/Product/ProductList/Toolbar.php b/app/code/Magento/Catalog/Model/Product/ProductList/Toolbar.php
old mode 100644
new mode 100755
diff --git a/app/code/Magento/Catalog/etc/di.xml b/app/code/Magento/Catalog/etc/di.xml
index 114d46f63fdd3a965ce43af836a494e27d06b125..aa85d13c2acbda21e6093aaa7d76c9aeb97fb1a5 100644
--- a/app/code/Magento/Catalog/etc/di.xml
+++ b/app/code/Magento/Catalog/etc/di.xml
@@ -6,6 +6,15 @@
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+
+
+<type name="Magento\Catalog\Model\Config">
+ <plugin name="Package_CustomToolbar::addCustomOptions" type="Magento\Catalog\Block\Product\ProductList\Toolbar" />
+</type>
+<!-- <type name="Magento\Catalog\Block\Product\ProductList\Toolbar">
+ <plugin name="Package_CustomToolbar::addPriceDecendingFilterInToolbar" type="Package\CustomToolbar\Plugin\Product\ProductList\Toolbar" />
+</type> -->
+
<preference for="Magento\Catalog\Api\Data\ProductInterface" type="Magento\Catalog\Model\Product" />
<preference for="Magento\Catalog\Api\ProductRepositoryInterface" type="Magento\Catalog\Model\ProductRepository" />
<preference for="Magento\Catalog\Api\CategoryAttributeRepositoryInterface" type="Magento\Catalog\Model\Category\AttributeRepository" />
diff --git a/composer.lock b/composer.lock
index 2f9c7d47e323b51f2120dd441b1dc7ff86ba4eef..4d81f16712c87d640a0d43a188b5f7587f79a61c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -399,23 +399,23 @@
},
{
"name": "composer/spdx-licenses",
- "version": "1.1.6",
+ "version": "1.2.0",
"source": {
"type": "git",
"url": "https://github.com/composer/spdx-licenses.git",
- "reference": "2603a0d7ddc00a015deb576fa5297ca43dee6b1c"
+ "reference": "2d899e9b33023c631854f36c39ef9f8317a7ab33"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/2603a0d7ddc00a015deb576fa5297ca43dee6b1c",
- "reference": "2603a0d7ddc00a015deb576fa5297ca43dee6b1c",
+ "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/2d899e9b33023c631854f36c39ef9f8317a7ab33",
+ "reference": "2d899e9b33023c631854f36c39ef9f8317a7ab33",
"shasum": ""
},
"require": {
"php": "^5.3.2 || ^7.0"
},
"require-dev": {
- "phpunit/phpunit": "^4.5 || ^5.0.5",
+ "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5",
"phpunit/phpunit-mock-objects": "2.3.0 || ^3.0"
},
"type": "library",
@@ -456,7 +456,7 @@
"spdx",
"validator"
],
- "time": "2017-04-03T19:08:52+00:00"
+ "time": "2018-01-03T16:37:06+00:00"
},
{
"name": "container-interop/container-interop",
@@ -642,16 +642,16 @@
},
{
"name": "magento/magento-composer-installer",
- "version": "0.1.12",
+ "version": "0.1.13",
"source": {
"type": "git",
"url": "https://github.com/magento/magento-composer-installer.git",
- "reference": "10c600e88ad34fec71bb6b435ea8415ce92d51de"
+ "reference": "8b6c32f53b4944a5d6656e86344cd0f9784709a1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/magento/magento-composer-installer/zipball/10c600e88ad34fec71bb6b435ea8415ce92d51de",
- "reference": "10c600e88ad34fec71bb6b435ea8415ce92d51de",
+ "url": "https://api.github.com/repos/magento/magento-composer-installer/zipball/8b6c32f53b4944a5d6656e86344cd0f9784709a1",
+ "reference": "8b6c32f53b4944a5d6656e86344cd0f9784709a1",
"shasum": ""
},
"require": {
@@ -717,7 +717,7 @@
"composer-installer",
"magento"
],
- "time": "2016-10-06T16:05:07+00:00"
+ "time": "2017-12-29T16:45:24+00:00"
},
{
"name": "magento/zendframework1",
@@ -959,12 +959,12 @@
"version": "V1.2.0",
"source": {
"type": "git",
- "url": "https://github.com/jjriv/emogrifier.git",
+ "url": "https://github.com/MyIntervals/emogrifier.git",
"reference": "a1db453bb504597d821efcc04b21c79a6021e00c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/jjriv/emogrifier/zipball/a1db453bb504597d821efcc04b21c79a6021e00c",
+ "url": "https://api.github.com/repos/MyIntervals/emogrifier/zipball/a1db453bb504597d821efcc04b21c79a6021e00c",
"reference": "a1db453bb504597d821efcc04b21c79a6021e00c",
"shasum": ""
},
@@ -1384,23 +1384,23 @@
},
{
"name": "seld/jsonlint",
- "version": "1.6.2",
+ "version": "1.7.1",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/jsonlint.git",
- "reference": "7a30649c67ee0d19faacfd9fa2cfb6cc032d9b19"
+ "reference": "d15f59a67ff805a44c50ea0516d2341740f81a38"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/7a30649c67ee0d19faacfd9fa2cfb6cc032d9b19",
- "reference": "7a30649c67ee0d19faacfd9fa2cfb6cc032d9b19",
+ "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/d15f59a67ff805a44c50ea0516d2341740f81a38",
+ "reference": "d15f59a67ff805a44c50ea0516d2341740f81a38",
"shasum": ""
},
"require": {
"php": "^5.3 || ^7.0"
},
"require-dev": {
- "phpunit/phpunit": "^4.5"
+ "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
},
"bin": [
"bin/jsonlint"
@@ -1429,7 +1429,7 @@
"parser",
"validator"
],
- "time": "2017-11-30T15:34:22+00:00"
+ "time": "2018-01-24T12:46:19+00:00"
},
{
"name": "seld/phar-utils",
@@ -1531,16 +1531,16 @@
},
{
"name": "symfony/console",
- "version": "v2.8.32",
+ "version": "v2.8.33",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "46270f1ca44f08ebc134ce120fd2c2baf5fd63de"
+ "reference": "a4bd0f02ea156cf7b5138774a7ba0ab44d8da4fe"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/46270f1ca44f08ebc134ce120fd2c2baf5fd63de",
- "reference": "46270f1ca44f08ebc134ce120fd2c2baf5fd63de",
+ "url": "https://api.github.com/repos/symfony/console/zipball/a4bd0f02ea156cf7b5138774a7ba0ab44d8da4fe",
+ "reference": "a4bd0f02ea156cf7b5138774a7ba0ab44d8da4fe",
"shasum": ""
},
"require": {
@@ -1588,7 +1588,7 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
- "time": "2017-11-29T09:33:18+00:00"
+ "time": "2018-01-03T07:36:31+00:00"
},
{
"name": "symfony/debug",
@@ -1649,16 +1649,16 @@
},
{
"name": "symfony/event-dispatcher",
- "version": "v2.8.32",
+ "version": "v2.8.33",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
- "reference": "b59aacf238fadda50d612c9de73b74751872a903"
+ "reference": "d64be24fc1eba62f9daace8a8918f797fc8e87cc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b59aacf238fadda50d612c9de73b74751872a903",
- "reference": "b59aacf238fadda50d612c9de73b74751872a903",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d64be24fc1eba62f9daace8a8918f797fc8e87cc",
+ "reference": "d64be24fc1eba62f9daace8a8918f797fc8e87cc",
"shasum": ""
},
"require": {
@@ -1705,20 +1705,20 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
- "time": "2017-11-05T15:25:56+00:00"
+ "time": "2018-01-03T07:36:31+00:00"
},
{
"name": "symfony/filesystem",
- "version": "v3.4.1",
+ "version": "v3.4.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
- "reference": "de56eee71e0a128d8c54ccc1909cdefd574bad0f"
+ "reference": "e078773ad6354af38169faf31c21df0f18ace03d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/filesystem/zipball/de56eee71e0a128d8c54ccc1909cdefd574bad0f",
- "reference": "de56eee71e0a128d8c54ccc1909cdefd574bad0f",
+ "url": "https://api.github.com/repos/symfony/filesystem/zipball/e078773ad6354af38169faf31c21df0f18ace03d",
+ "reference": "e078773ad6354af38169faf31c21df0f18ace03d",
"shasum": ""
},
"require": {
@@ -1754,20 +1754,20 @@
],
"description": "Symfony Filesystem Component",
"homepage": "https://symfony.com",
- "time": "2017-11-19T18:59:05+00:00"
+ "time": "2018-01-03T07:37:34+00:00"
},
{
"name": "symfony/finder",
- "version": "v3.4.1",
+ "version": "v3.4.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "dac8d7db537bac7ad8143eb11360a8c2231f251a"
+ "reference": "613e26310776f49a1773b6737c6bd554b8bc8c6f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/dac8d7db537bac7ad8143eb11360a8c2231f251a",
- "reference": "dac8d7db537bac7ad8143eb11360a8c2231f251a",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/613e26310776f49a1773b6737c6bd554b8bc8c6f",
+ "reference": "613e26310776f49a1773b6737c6bd554b8bc8c6f",
"shasum": ""
},
"require": {
@@ -1803,7 +1803,7 @@
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
- "time": "2017-11-05T16:10:10+00:00"
+ "time": "2018-01-03T07:37:34+00:00"
},
{
"name": "symfony/polyfill-mbstring",
@@ -1866,16 +1866,16 @@
},
{
"name": "symfony/process",
- "version": "v2.8.32",
+ "version": "v2.8.33",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "d25449e031f600807949aab7cadbf267712f4eee"
+ "reference": "ea3226daa3c6789efa39570bfc6e5d55f7561a0a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/d25449e031f600807949aab7cadbf267712f4eee",
- "reference": "d25449e031f600807949aab7cadbf267712f4eee",
+ "url": "https://api.github.com/repos/symfony/process/zipball/ea3226daa3c6789efa39570bfc6e5d55f7561a0a",
+ "reference": "ea3226daa3c6789efa39570bfc6e5d55f7561a0a",
"shasum": ""
},
"require": {
@@ -1911,7 +1911,7 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
- "time": "2017-11-05T15:25:56+00:00"
+ "time": "2018-01-03T07:36:31+00:00"
},
{
"name": "tedivm/jshrink",
@@ -2180,28 +2180,28 @@
},
{
"name": "zendframework/zend-console",
- "version": "2.6.0",
+ "version": "2.7.0",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-console.git",
- "reference": "cbbdfdfa0564aa20d1c6c6ef3daeafe6aec02360"
+ "reference": "e8aa08da83de3d265256c40ba45cd649115f0e18"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-console/zipball/cbbdfdfa0564aa20d1c6c6ef3daeafe6aec02360",
- "reference": "cbbdfdfa0564aa20d1c6c6ef3daeafe6aec02360",
+ "url": "https://api.github.com/repos/zendframework/zend-console/zipball/e8aa08da83de3d265256c40ba45cd649115f0e18",
+ "reference": "e8aa08da83de3d265256c40ba45cd649115f0e18",
"shasum": ""
},
"require": {
- "php": "^5.5 || ^7.0",
- "zendframework/zend-stdlib": "^2.7 || ^3.0"
+ "php": "^5.6 || ^7.0",
+ "zendframework/zend-stdlib": "^2.7.7 || ^3.1"
},
"require-dev": {
- "fabpot/php-cs-fixer": "1.7.*",
- "phpunit/phpunit": "^4.0",
- "zendframework/zend-filter": "^2.6",
- "zendframework/zend-json": "^2.6",
- "zendframework/zend-validator": "^2.5"
+ "phpunit/phpunit": "^5.7.23 || ^6.4.3",
+ "zendframework/zend-coding-standard": "~1.0.0",
+ "zendframework/zend-filter": "^2.7.2",
+ "zendframework/zend-json": "^2.6 || ^3.0",
+ "zendframework/zend-validator": "^2.10.1"
},
"suggest": {
"zendframework/zend-filter": "To support DefaultRouteMatcher usage",
@@ -2210,8 +2210,8 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.6-dev",
- "dev-develop": "2.7-dev"
+ "dev-master": "2.7.x-dev",
+ "dev-develop": "2.8.x-dev"
}
},
"autoload": {
@@ -2223,12 +2223,13 @@
"license": [
"BSD-3-Clause"
],
- "homepage": "https://github.com/zendframework/zend-console",
+ "description": "Build console applications using getopt syntax or routing, complete with prompts",
"keywords": [
+ "ZendFramework",
"console",
- "zf2"
+ "zf"
],
- "time": "2016-02-09T17:15:12+00:00"
+ "time": "2018-01-25T19:08:04+00:00"
},
{
"name": "zendframework/zend-crypt",
@@ -2282,16 +2283,16 @@
},
{
"name": "zendframework/zend-db",
- "version": "2.9.1",
+ "version": "2.9.2",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-db.git",
- "reference": "14c5f0b1fc0dfa1cdf9488ab7a57c13a6bef6ae3"
+ "reference": "1651abb1b33fc8fbd2d78ff9e2abb526cc2cf666"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-db/zipball/14c5f0b1fc0dfa1cdf9488ab7a57c13a6bef6ae3",
- "reference": "14c5f0b1fc0dfa1cdf9488ab7a57c13a6bef6ae3",
+ "url": "https://api.github.com/repos/zendframework/zend-db/zipball/1651abb1b33fc8fbd2d78ff9e2abb526cc2cf666",
+ "reference": "1651abb1b33fc8fbd2d78ff9e2abb526cc2cf666",
"shasum": ""
},
"require": {
@@ -2336,7 +2337,7 @@
"db",
"zf"
],
- "time": "2017-12-07T15:52:37+00:00"
+ "time": "2017-12-11T14:57:52+00:00"
},
{
"name": "zendframework/zend-di",
@@ -2387,16 +2388,16 @@
},
{
"name": "zendframework/zend-diactoros",
- "version": "1.6.1",
+ "version": "1.7.0",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-diactoros.git",
- "reference": "c8664b92a6d5bc229e48b0923486c097e45a7877"
+ "reference": "ed6ce7e2105c400ca10277643a8327957c0384b7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/c8664b92a6d5bc229e48b0923486c097e45a7877",
- "reference": "c8664b92a6d5bc229e48b0923486c097e45a7877",
+ "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/ed6ce7e2105c400ca10277643a8327957c0384b7",
+ "reference": "ed6ce7e2105c400ca10277643a8327957c0384b7",
"shasum": ""
},
"require": {
@@ -2415,8 +2416,8 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.6-dev",
- "dev-develop": "1.7-dev"
+ "dev-master": "1.7.x-dev",
+ "dev-develop": "1.8.x-dev"
}
},
"autoload": {
@@ -2435,7 +2436,7 @@
"psr",
"psr-7"
],
- "time": "2017-10-12T15:24:51+00:00"
+ "time": "2018-01-04T18:21:48+00:00"
},
{
"name": "zendframework/zend-escaper",
@@ -2483,16 +2484,16 @@
},
{
"name": "zendframework/zend-eventmanager",
- "version": "2.6.3",
+ "version": "2.6.4",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-eventmanager.git",
- "reference": "3d41b6129fb4916d483671cea9f77e4f90ae85d3"
+ "reference": "d238c443220dce4b6396579c8ab2200ec25f9108"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-eventmanager/zipball/3d41b6129fb4916d483671cea9f77e4f90ae85d3",
- "reference": "3d41b6129fb4916d483671cea9f77e4f90ae85d3",
+ "url": "https://api.github.com/repos/zendframework/zend-eventmanager/zipball/d238c443220dce4b6396579c8ab2200ec25f9108",
+ "reference": "d238c443220dce4b6396579c8ab2200ec25f9108",
"shasum": ""
},
"require": {
@@ -2526,7 +2527,7 @@
"eventmanager",
"zf2"
],
- "time": "2016-02-18T20:49:05+00:00"
+ "time": "2017-12-12T17:48:56+00:00"
},
{
"name": "zendframework/zend-filter",
@@ -2846,37 +2847,34 @@
},
{
"name": "zendframework/zend-inputfilter",
- "version": "2.8.0",
+ "version": "2.8.1",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-inputfilter.git",
- "reference": "e7edd625f2fcdd72a719a7023114c5f4b4f38488"
+ "reference": "55d1430db559e9781b147e73c2c0ce6635d8efe2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-inputfilter/zipball/e7edd625f2fcdd72a719a7023114c5f4b4f38488",
- "reference": "e7edd625f2fcdd72a719a7023114c5f4b4f38488",
+ "url": "https://api.github.com/repos/zendframework/zend-inputfilter/zipball/55d1430db559e9781b147e73c2c0ce6635d8efe2",
+ "reference": "55d1430db559e9781b147e73c2c0ce6635d8efe2",
"shasum": ""
},
"require": {
"php": "^5.6 || ^7.0",
"zendframework/zend-filter": "^2.6",
+ "zendframework/zend-servicemanager": "^2.7.10 || ^3.3.1",
"zendframework/zend-stdlib": "^2.7 || ^3.0",
"zendframework/zend-validator": "^2.10.1"
},
"require-dev": {
"phpunit/phpunit": "^5.7.23 || ^6.4.3",
- "zendframework/zend-coding-standard": "~1.0.0",
- "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
- },
- "suggest": {
- "zendframework/zend-servicemanager": "To support plugin manager support"
+ "zendframework/zend-coding-standard": "~1.0.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.8-dev",
- "dev-develop": "2.9-dev"
+ "dev-master": "2.8.x-dev",
+ "dev-develop": "2.9.x-dev"
},
"zf": {
"component": "Zend\\InputFilter",
@@ -2898,7 +2896,7 @@
"inputfilter",
"zf"
],
- "time": "2017-12-04T21:24:25+00:00"
+ "time": "2018-01-22T19:41:18+00:00"
},
{
"name": "zendframework/zend-json",
@@ -3182,16 +3180,16 @@
},
{
"name": "zendframework/zend-mvc",
- "version": "2.7.12",
+ "version": "2.7.13",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-mvc.git",
- "reference": "badb5bdbdae0706d1ef8928cbc1088cca0e6a3cb"
+ "reference": "9dcaaad145254d023d3cd3559bf29e430f2884b2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-mvc/zipball/badb5bdbdae0706d1ef8928cbc1088cca0e6a3cb",
- "reference": "badb5bdbdae0706d1ef8928cbc1088cca0e6a3cb",
+ "url": "https://api.github.com/repos/zendframework/zend-mvc/zipball/9dcaaad145254d023d3cd3559bf29e430f2884b2",
+ "reference": "9dcaaad145254d023d3cd3559bf29e430f2884b2",
"shasum": ""
},
"require": {
@@ -3270,7 +3268,7 @@
"mvc",
"zf2"
],
- "time": "2017-04-27T15:44:01+00:00"
+ "time": "2017-12-14T22:44:10+00:00"
},
{
"name": "zendframework/zend-psr7bridge",
@@ -3825,16 +3823,16 @@
},
{
"name": "zendframework/zend-view",
- "version": "2.9.0",
+ "version": "2.10.0",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-view.git",
- "reference": "3b6342c381c4437a03fc81d0064c0bb8924914d3"
+ "reference": "4478cc5dd960e2339d88b363ef99fa278700e80e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-view/zipball/3b6342c381c4437a03fc81d0064c0bb8924914d3",
- "reference": "3b6342c381c4437a03fc81d0064c0bb8924914d3",
+ "url": "https://api.github.com/repos/zendframework/zend-view/zipball/4478cc5dd960e2339d88b363ef99fa278700e80e",
+ "reference": "4478cc5dd960e2339d88b363ef99fa278700e80e",
"shasum": ""
},
"require": {
@@ -3865,7 +3863,7 @@
"zendframework/zend-router": "^3.0.1",
"zendframework/zend-serializer": "^2.6.1",
"zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
- "zendframework/zend-session": "^2.6.2",
+ "zendframework/zend-session": "^2.8.1",
"zendframework/zend-uri": "^2.5"
},
"suggest": {
@@ -3889,8 +3887,8 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.9-dev",
- "dev-develop": "3.0-dev"
+ "dev-master": "2.10.x-dev",
+ "dev-develop": "2.11.x-dev"
}
},
"autoload": {
@@ -3908,7 +3906,7 @@
"view",
"zf2"
],
- "time": "2017-03-21T15:05:56+00:00"
+ "time": "2018-01-17T22:21:50+00:00"
}
],
"packages-dev": [
@@ -4090,16 +4088,16 @@
},
{
"name": "friendsofphp/php-cs-fixer",
- "version": "v2.2.13",
+ "version": "v2.2.14",
"source": {
"type": "git",
"url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
- "reference": "669e2327a17b94e47454c3d2e00c6f96203646f0"
+ "reference": "dcf644315abc557e006ce068d299f85d17ec2157"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/669e2327a17b94e47454c3d2e00c6f96203646f0",
- "reference": "669e2327a17b94e47454c3d2e00c6f96203646f0",
+ "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/dcf644315abc557e006ce068d299f85d17ec2157",
+ "reference": "dcf644315abc557e006ce068d299f85d17ec2157",
"shasum": ""
},
"require": {
@@ -4128,6 +4126,7 @@
"require-dev": {
"johnkary/phpunit-speedtrap": "^1.0.1",
"justinrainbow/json-schema": "^5.0",
+ "keradus/cli-executor": "^1.0",
"mikey179/vfsstream": "^1.6",
"php-coveralls/php-coveralls": "^1.0.2",
"phpunit/phpunit": "^4.8.35 || ^5.4.3",
@@ -4151,6 +4150,7 @@
"PhpCsFixer\\": "src/"
},
"classmap": [
+ "tests/TestCase.php",
"tests/Test/AbstractFixerTestCase.php",
"tests/Test/AbstractIntegrationTestCase.php",
"tests/Test/IntegrationCase.php",
@@ -4172,7 +4172,7 @@
}
],
"description": "A tool to automatically fix PHP code style",
- "time": "2017-12-08T15:17:14+00:00"
+ "time": "2018-01-10T16:43:26+00:00"
},
{
"name": "gecko-packages/gecko-php-unit",
@@ -5889,16 +5889,16 @@
},
{
"name": "symfony/config",
- "version": "v3.4.1",
+ "version": "v3.4.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/config.git",
- "reference": "1de51a6c76359897ab32c309934b93d036bccb60"
+ "reference": "cfd5c972f7b4992a5df41673d25d980ab077aa5b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/config/zipball/1de51a6c76359897ab32c309934b93d036bccb60",
- "reference": "1de51a6c76359897ab32c309934b93d036bccb60",
+ "url": "https://api.github.com/repos/symfony/config/zipball/cfd5c972f7b4992a5df41673d25d980ab077aa5b",
+ "reference": "cfd5c972f7b4992a5df41673d25d980ab077aa5b",
"shasum": ""
},
"require": {
@@ -5947,20 +5947,20 @@
],
"description": "Symfony Config Component",
"homepage": "https://symfony.com",
- "time": "2017-11-19T20:09:36+00:00"
+ "time": "2018-01-03T07:37:34+00:00"
},
{
"name": "symfony/dependency-injection",
- "version": "v3.4.1",
+ "version": "v3.4.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/dependency-injection.git",
- "reference": "27810742895ad89e706ba5028e4f8fe425792b50"
+ "reference": "35f957ca171a431710966bec6e2f8636d3b019c4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/27810742895ad89e706ba5028e4f8fe425792b50",
- "reference": "27810742895ad89e706ba5028e4f8fe425792b50",
+ "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/35f957ca171a431710966bec6e2f8636d3b019c4",
+ "reference": "35f957ca171a431710966bec6e2f8636d3b019c4",
"shasum": ""
},
"require": {
@@ -5968,7 +5968,7 @@
"psr/container": "^1.0"
},
"conflict": {
- "symfony/config": "<3.3.1",
+ "symfony/config": "<3.3.7",
"symfony/finder": "<3.3",
"symfony/proxy-manager-bridge": "<3.4",
"symfony/yaml": "<3.4"
@@ -6018,20 +6018,20 @@
],
"description": "Symfony DependencyInjection Component",
"homepage": "https://symfony.com",
- "time": "2017-12-04T19:20:32+00:00"
+ "time": "2018-01-04T15:56:45+00:00"
},
{
"name": "symfony/options-resolver",
- "version": "v3.4.1",
+ "version": "v3.4.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/options-resolver.git",
- "reference": "08748edfe6982f4d878cc42b8325b19a276fb1cf"
+ "reference": "f31f4d3ce4eaf7597abc41bd5ba53d634c2fdb0e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/options-resolver/zipball/08748edfe6982f4d878cc42b8325b19a276fb1cf",
- "reference": "08748edfe6982f4d878cc42b8325b19a276fb1cf",
+ "url": "https://api.github.com/repos/symfony/options-resolver/zipball/f31f4d3ce4eaf7597abc41bd5ba53d634c2fdb0e",
+ "reference": "f31f4d3ce4eaf7597abc41bd5ba53d634c2fdb0e",
"shasum": ""
},
"require": {
@@ -6072,7 +6072,7 @@
"configuration",
"options"
],
- "time": "2017-11-05T16:10:10+00:00"
+ "time": "2018-01-03T07:37:34+00:00"
},
{
"name": "symfony/polyfill-php54",
@@ -6304,16 +6304,16 @@
},
{
"name": "symfony/stopwatch",
- "version": "v3.4.1",
+ "version": "v3.4.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/stopwatch.git",
- "reference": "52510fe1aefdc1c5d2076ac6030421d387e689d1"
+ "reference": "c865551df7c17e63fc1f09f763db04387f91ae4d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/stopwatch/zipball/52510fe1aefdc1c5d2076ac6030421d387e689d1",
- "reference": "52510fe1aefdc1c5d2076ac6030421d387e689d1",
+ "url": "https://api.github.com/repos/symfony/stopwatch/zipball/c865551df7c17e63fc1f09f763db04387f91ae4d",
+ "reference": "c865551df7c17e63fc1f09f763db04387f91ae4d",
"shasum": ""
},
"require": {
@@ -6349,7 +6349,7 @@
],
"description": "Symfony Stopwatch Component",
"homepage": "https://symfony.com",
- "time": "2017-11-07T14:28:09+00:00"
+ "time": "2018-01-03T07:37:34+00:00"
},
{
"name": "theseer/fdomdocument",
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/BottomToolbar.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/BottomToolbar.php
old mode 100644
new mode 100755
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/TopToolbar.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/TopToolbar.php
old mode 100644
new mode 100755
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View/ActionsToolbar.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View/ActionsToolbar.php
old mode 100644
new mode 100755
diff --git a/dev/tests/integration/testsuite/Magento/Ui/_files/view/ui_component/expected/listingToolbar.php b/dev/tests/integration/testsuite/Magento/Ui/_files/view/ui_component/expected/listingToolbar.php
old mode 100644
new mode 100755