Merge pull request #576 from wirecard/TPWDCEE-4382

rinnhofer · web-flow · commit fc082a6c12d5 · 2019-07-30T12:17:42.000+02:00
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.7.2
+3.7.3
diff --git a/src/Transaction/Risk.php b/src/Transaction/Risk.php
@@ -265,6 +265,8 @@ public function mappedProperties()
      */
     private function sanitizeDescriptor($descriptor, $length, $regex)
     {
-        return mb_strimwidth(preg_replace($regex, '', $descriptor), 0, $length);
+        $sanitizedDescriptor =  preg_replace($regex, '', $descriptor);
+        //Remove double spaces and cut to width
+        return mb_strimwidth(preg_replace('/\s+/', ' ', $sanitizedDescriptor), 0, $length);
     }
 }
diff --git a/src/Transaction/SofortTransaction.php b/src/Transaction/SofortTransaction.php
@@ -21,7 +21,7 @@ class SofortTransaction extends Transaction
      * Allowed characters:
      * umlaut, '0-9' 'a-z' 'A-Z' ' ' '+' ',' '-' '.'
      */
-    const DESCRIPTOR_ALLOWED_CHAR_REGEX = "/[^a-zA-Z0-9\s\'\+\,\-\.\Ä\Ö\Ü\ä\ö\ü]/u";
+    const DESCRIPTOR_ALLOWED_CHAR_REGEX = "/[^a-zA-Z0-9\s\+\,\-\.\Ä\Ö\Ü\ä\ö\ü]/u";
 
     /**
      * @var bool

Original file line number	Diff line number	Diff line change
`@@ -265,6 +265,8 @@ public function mappedProperties()`
`265`	`265`	`*/`
`266`	`266`	`private function sanitizeDescriptor($descriptor, $length, $regex)`
`267`	`267`	`{`
`268`		`- return mb_strimwidth(preg_replace($regex, '', $descriptor), 0, $length);`
	`268`	`+ $sanitizedDescriptor = preg_replace($regex, '', $descriptor);`
	`269`	`+ //Remove double spaces and cut to width`
	`270`	`+ return mb_strimwidth(preg_replace('/\s+/', ' ', $sanitizedDescriptor), 0, $length);`
`269`	`271`	`}`
`270`	`272`	`}`