Skip to content

Commit f411259

Browse files
author
Joan He
committed
MAGETWO-90006: Update zend-mvc lib dependency
- fix static test failures
1 parent d02753e commit f411259

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

dev/tests/static/testsuite/Magento/Test/Legacy/_files/copyright/blacklist.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@
66
return [
77
'/\.(jpe?g|png|gif|ttf|swf|eot|woff|pdf|mp3|pdf|jar|jbf|php\.dist)$/',
88
'/pub\/opt\/magento\/var/',
9-
'/COPYING\.txt/'
9+
'/COPYING\.txt/',
10+
'/setup\/src\/Zend\/Mvc\/Controller\/LazyControllerAbstractFactory\.php/'
1011
];

setup/src/Zend/Mvc/Controller/LazyControllerAbstractFactory.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@
33
* @link http://github.com/zendframework/zend-mvc for the canonical source repository
44
* @copyright Copyright (c) 2005-2018 Zend Technologies USA Inc. (http://www.zend.com)
55
* @license https://github.com/zendframework/zend-mvc/blob/master/LICENSE.md New BSD License
6+
* @SuppressWarnings(PHPMD)
67
*/
78

9+
declare(strict_types=1);
10+
811
namespace Zend\Mvc\Controller;
912

1013
use Interop\Container\ContainerInterface;
@@ -191,6 +194,7 @@ private function resolveParameter(ContainerInterface $container, $requestedName)
191194
* @param $name
192195
* @param $requestedName
193196
* @return bool
197+
* @SuppressWarnings("unused")
194198
*/
195199
public function canCreateServiceWithName(ServiceLocatorInterface $serviceLocator, $name, $requestedName)
196200
{
@@ -204,9 +208,10 @@ public function canCreateServiceWithName(ServiceLocatorInterface $serviceLocator
204208
* @param $name
205209
* @param $requestedName
206210
* @return mixed
211+
* @SuppressWarnings("unused")
207212
*/
208213
public function createServiceWithName(ServiceLocatorInterface $serviceLocator, $name, $requestedName)
209214
{
210215
return $this($serviceLocator, $requestedName);
211216
}
212-
}
217+
}

0 commit comments

Comments
 (0)