Merge pull request PrestaShop#8425 from Quetzacoalt91/BOOM-3861

Use regexp instead of simple explode for complex attributes in CartPresenter
djbuch · Oct 31, 2017 · f299586 · f299586
2 parents 3cf897a + e1a1327
commit f299586
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 29 deletions.
diff --git a/src/Adapter/Cart/CartPresenter.php b/src/Adapter/Cart/CartPresenter.php
@@ -76,16 +76,7 @@ private function presentProduct(array $rawProduct)
         $settings->showPrices = Configuration::showPrices();
 
         if (isset($rawProduct['attributes']) && is_string($rawProduct['attributes'])) {
-            // return an array of attributes
-            $rawProduct['attributes'] = explode(Configuration::get('PS_ATTRIBUTE_ANCHOR_SEPARATOR'), $rawProduct['attributes']);
-            $attributesArray = array();
-
-            foreach ($rawProduct['attributes'] as $attribute) {
-                list($key, $value) = explode(':', $attribute);
-                $attributesArray[trim($key)] = ltrim($value);
-            }
-
-            $rawProduct['attributes'] = $attributesArray;
+            $rawProduct['attributes'] = $this->getAttributesArrayFromString($rawProduct['attributes']);
         }
         $rawProduct['remove_from_cart_url'] = $this->link->getRemoveFromCartURL(
             $rawProduct['id_product'],
@@ -495,4 +486,28 @@ private function getTemplateVarVouchers(Cart $cart)
             'added' => $vouchers,
         );
     }
+
+    /**
+     * Receives a string containing a list of attributes affected to the product and returns them as an array
+     *
+     * @param string $attributes
+     * @return array Converted attributes in an array
+     */
+    protected function getAttributesArrayFromString($attributes)
+    {
+        $separator = Configuration::get('PS_ATTRIBUTE_ANCHOR_SEPARATOR');
+        $pattern = '/(?>(?P<attribute>[^:]+:[^:]+)'.$separator.'+(?!'.$separator.'([^:'.$separator.'])+:))/';
+        $attributesArray = array();
+        $matches = array();
+        if (!preg_match_all($pattern, $attributes.$separator, $matches)) {
+            return $attributesArray;
+        }
+
+        foreach ($matches['attribute'] as $attribute) {
+            list($key, $value) = explode(':', $attribute);
+            $attributesArray[trim($key)] = ltrim($value);
+        }
+
+        return $attributesArray;
+    }
 }
diff --git a/tests/TestCase/UnitTestCase.php b/tests/TestCase/UnitTestCase.php
@@ -125,6 +125,7 @@ protected function setUp()
 
         $this->setupContextualTemplateEngineMock();
         $this->setupContextualLanguageMock();
+        $this->setupContextualLinkMock();
         $this->setupContextualEmployeeMock();
         $this->setupContextualCookieMock();
         $this->setupContextualCurrencyMock();
@@ -162,6 +163,13 @@ protected function setupContextualLanguageMock()
         return $this->context->language;
     }
 
+    protected function setupContextualLinkMock()
+    {
+        $this->context->link = Phake::mock('Link');
+
+        return $this->context->link;
+    }
+
     protected function setupContextualCookieMock() {
         $this->context->cookie = Phake::mock('Cookie');
 
@@ -210,4 +218,23 @@ public function teardown()
         $container = $container_builder->build();
         ServiceLocator::setServiceContainerInstance($container);
     }
+
+    /**
+    * Call protected/private method of a class.
+    *
+    * @param object &$object    Instantiated object that we will run method on.
+    * @param string $methodName Method name to call
+    * @param array  $parameters Array of parameters to pass into method.
+    *
+    * @return mixed Method return.
+    * @link https://jtreminio.com/2013/03/unit-testing-tutorial-part-3-testing-protected-private-methods-coverage-reports-and-crap/
+    */
+    protected function invokeMethod(&$object, $methodName, array $parameters = array())
+    {
+        $reflection = new \ReflectionClass(get_class($object));
+        $method = $reflection->getMethod($methodName);
+        $method->setAccessible(true);
+
+        return $method->invokeArgs($object, $parameters);
+    }
 }
diff --git a/tests/Unit/Adapter/Module/Tab/ModuleTabRegisterTest.php b/tests/Unit/Adapter/Module/Tab/ModuleTabRegisterTest.php
@@ -222,23 +222,4 @@ public function testTabNames()
         $expectedResult = array(1 => $names['fr'], 2 => $names['en'], 3 => $names['en']);
         $this->assertEquals($expectedResult, $this->invokeMethod($this->tabRegister, 'getTabNames', array($names)));
     }
-
-    /**
-    * Call protected/private method of a class.
-    *
-    * @param object &$object    Instantiated object that we will run method on.
-    * @param string $methodName Method name to call
-    * @param array  $parameters Array of parameters to pass into method.
-    *
-    * @return mixed Method return.
-    * @link https://jtreminio.com/2013/03/unit-testing-tutorial-part-3-testing-protected-private-methods-coverage-reports-and-crap/
-    */
-    protected function invokeMethod(&$object, $methodName, array $parameters = array())
-    {
-        $reflection = new \ReflectionClass(get_class($object));
-        $method = $reflection->getMethod($methodName);
-        $method->setAccessible(true);
-
-        return $method->invokeArgs($object, $parameters);
-    }
 }