fix: do not partial match url params extraction

plugins/CustomDimensions/Dimension/Extraction.php

@@ -128,7 +128,7 @@ private function formatPattern()
 
         $pattern = $this->pattern;
         if ($this->dimension === 'urlparam') {
-            $pattern = '\?.*' . $pattern . '=([^&]*)';
+            $pattern = '\?(?:.*&)?' . $pattern . '=([^&]*)';
         }
 
         $regex = '/' . str_replace('/', '\/', $pattern) . '/';

plugins/CustomDimensions/tests/Integration/Dimension/ExtractionTest.php

@@ -41,7 +41,7 @@
         $request = $this->buildRequest();
         $value   = $extraction->extract($request);
 
         $this->assertSame('fooBarBaz', $value);
     }
 
     public function testNonCapturingGroupWithinCaptureGroup()
@@ -51,7 +51,7 @@
         $request = $this->buildRequest();
         $value   = $extraction->extract($request);
 
         $this->assertSame('fooBarBaz', $value);
     }
 
     public function testMultipleNonCapturingGroups()
@@ -61,7 +61,7 @@
         $request = $this->buildRequest();
         $value   = $extraction->extract($request);
 
         $this->assertSame('fooBarBaz', $value);
     }
 
     public function testToArray()
@@ -116,12 +116,19 @@
     {
         $request = $this->buildRequest();
 
+        $value = $this->buildExtraction('urlparam', 'idsite')->extract($request);
+        $this->assertSame('54', $value);
+
         $value = $this->buildExtraction('urlparam', 'module')->extract($request);
         $this->assertSame('CoreHome', $value);
 
+        // Should not pick up "test2" from "secondaction" url param
         $value = $this->buildExtraction('urlparam', 'action')->extract($request);
         $this->assertSame('test', $value);
 
+        $value = $this->buildExtraction('urlparam', 'secondaction')->extract($request);
+        $this->assertSame('test2', $value);
+
         $value = $this->buildExtraction('urlparam', 'notExist')->extract($request);
         $this->assertNull($value);
     }
@@ -205,7 +212,7 @@
         $request = $this->buildRequest();
 
         $value = $this->buildExtraction('url', '(.+)')->extract($request);
         $this->assertSame('http://www.example.com/test/index.php?idsite=54&module=CoreHome&action=test&camelCase=fooBarBaz', $value);
     }
 
     public function testCheckShouldFailWhenInvalidDimensionGiven()
@@ -260,7 +267,7 @@
 
     private function buildRequest()
     {
-        $url = 'http://www.example.com/test/index.php?idsite=54&module=CoreHome&action=test&camelCase=fooBarBaz';
+        $url = 'http://www.example.com/test/index.php?idsite=54&module=CoreHome&action=test&camelCase=fooBarBaz&secondaction=test2';
         $referrer = 'http://www.example.com/referrer';
         $actionName = 'My Test Title';