Skip to content
This repository was archived by the owner on Apr 29, 2019. It is now read-only.

Commit 7097ea1

Browse files
authored
Merge pull request #109 from magento-engcom/issue/93
Update zendframework/zend-code The build failure immediately prior to this was a red herring because of a timeout in Travis, other builds jobs are green
2 parents 7139667 + 0329dbf commit 7097ea1

File tree

11 files changed

+26
-26
lines changed

11 files changed

+26
-26
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"tubalmartin/cssmin": "4.1.1",
6060
"webonyx/graphql-php": "^0.11.1",
6161
"zendframework/zend-captcha": "^2.7.1",
62-
"zendframework/zend-code": "~3.1.0",
62+
"zendframework/zend-code": "~3.3.0",
6363
"zendframework/zend-config": "^2.6.0",
6464
"zendframework/zend-console": "^2.6.0",
6565
"zendframework/zend-crypt": "^2.6.0",

composer.lock

Lines changed: 11 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceExtensionInterfaceFactory.php.sample

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class SourceClassWithNamespaceExtensionInterfaceFactory
4141
* @param array $data
4242
* @return \Magento\Framework\Code\GeneratorTest\SourceClassWithNamespaceExtension
4343
*/
44-
public function create(array $data = array())
44+
public function create(array $data = [])
4545
{
4646
return $this->_objectManager->create($this->_instanceName, $data);
4747
}

dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceFactory.php.sample

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class SourceClassWithNamespaceFactory
4141
* @param array $data
4242
* @return \Magento\Framework\Code\GeneratorTest\SourceClassWithNamespace
4343
*/
44-
public function create(array $data = array())
44+
public function create(array $data = [])
4545
{
4646
return $this->_objectManager->create($this->_instanceName, $data);
4747
}

dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceInterceptor.php.sample

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class Interceptor extends \Magento\Framework\Code\GeneratorTest\SourceClassWithN
1818
/**
1919
* {@inheritdoc}
2020
*/
21-
public function publicChildMethod(\Zend\Code\Generator\ClassGenerator $classGenerator, $param1 = '', $param2 = '\\', $param3 = '\'', array $array = array())
21+
public function publicChildMethod(\Zend\Code\Generator\ClassGenerator $classGenerator, $param1 = '', $param2 = '\\', $param3 = '\'', array $array = [])
2222
{
2323
$pluginInfo = $this->pluginList->getNext($this->subjectType, 'publicChildMethod');
2424
if (!$pluginInfo) {
@@ -57,7 +57,7 @@ class Interceptor extends \Magento\Framework\Code\GeneratorTest\SourceClassWithN
5757
/**
5858
* {@inheritdoc}
5959
*/
60-
public function publicParentMethod(\Zend\Code\Generator\DocBlockGenerator $docBlockGenerator, $param1 = '', $param2 = '\\', $param3 = '\'', array $array = array())
60+
public function publicParentMethod(\Zend\Code\Generator\DocBlockGenerator $docBlockGenerator, $param1 = '', $param2 = '\\', $param3 = '\'', array $array = [])
6161
{
6262
$pluginInfo = $this->pluginList->getNext($this->subjectType, 'publicParentMethod');
6363
if (!$pluginInfo) {

dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceProxy.php.sample

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ class Proxy extends \Magento\Framework\Code\GeneratorTest\SourceClassWithNamespa
9393
/**
9494
* {@inheritdoc}
9595
*/
96-
public function publicChildMethod(\Zend\Code\Generator\ClassGenerator $classGenerator, $param1 = '', $param2 = '\\', $param3 = '\'', array $array = array())
96+
public function publicChildMethod(\Zend\Code\Generator\ClassGenerator $classGenerator, $param1 = '', $param2 = '\\', $param3 = '\'', array $array = [])
9797
{
9898
return $this->_getSubject()->publicChildMethod($classGenerator, $param1, $param2, $param3, $array);
9999
}
@@ -117,7 +117,7 @@ class Proxy extends \Magento\Framework\Code\GeneratorTest\SourceClassWithNamespa
117117
/**
118118
* {@inheritdoc}
119119
*/
120-
public function publicParentMethod(\Zend\Code\Generator\DocBlockGenerator $docBlockGenerator, $param1 = '', $param2 = '\\', $param3 = '\'', array $array = array())
120+
public function publicParentMethod(\Zend\Code\Generator\DocBlockGenerator $docBlockGenerator, $param1 = '', $param2 = '\\', $param3 = '\'', array $array = [])
121121
{
122122
return $this->_getSubject()->publicParentMethod($docBlockGenerator, $param1, $param2, $param3, $array);
123123
}

lib/internal/Magento/Framework/Api/Test/Unit/Code/Generator/_files/SampleMapper.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ class SampleMapper
1717
*
1818
* @var array
1919
*/
20-
protected $registry = array(
20+
protected $registry = [
2121

22-
);
22+
];
2323

2424
/**
2525
* Mapper constructor

lib/internal/Magento/Framework/Code/Test/Unit/_files/app/code/Magento/SomeModule/Model/SevenInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ interface SevenInterface extends \Magento\Framework\Code\Generator\CodeGenerator
3232
* @param array $data
3333
* @return TestThree
3434
*/
35-
public static function testMethod1(array &$data = array());
35+
public static function testMethod1(array &$data = []);
3636

3737
/**
3838
* Method short description

lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleFactory.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class SampleFactory
3737
* @param array $data
3838
* @return \Magento\Framework\ObjectManager\Code\Generator\Sample
3939
*/
40-
public function create(array $data = array())
40+
public function create(array $data = [])
4141
{
4242
return $this->_objectManager->create($this->_instanceName, $data);
4343
}

lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleRepository.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ class SampleRepository implements SampleRepositoryInterface
2727
*
2828
* @var array
2929
*/
30-
protected $registry = array(
30+
protected $registry = [
3131

32-
);
32+
];
3333

3434
/**
3535
* Extension attributes join processor.

0 commit comments

Comments
 (0)