Skip to content

Commit ca2abe9

Browse files
committed
MAGETWO-33083: Interception optimization
- imported modules
1 parent 8e83c05 commit ca2abe9

File tree

2 files changed

+21
-13
lines changed

2 files changed

+21
-13
lines changed

dev/tests/integration/testsuite/Magento/Framework/Interception/AbstractPlugin.php

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,15 @@
55
*/
66
namespace Magento\Framework\Interception;
77

8+
use Magento\Framework\App;
9+
use Magento\Framework\Config\Scope;
10+
use Magento\Framework\Interception\ObjectManager\Config\Developer;
11+
use Magento\Framework\ObjectManager\Definition;
12+
use Magento\Framework\ObjectManager\Factory\Dynamic\Developer as DeveloperFactory;
13+
use Magento\Framework\ObjectManager\ObjectManager;
14+
use Magento\Framework\ObjectManager\Relations;
15+
use Magento\Framework\ObjectManagerInterface;
16+
817
/**
918
* Class GeneralTest
1019
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -17,12 +26,12 @@ abstract class AbstractPlugin extends \PHPUnit_Framework_TestCase
1726
protected $_configReader;
1827

1928
/**
20-
* @var \Magento\Framework\ObjectManagerInterface
29+
* @var ObjectManagerInterface
2130
*/
2231
protected $_objectManager;
2332

2433
/**
25-
* @var \Magento\Framework\ObjectManagerInterface
34+
* @var ObjectManagerInterface
2635
*/
2736
private $applicationObjectManager;
2837

@@ -32,19 +41,19 @@ public function setUp()
3241
return;
3342
}
3443

35-
$this->applicationObjectManager = \Magento\Framework\App\ObjectManager::getInstance();
36-
\Magento\Framework\App\ObjectManager::setInstance($this->_objectManager);
44+
$this->applicationObjectManager = App\ObjectManager::getInstance();
45+
App\ObjectManager::setInstance($this->_objectManager);
3746
}
3847

3948
public function tearDown()
4049
{
41-
\Magento\Framework\App\ObjectManager::setInstance($this->applicationObjectManager);
50+
App\ObjectManager::setInstance($this->applicationObjectManager);
4251
}
4352

4453
public function setUpInterceptionConfig($pluginConfig)
4554
{
46-
$config = new \Magento\Framework\Interception\ObjectManager\Config\Developer();
47-
$factory = new \Magento\Framework\ObjectManager\Factory\Dynamic\Developer($config, null);
55+
$config = new Developer();
56+
$factory = new DeveloperFactory($config, null);
4857

4958
$this->_configReader = $this->getMock('Magento\Framework\Config\ReaderInterface');
5059
$this->_configReader->expects(
@@ -57,11 +66,11 @@ public function setUpInterceptionConfig($pluginConfig)
5766

5867
$areaList = $this->getMock('Magento\Framework\App\AreaList', [], [], '', false);
5968
$areaList->expects($this->any())->method('getCodes')->will($this->returnValue([]));
60-
$configScope = new \Magento\Framework\Config\Scope($areaList, 'global');
69+
$configScope = new Scope($areaList, 'global');
6170
$cache = $this->getMock('Magento\Framework\Config\CacheInterface');
6271
$cache->expects($this->any())->method('load')->will($this->returnValue(false));
63-
$definitions = new \Magento\Framework\ObjectManager\Definition\Runtime();
64-
$relations = new \Magento\Framework\ObjectManager\Relations\Runtime();
72+
$definitions = new Definition\Runtime();
73+
$relations = new Relations\Runtime();
6574
$interceptionConfig = new Config\Config(
6675
$this->_configReader,
6776
$configScope,
@@ -81,7 +90,7 @@ public function setUpInterceptionConfig($pluginConfig)
8190
'Magento\Framework\ObjectManager\DefinitionInterface' => $definitions,
8291
'Magento\Framework\Interception\DefinitionInterface' => $interceptionDefinitions
8392
];
84-
$this->_objectManager = new \Magento\Framework\ObjectManager\ObjectManager(
93+
$this->_objectManager = new ObjectManager(
8594
$factory,
8695
$config,
8796
$sharedInstances

dev/tests/static/framework/Magento/Sniffs/Annotations/Helper.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -501,9 +501,8 @@ public function shouldFilter()
501501
} elseif (preg_match('/\\.phtml$/', $filename)) {
502502
// Skip all phtml files
503503
$shouldFilter = true;
504-
} elseif (preg_match('#(?:/|\\\\)Test(?:/|\\\\)Unit(?:/|\\\\)#', $filename)) {
505-
506504
}
505+
507506
return $shouldFilter;
508507
}
509508

0 commit comments

Comments
 (0)