#60 Fixes on class resolution

bitExpert · Jun 28, 2017 · 807d2ec · 807d2ec
1 parent a8b2ecb
commit 807d2ec
Show file tree

Hide file tree

Showing 12 changed files with 134 additions and 56 deletions.
diff --git a/Block/Adminhtml/Manage/Create/Form.php b/Block/Adminhtml/Manage/Create/Form.php
@@ -35,6 +35,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Framework\Data\FormFactory $formFactory
      * @param WhitelistEntryFactoryInterface $entityFactory
+     * @param StrategyManager $strategyManager
      * @param array $data
      */
     public function __construct(
@@ -46,6 +47,7 @@ public function __construct(
         array $data
     ) {
         $this->entityFactory = $entityFactory;
+        $this->strategyManager = $strategyManager;
         parent::__construct($context, $registry, $formFactory, $data);
     }
 
@@ -105,11 +107,11 @@ protected function _prepareForm()
             'required' => true
         ]);
 
-        $fieldsetBase->addField('strategy', 'text', [
+        $fieldsetBase->addField('strategy', 'select', [
             'name' => 'strategy',
             'label' => __('Strategy'),
             'title' => __('Strategy'),
-            'value' => $whitelistEntry->getUrlRule(),
+            'value' => $whitelistEntry->getStrategy(),
             'options' =>  $this->strategyManager->getStrategyNames(),
             'required' => true
         ]);

diff --git a/Controller/Adminhtml/Manage/Save.php b/Controller/Adminhtml/Manage/Save.php
@@ -77,6 +77,7 @@ public function execute()
                 $this->getRequest()->getParam('whitelist_entry_id'),
                 $this->getRequest()->getParam('label'),
                 $this->getRequest()->getParam('url_rule'),
+                $this->getRequest()->getParam('strategy'),
                 $this->getRequest()->getParam('store_id', 0)
             );
 
@@ -106,6 +107,7 @@ public function execute()
                 [
                     'label' => \base64_encode($this->getRequest()->getParam('label')),
                     'url_rule' => \base64_encode($this->getRequest()->getParam('url_rule')),
+                    'strategy' => \base64_encode($this->getRequest()->getParam('strategy')),
                     'store_id' => \base64_encode($this->getRequest()->getParam('store_id', 0))
             ]);
         }

