diff --git a/composer.lock b/composer.lock
index 81e82c63a548e9038b18883b7ceb9bcb8154717c..805bbf13580a0513996448019c7c1abe2231e84f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "09c73c1f1d5d4b40621ae2be993e8ad7",
+ "hash": "27bff88b2a866343d0e0bc06fc52080f",
"packages": [
{
"name": "composer/composer",
@@ -336,17 +336,17 @@
},
{
"name": "symfony/console",
- "version": "v2.6.1",
+ "version": "v2.6.3",
"target-dir": "Symfony/Component/Console",
"source": {
"type": "git",
"url": "https://github.com/symfony/Console.git",
- "reference": "ef825fd9f809d275926547c9e57cbf14968793e8"
+ "reference": "6ac6491ff60c0e5a941db3ccdc75a07adbb61476"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Console/zipball/ef825fd9f809d275926547c9e57cbf14968793e8",
- "reference": "ef825fd9f809d275926547c9e57cbf14968793e8",
+ "url": "https://api.github.com/repos/symfony/Console/zipball/6ac6491ff60c0e5a941db3ccdc75a07adbb61476",
+ "reference": "6ac6491ff60c0e5a941db3ccdc75a07adbb61476",
"shasum": ""
},
"require": {
@@ -389,21 +389,21 @@
],
"description": "Symfony Console Component",
"homepage": "http://symfony.com",
- "time": "2014-12-02 20:19:20"
+ "time": "2015-01-06 17:50:02"
},
{
"name": "symfony/finder",
- "version": "v2.6.1",
+ "version": "v2.6.3",
"target-dir": "Symfony/Component/Finder",
"source": {
"type": "git",
"url": "https://github.com/symfony/Finder.git",
- "reference": "0d3ef7f6ec55a7af5eca7914eaa0dacc04ccc721"
+ "reference": "16513333bca64186c01609961a2bb1b95b5e1355"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Finder/zipball/0d3ef7f6ec55a7af5eca7914eaa0dacc04ccc721",
- "reference": "0d3ef7f6ec55a7af5eca7914eaa0dacc04ccc721",
+ "url": "https://api.github.com/repos/symfony/Finder/zipball/16513333bca64186c01609961a2bb1b95b5e1355",
+ "reference": "16513333bca64186c01609961a2bb1b95b5e1355",
"shasum": ""
},
"require": {
@@ -436,21 +436,21 @@
],
"description": "Symfony Finder Component",
"homepage": "http://symfony.com",
- "time": "2014-12-02 20:19:20"
+ "time": "2015-01-03 08:01:59"
},
{
"name": "symfony/process",
- "version": "v2.6.1",
+ "version": "v2.6.3",
"target-dir": "Symfony/Component/Process",
"source": {
"type": "git",
"url": "https://github.com/symfony/Process.git",
- "reference": "bf0c9bd625f13b0b0bbe39919225cf145dfb935a"
+ "reference": "319794f611bd8bdefbac72beb3f05e847f8ebc92"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Process/zipball/bf0c9bd625f13b0b0bbe39919225cf145dfb935a",
- "reference": "bf0c9bd625f13b0b0bbe39919225cf145dfb935a",
+ "url": "https://api.github.com/repos/symfony/Process/zipball/319794f611bd8bdefbac72beb3f05e847f8ebc92",
+ "reference": "319794f611bd8bdefbac72beb3f05e847f8ebc92",
"shasum": ""
},
"require": {
@@ -483,7 +483,7 @@
],
"description": "Symfony Process Component",
"homepage": "http://symfony.com",
- "time": "2014-12-02 20:19:20"
+ "time": "2015-01-06 22:47:52"
},
{
"name": "zendframework/zend-code",
@@ -1876,16 +1876,16 @@
},
{
"name": "league/climate",
- "version": "2.5.0",
+ "version": "2.6.0",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/climate.git",
- "reference": "8687265629baaedd0fadc75350950ffc5ea53ae6"
+ "reference": "776b6c3b32837832a9f6d94f134b55cb7910ece6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/climate/zipball/8687265629baaedd0fadc75350950ffc5ea53ae6",
- "reference": "8687265629baaedd0fadc75350950ffc5ea53ae6",
+ "url": "https://api.github.com/repos/thephpleague/climate/zipball/776b6c3b32837832a9f6d94f134b55cb7910ece6",
+ "reference": "776b6c3b32837832a9f6d94f134b55cb7910ece6",
"shasum": ""
},
"require": {
@@ -1921,7 +1921,7 @@
"php",
"terminal"
],
- "time": "2014-11-08 02:33:31"
+ "time": "2015-01-08 02:28:23"
},
{
"name": "lusitanian/oauth",
@@ -2833,17 +2833,17 @@
},
{
"name": "symfony/config",
- "version": "v2.5.8",
+ "version": "v2.5.9",
"target-dir": "Symfony/Component/Config",
"source": {
"type": "git",
"url": "https://github.com/symfony/Config.git",
- "reference": "92f0b4c625b8c42d394b53f879d2795d84bb8c4f"
+ "reference": "c7309e33b719433d5cf3845d0b5b9608609d8c8e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Config/zipball/92f0b4c625b8c42d394b53f879d2795d84bb8c4f",
- "reference": "92f0b4c625b8c42d394b53f879d2795d84bb8c4f",
+ "url": "https://api.github.com/repos/symfony/Config/zipball/c7309e33b719433d5cf3845d0b5b9608609d8c8e",
+ "reference": "c7309e33b719433d5cf3845d0b5b9608609d8c8e",
"shasum": ""
},
"require": {
@@ -2877,21 +2877,21 @@
],
"description": "Symfony Config Component",
"homepage": "http://symfony.com",
- "time": "2014-12-02 20:15:53"
+ "time": "2015-01-03 08:01:13"
},
{
"name": "symfony/dependency-injection",
- "version": "v2.5.8",
+ "version": "v2.5.9",
"target-dir": "Symfony/Component/DependencyInjection",
"source": {
"type": "git",
"url": "https://github.com/symfony/DependencyInjection.git",
- "reference": "b4afda3c24867a17f93237ac1fcce917cc9d7695"
+ "reference": "b04e6782962f8e3312274fd16fb6b37a8210a1c3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/b4afda3c24867a17f93237ac1fcce917cc9d7695",
- "reference": "b4afda3c24867a17f93237ac1fcce917cc9d7695",
+ "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/b04e6782962f8e3312274fd16fb6b37a8210a1c3",
+ "reference": "b04e6782962f8e3312274fd16fb6b37a8210a1c3",
"shasum": ""
},
"require": {
@@ -2899,8 +2899,8 @@
},
"require-dev": {
"symfony/config": "~2.2",
- "symfony/expression-language": "~2.4",
- "symfony/yaml": "~2.0"
+ "symfony/expression-language": "~2.4,>=2.4.10",
+ "symfony/yaml": "~2.1"
},
"suggest": {
"symfony/config": "",
@@ -2934,21 +2934,21 @@
],
"description": "Symfony DependencyInjection Component",
"homepage": "http://symfony.com",
- "time": "2014-12-02 21:48:32"
+ "time": "2015-01-05 08:51:41"
},
{
"name": "symfony/event-dispatcher",
- "version": "v2.6.1",
+ "version": "v2.6.3",
"target-dir": "Symfony/Component/EventDispatcher",
"source": {
"type": "git",
"url": "https://github.com/symfony/EventDispatcher.git",
- "reference": "720fe9bca893df7ad1b4546649473b5afddf0216"
+ "reference": "40ff70cadea3785d83cac1c8309514b36113064e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/720fe9bca893df7ad1b4546649473b5afddf0216",
- "reference": "720fe9bca893df7ad1b4546649473b5afddf0216",
+ "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/40ff70cadea3785d83cac1c8309514b36113064e",
+ "reference": "40ff70cadea3785d83cac1c8309514b36113064e",
"shasum": ""
},
"require": {
@@ -2956,10 +2956,10 @@
},
"require-dev": {
"psr/log": "~1.0",
- "symfony/config": "~2.0",
+ "symfony/config": "~2.0,>=2.0.5",
"symfony/dependency-injection": "~2.6",
"symfony/expression-language": "~2.6",
- "symfony/stopwatch": "~2.2"
+ "symfony/stopwatch": "~2.3"
},
"suggest": {
"symfony/dependency-injection": "",
@@ -2992,21 +2992,21 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "http://symfony.com",
- "time": "2014-12-02 20:19:20"
+ "time": "2015-01-05 14:28:40"
},
{
"name": "symfony/filesystem",
- "version": "v2.5.8",
+ "version": "v2.5.9",
"target-dir": "Symfony/Component/Filesystem",
"source": {
"type": "git",
"url": "https://github.com/symfony/Filesystem.git",
- "reference": "e5fc05a3a1dbb4ea0bed80fe7bd21ba3cab88c42"
+ "reference": "d3c24d7d6e9c342008d8421b2fade460311647ea"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Filesystem/zipball/e5fc05a3a1dbb4ea0bed80fe7bd21ba3cab88c42",
- "reference": "e5fc05a3a1dbb4ea0bed80fe7bd21ba3cab88c42",
+ "url": "https://api.github.com/repos/symfony/Filesystem/zipball/d3c24d7d6e9c342008d8421b2fade460311647ea",
+ "reference": "d3c24d7d6e9c342008d8421b2fade460311647ea",
"shasum": ""
},
"require": {
@@ -3039,21 +3039,21 @@
],
"description": "Symfony Filesystem Component",
"homepage": "http://symfony.com",
- "time": "2014-12-02 20:15:53"
+ "time": "2015-01-03 21:04:44"
},
{
"name": "symfony/stopwatch",
- "version": "v2.6.1",
+ "version": "v2.6.3",
"target-dir": "Symfony/Component/Stopwatch",
"source": {
"type": "git",
"url": "https://github.com/symfony/Stopwatch.git",
- "reference": "261abd360cfb6ac65ea93ffd82073e2011d034fc"
+ "reference": "e8da5286132ba75ce4b4275fbf0f4cd369bfd71c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Stopwatch/zipball/261abd360cfb6ac65ea93ffd82073e2011d034fc",
- "reference": "261abd360cfb6ac65ea93ffd82073e2011d034fc",
+ "url": "https://api.github.com/repos/symfony/Stopwatch/zipball/e8da5286132ba75ce4b4275fbf0f4cd369bfd71c",
+ "reference": "e8da5286132ba75ce4b4275fbf0f4cd369bfd71c",
"shasum": ""
},
"require": {
@@ -3086,21 +3086,21 @@
],
"description": "Symfony Stopwatch Component",
"homepage": "http://symfony.com",
- "time": "2014-12-02 20:19:20"
+ "time": "2015-01-03 08:01:59"
},
{
"name": "symfony/yaml",
- "version": "v2.6.1",
+ "version": "v2.6.3",
"target-dir": "Symfony/Component/Yaml",
"source": {
"type": "git",
"url": "https://github.com/symfony/Yaml.git",
- "reference": "3346fc090a3eb6b53d408db2903b241af51dcb20"
+ "reference": "82462a90848a52c2533aa6b598b107d68076b018"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Yaml/zipball/3346fc090a3eb6b53d408db2903b241af51dcb20",
- "reference": "3346fc090a3eb6b53d408db2903b241af51dcb20",
+ "url": "https://api.github.com/repos/symfony/Yaml/zipball/82462a90848a52c2533aa6b598b107d68076b018",
+ "reference": "82462a90848a52c2533aa6b598b107d68076b018",
"shasum": ""
},
"require": {
@@ -3133,7 +3133,7 @@
],
"description": "Symfony Yaml Component",
"homepage": "http://symfony.com",
- "time": "2014-12-02 20:19:20"
+ "time": "2015-01-03 15:33:07"
}
],
"aliases": [],
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Category/DeleteTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Category/DeleteTest.php
index 0a1ec1af089b9b4a0261d5248ecc3c3f66b39bf2..09221eff20db82013daf71291bc185629db7b537 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Category/DeleteTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Category/DeleteTest.php
@@ -51,8 +51,7 @@ class DeleteTest extends \PHPUnit_Framework_TestCase
false
);
$this->authStorage = $this->getMock(
- 'Magento\Backend\Model\Auth\StorageInterface'
- ,
+ 'Magento\Backend\Model\Auth\StorageInterface',
['processLogin', 'processLogout', 'isLoggedIn', 'prolong', 'setDeletedPath'],
[],
'',