Skip to content

Commit 502c956

Browse files
committed
MAGETWO-59661: [Github] PHP7 returns types incompatible with generate code #6106
- Updated reference blacklist - Added method description for event listener
1 parent f78b13d commit 502c956

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/reference.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,6 @@ DoubleColon
104104
\Magento\Framework\ObjectManager\Code\Generator\Sample\Repository
105105
\Magento\Framework\ObjectManager\Code\Generator\SampleConverter
106106
\Magento\Observer
107-
\Magento\Framework\MessageQueue\Model\TestConsumer
108-
\Magento\Framework\MessageQueue\Code\Generator\TInterface
109-
\Magento\Framework\MessageQueue\Code\Generator\TSearchResultsInterface
110107
\Magento\Catalog\Api\Data\Product
111108
\Magento\Framework\ObjectManager\Code\Generator\Sample
112109
\Magento\Framework\ObjectManager\Code\Generator\Sample

setup/src/Magento/Setup/Mvc/Bootstrap/InitParamListener.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,19 @@ class InitParamListener implements ListenerAggregateInterface, FactoryInterface
5757

5858
/**
5959
* {@inheritdoc}
60+
*
61+
* The $priority argument is added to support latest versions of Zend Event Manager.
62+
* Starting from Zend Event Manager 3.0.0 release the ListenerAggregateInterface::attach()
63+
* supports the `priority` argument.
6064
*/
6165
public function attach(EventManagerInterface $events, $priority = 1)
6266
{
6367
$sharedEvents = $events->getSharedManager();
6468
$this->listeners[] = $sharedEvents->attach(
6569
Application::class,
6670
MvcEvent::EVENT_BOOTSTRAP,
67-
[$this, 'onBootstrap']
71+
[$this, 'onBootstrap'],
72+
$priority
6873
);
6974
}
7075

0 commit comments

Comments
 (0)