initial work on test fixing

CRM/Utmaltor/Logic/Alter.php

@@ -8,8 +8,12 @@ class CRM_Utmaltor_Logic_Alter {
     $this->smarty = CRM_Utmaltor_Logic_Smarty::singleton($params);
   }
 
-  public function url($urlMatches) {
+  public function urlFindReplace($urlMatches) {
     $url = $urlMatches[1];
+    $this->url($url);
+  }
+
+  public function url($url) {
     $url = $this->fixUrl($url);
     $url = $this->alterSource($url, $this->smarty);
     $url = $this->alterMedium($url, $this->smarty);

tests/phpunit/CRM/Utmaltor/AlterTest.php

@@ -15,6 +15,14 @@ require_once 'BaseTest.php';
 class CRM_Utmaltor_AlterTest extends CRM_Utmaltor_BaseTest {
 
   public function testAlterCleanUrl() {
+    $this->campaign = 200;
+    $this->medium = 'email';
+    $this->source = 'sourceTest';
+    $params = [
+      'campaign' => $this->campaign,
+      'medium' => $this->medium,
+      'source' => $this->source,
+    ];
     $url = 'https://www.wemove.eu/test';
     $expectedUrl = implode('', [
       'https://www.wemove.eu/test?utm_source=',
@@ -24,7 +32,8 @@ class CRM_Utmaltor_AlterTest extends CRM_Utmaltor_BaseTest {
       '&utm_campaign=',
       $this->utmSmarty->parse($this->campaign),
     ]);
-    $actualUrl = \CRM_Utmaltor_Logic_Alter::url($url, $this->utmSmarty);
+    $alter = new \CRM_Utmaltor_Logic_Alter($params);
+    $actualUrl = $alter->url($url);
     $this->assertEquals($expectedUrl, $actualUrl);
   }
 

utmaltor.php

@@ -79,7 +79,7 @@ function _utmaltor_findUrls($text, $params) {
   $domains = str_replace('.', '\.', $domains);
   $re = '/(http[^\s"]+(' . $domains . ')[^\s"<]*)/imu';
   $callback = new CRM_Utmaltor_Logic_Alter($params);
-  $text = preg_replace_callback($re, [$callback, 'url'], $text);
+  $text = preg_replace_callback($re, [$callback, 'urlFindReplace'], $text);
 
   return $text;
 }