diff --git a/Helper/Strategy/RegExAllMatcher.php b/Helper/Strategy/RegExAllMatcher.php
@@ -18,6 +18,28 @@
  */
 class RegExAllMatcher implements StrategyInterface
 {
+    /**+
+     * @var string
+     */
+    private $name;
+
+    /**
+     * RegExAllMatcher constructor.
+     * @param string $name
+     */
+    public function __construct($name)
+    {
+        $this->name = $name;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
     /**
      * {@inheritdoc}
      */

diff --git a/Helper/Strategy/StaticMatcher.php b/Helper/Strategy/StaticMatcher.php
@@ -18,6 +18,28 @@
  */
 class StaticMatcher implements StrategyInterface
 {
+    /**+
+     * @var string
+     */
+    private $name;
+
+    /**
+     * RegExAllMatcher constructor.
+     * @param string $name
+     */
+    public function __construct($name)
+    {
+        $this->name = $name;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
     /**
      * {@inheritdoc}
      */

diff --git a/Helper/Strategy/StrategyInterface.php b/Helper/Strategy/StrategyInterface.php
@@ -24,4 +24,9 @@ interface StrategyInterface
      * @return bool
      */
     public function isMatch($url, WhitelistEntry $rule);
+
+    /**
+     * @return string
+     */
+    public function getName();
 }
diff --git a/Helper/Strategy/StrategyManager.php b/Helper/Strategy/StrategyManager.php
@@ -32,13 +32,13 @@ class StrategyManager
 
     /**
      * LoginRequiredOnVisitorInitObserver constructor.
-     * @param array $strategies
+     * @param StrategyInterface[] $strategies
      */
     public function __construct(array $strategies)
     {
         foreach ($strategies as $identifier => $strategyEntry) {
-            $this->strategies[$identifier] = $strategyEntry['instance'];
-            $this->strategyNames[$identifier] = $strategyEntry['name'];
+            $this->strategies[$identifier] = $strategyEntry;
+            $this->strategyNames[$identifier] = $strategyEntry->getName();
         }
     }
 

diff --git a/Setup/UpgradeSchema.php b/Setup/UpgradeSchema.php
@@ -57,7 +57,7 @@ protected function runUpgrade210(SchemaSetupInterface $setup, ModuleContextInter
                 [
                     'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
                     'size' => 255,
-                    'nullable' => false,
+                    'nullable' => true,
                     'comment' => 'strategy matcher identifier',
                 ]
             );

diff --git a/Test/Unit/Helper/Strategy/RegExAllMatcherUnitTest.php b/Test/Unit/Helper/Strategy/RegExAllMatcherUnitTest.php
@@ -23,7 +23,9 @@ class RegExAllMatcherUnitTest extends \PHPUnit\Framework\TestCase
      */
     public function matchStaticRulesCorrectly()
     {
-        $matcher = new RegExAllMatcher();
+        $matcher = new RegExAllMatcher('foobar');
+
+        $this->assertEquals('foobar', $matcher->getName());
 
         /* @var $rule \bitExpert\ForceCustomerLogin\Model\WhitelistEntry */
         $rule = $this->getMockBuilder('\bitExpert\ForceCustomerLogin\Model\WhitelistEntry')
@@ -50,7 +52,7 @@ public function matchStaticRulesCorrectly()
      */
     public function matchCatchAllRuleCorrectly()
     {
-        $matcher = new RegExAllMatcher();
+        $matcher = new RegExAllMatcher('foobar');
 
         /* @var $rule \bitExpert\ForceCustomerLogin\Model\WhitelistEntry */
         $rule = $this->getMockBuilder('\bitExpert\ForceCustomerLogin\Model\WhitelistEntry')
@@ -76,7 +78,7 @@ public function matchCatchAllRuleCorrectly()
      */
     public function matchCatchAllWithLineEndIdentifierRuleCorrectly()
     {
-        $matcher = new RegExAllMatcher();
+        $matcher = new RegExAllMatcher('foobar');
 
         /* @var $rule \bitExpert\ForceCustomerLogin\Model\WhitelistEntry */
         $rule = $this->getMockBuilder('\bitExpert\ForceCustomerLogin\Model\WhitelistEntry')
@@ -102,7 +104,7 @@ public function matchCatchAllWithLineEndIdentifierRuleCorrectly()
      */
     public function matchHomepageRuleCorrectly()
     {
-        $matcher = new RegExAllMatcher();
+        $matcher = new RegExAllMatcher('foobar');
 
         /* @var $rule \bitExpert\ForceCustomerLogin\Model\WhitelistEntry */
         $rule = $this->getMockBuilder('\bitExpert\ForceCustomerLogin\Model\WhitelistEntry')

diff --git a/Test/Unit/Helper/Strategy/StaticMatcherUnitTest.php b/Test/Unit/Helper/Strategy/StaticMatcherUnitTest.php
@@ -23,7 +23,9 @@ class StaticMatcherUnitTest extends \PHPUnit\Framework\TestCase
      */
     public function matchStaticRulesCorrectly()
     {
-        $matcher = new StaticMatcher();
+        $matcher = new StaticMatcher('foobar');
+
+        $this->assertEquals('foobar', $matcher->getName());
 
         /* @var $rule \bitExpert\ForceCustomerLogin\Model\WhitelistEntry */
         $rule = $this->getMockBuilder('\bitExpert\ForceCustomerLogin\Model\WhitelistEntry')

diff --git a/Test/Unit/Helper/Strategy/StrategyManagerUnitTest.php b/Test/Unit/Helper/Strategy/StrategyManagerUnitTest.php
@@ -24,19 +24,20 @@ class StrategyManagerUnitTest extends \PHPUnit\Framework\TestCase
      */
     public function getStrategyNamesSuccessfully()
     {
-        /* @var $strategy1 StrategyInterface */
+        /* @var $strategy1 StrategyInterface|\PHPUnit_Framework_MockObject_MockObject */
         $strategy1 = $this->createMock('\bitExpert\ForceCustomerLogin\Helper\Strategy\StrategyInterface');
+        $strategy1->expects($this->once())
+            ->method('getName')
+            ->willReturn('Static');
+        /* @var $strategy2 StrategyInterface|\PHPUnit_Framework_MockObject_MockObject */
         $strategy2 = $this->createMock('\bitExpert\ForceCustomerLogin\Helper\Strategy\StrategyInterface');
+        $strategy2->expects($this->once())
+            ->method('getName')
+            ->willReturn('RegEx (All)');
 
         $manager = new StrategyManager([
-            'default' => [
-                'name' => 'Static',
-                'instance' => $strategy1
-            ],
-            'regex-all' => [
-                'name' => 'RegEx (All)',
-                'instance' => $strategy2
-            ]
+            'default' => $strategy1,
+            'regex-all' => $strategy2
         ]);
 
         $this->assertEquals(
@@ -53,19 +54,20 @@ public function getStrategyNamesSuccessfully()
      */
     public function getStrategyInstancesSuccessfully()
     {
-        /* @var $strategy1 StrategyInterface */
+        /* @var $strategy1 StrategyInterface|\PHPUnit_Framework_MockObject_MockObject */
         $strategy1 = $this->createMock('\bitExpert\ForceCustomerLogin\Helper\Strategy\StrategyInterface');
+        $strategy1->expects($this->once())
+            ->method('getName')
+            ->willReturn('Static');
+        /* @var $strategy2 StrategyInterface|\PHPUnit_Framework_MockObject_MockObject */
         $strategy2 = $this->createMock('\bitExpert\ForceCustomerLogin\Helper\Strategy\StrategyInterface');
+        $strategy2->expects($this->once())
+            ->method('getName')
+            ->willReturn('RegEx (All)');
 
         $manager = new StrategyManager([
-            'default' => [
-                'name' => 'Static',
-                'instance' => $strategy1
-            ],
-            'regex-all' => [
-                'name' => 'RegEx (All)',
-                'instance' => $strategy2
-            ]
+            'default' => $strategy1,
+            'regex-all' => $strategy2
         ]);
 
         $this->assertEquals(
@@ -82,19 +84,20 @@ public function getStrategyInstancesSuccessfully()
      */
     public function getStrategyInstanceSuccessfully()
     {
-        /* @var $strategy1 StrategyInterface */
+        /* @var $strategy1 StrategyInterface|\PHPUnit_Framework_MockObject_MockObject */
         $strategy1 = $this->createMock('\bitExpert\ForceCustomerLogin\Helper\Strategy\StrategyInterface');
+        $strategy1->expects($this->once())
+            ->method('getName')
+            ->willReturn('Static');
+        /* @var $strategy2 StrategyInterface|\PHPUnit_Framework_MockObject_MockObject */
         $strategy2 = $this->createMock('\bitExpert\ForceCustomerLogin\Helper\Strategy\StrategyInterface');
+        $strategy2->expects($this->once())
+            ->method('getName')
+            ->willReturn('RegEx (All)');
 
         $manager = new StrategyManager([
-            'default' => [
-                'name' => 'Static',
-                'instance' => $strategy1
-            ],
-            'regex-all' => [
-                'name' => 'RegEx (All)',
-                'instance' => $strategy2
-            ]
+            'default' => $strategy1,
+            'regex-all' => $strategy2
         ]);
 
         $this->assertFalse($manager->has('foo'));
@@ -107,19 +110,20 @@ public function getStrategyInstanceSuccessfully()
      */
     public function getDefaultStrategyInstanceSuccessfully()
     {
-        /* @var $strategy1 StrategyInterface */
+        /* @var $strategy1 StrategyInterface|\PHPUnit_Framework_MockObject_MockObject */
         $strategy1 = $this->createMock('\bitExpert\ForceCustomerLogin\Helper\Strategy\StrategyInterface');
+        $strategy1->expects($this->once())
+            ->method('getName')
+            ->willReturn('Static');
+        /* @var $strategy2 StrategyInterface|\PHPUnit_Framework_MockObject_MockObject */
         $strategy2 = $this->createMock('\bitExpert\ForceCustomerLogin\Helper\Strategy\StrategyInterface');
+        $strategy2->expects($this->once())
+            ->method('getName')
+            ->willReturn('RegEx (All)');
 
         $manager = new StrategyManager([
-            'default' => [
-                'name' => 'Static',
-                'instance' => $strategy1
-            ],
-            'regex-all' => [
-                'name' => 'RegEx (All)',
-                'instance' => $strategy2
-            ]
+            'default' => $strategy1,
+            'regex-all' => $strategy2
         ]);
 
         $this->assertFalse($manager->has('foo'));

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -11,7 +11,20 @@ services:
       - phpfpm
     volumes: &appvolumes
       - appdata:/var/www/html
-      - .:/var/www/html/app/code/bitExpert/ForceCustomerLogin:cached
+      - ./Api:/var/www/html/app/code/bitExpert/ForceCustomerLogin/Api:cached
+      - ./Block:/var/www/html/app/code/bitExpert/ForceCustomerLogin/Block:cached
+      - ./Controller:/var/www/html/app/code/bitExpert/ForceCustomerLogin/Controller:cached
+      - ./etc:/var/www/html/app/code/bitExpert/ForceCustomerLogin/etc:cached
+      - ./Helper:/var/www/html/app/code/bitExpert/ForceCustomerLogin/Helper:cached
+      - ./Model:/var/www/html/app/code/bitExpert/ForceCustomerLogin/Model:cached
+      - ./Observer:/var/www/html/app/code/bitExpert/ForceCustomerLogin/Observer:cached
+      - ./Plugin:/var/www/html/app/code/bitExpert/ForceCustomerLogin/Plugin:cached
+      - ./Repository:/var/www/html/app/code/bitExpert/ForceCustomerLogin/Repository:cached
+      - ./Setup:/var/www/html/app/code/bitExpert/ForceCustomerLogin/Setup:cached
+      - ./Ui:/var/www/html/app/code/bitExpert/ForceCustomerLogin/Ui:cached
+      - ./Validator:/var/www/html/app/code/bitExpert/ForceCustomerLogin/Validator:cached
+      - ./view:/var/www/html/app/code/bitExpert/ForceCustomerLogin/view:cached
+      - ./registration.php:/var/www/html/app/code/bitExpert/ForceCustomerLogin/registration.php
       - ./var:/var/www/html/var
     ports:
       - 8000:80

diff --git a/etc/di.xml b/etc/di.xml
@@ -60,17 +60,21 @@
                 type="bitExpert\ForceCustomerLogin\Repository\WhitelistRepository" />
 
     <!-- Helper -->
+    <type name="bitExpert\ForceCustomerLogin\Helper\Strategy\StaticMatcher">
+        <arguments>
+            <argument name="name" xsi:type="string">Static</argument>
+        </arguments>
+    </type>
+    <type name="bitExpert\ForceCustomerLogin\Helper\Strategy\RegExAllMatcher">
+        <arguments>
+            <argument name="name" xsi:type="string">RegEx (All)</argument>
+        </arguments>
+    </type>
     <type name="bitExpert\ForceCustomerLogin\Helper\Strategy\StrategyManager">
         <arguments>
             <argument name="strategies" xsi:type="array">
-                <item name="default" xsi:type="array">
-                    <item name="name" xsi:type="string">Static</item>
-                    <item name="instance" xsi:type="object">bitExpert\ForceCustomerLogin\Helper\Strategy\StaticMatcher</item>
-                </item>
-                <item name="regex-all" xsi:type="array">
-                    <item name="name" xsi:type="string">RegEx (All)</item>
-                    <item name="instance" xsi:type="object">bitExpert\ForceCustomerLogin\Helper\Strategy\RegExAllMatcher</item>
-                </item>
+                <item name="default" xsi:type="object">\bitExpert\ForceCustomerLogin\Helper\Strategy\StaticMatcher</item>
+                <item name="regex-all" xsi:type="object">\bitExpert\ForceCustomerLogin\Helper\Strategy\RegExAllMatcher</item>
             </argument>
         </arguments>
     </type>