Merge branch 'master' into fix/75_strategy_static

# Conflicts: # Changelog.md
bitExpert · Jul 11, 2017 · 7e9fcd3 · 7e9fcd3
2 parents 6f061d9 + e51140e
commit 7e9fcd3
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -19,6 +19,7 @@ All notable changes to this project will be documented in this file, in reverse
 ### Fixed
 
 - #75 Static matcher now canonicalizes url and rule to omit differences of trailing slashes
+- #74 Provides backwards compatibility by set strategy for existing rules to regex matcher instead of static
 - #72 Fixes on class resolution
 
 ## 2.0.2

diff --git a/Setup/UpgradeData.php b/Setup/UpgradeData.php
@@ -63,6 +63,10 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
             $this->runUpgrade201($setup);
         }
 
+        if (version_compare($context->getVersion(), '2.1.0', '<')) {
+            $this->runUpgrade210($setup);
+        }
+
         $setup->endSetup();
     }
 
@@ -152,24 +156,38 @@ protected function runUpgrade201(ModuleDataSetupInterface $setup)
         );
     }
 
+    /**
+     * @param ModuleDataSetupInterface $setup
+     */
+    protected function runUpgrade210(ModuleDataSetupInterface $setup)
+    {
+        $setup->getConnection()->update(
+            $setup->getTable('bitexpert_forcelogin_whitelist'),
+            ['strategy' => 'regex-all']
+        );
+    }
+
     /**
      * @param int $storeId
      * @param string $label
      * @param string $urlRule
      * @param boolean $editable
+     * @param string $strategy
      * @return array
      */
     protected function getWhitelistEntryAsArray(
         $storeId,
         $label,
         $urlRule,
-        $editable = false
+        $editable = false,
+        $strategy = 'default'
     ) {
         return array(
             'store_id' => $storeId,
             'label' => $label,
             'url_rule' => $urlRule,
-            'editable' => $editable
+            'editable' => $editable,
+            'strategy' => $strategy
         );
     }
 }