Code cleanup (#13)

* PSR2 fix on ReplaceCallbackTest

* Remove PREG_OFFSET_CAPTURE check code duplication

Author: pionl

src/Preg.php

@@ -26,9 +26,7 @@ class Preg
      */
     public static function match(string $pattern, string $subject, ?array &$matches = null, int $flags = 0, int $offset = 0): int
     {
-        if (($flags & PREG_OFFSET_CAPTURE) !== 0) {
-            throw new \InvalidArgumentException('PREG_OFFSET_CAPTURE is not supported as it changes the type of $matches, use matchWithOffsets() instead');
-        }
+        self::checkOffsetCapture($flags, 'matchWithOffsets');
 
         $result = preg_match($pattern, $subject, $matches, $flags | PREG_UNMATCHED_AS_NULL, $offset);
         if ($result === false) {
@@ -66,9 +64,7 @@ public static function matchWithOffsets(string $pattern, string $subject, ?array
      */
     public static function matchAll(string $pattern, string $subject, ?array &$matches = null, int $flags = 0, int $offset = 0): int
     {
-        if (($flags & PREG_OFFSET_CAPTURE) !== 0) {
-            throw new \InvalidArgumentException('PREG_OFFSET_CAPTURE is not supported as it changes the type of $matches, use matchAllWithOffsets() instead');
-        }
+        self::checkOffsetCapture($flags, 'matchAllWithOffsets');
 
         if (($flags & PREG_SET_ORDER) !== 0) {
             throw new \InvalidArgumentException('PREG_SET_ORDER is not supported as it changes the type of $matches');
@@ -280,4 +276,11 @@ public static function isMatchAllWithOffsets(string $pattern, string $subject, ?
     {
         return (bool) static::matchAllWithOffsets($pattern, $subject, $matches, $flags, $offset);
     }
+
+    protected static function checkOffsetCapture(int $flags, string $useFunctionName): void
+    {
+        if (($flags & PREG_OFFSET_CAPTURE) !== 0) {
+            throw new \InvalidArgumentException('PREG_OFFSET_CAPTURE is not supported as it changes the type of $matches, use ' . $useFunctionName . '() instead');
+        }
+    }
 }

src/Regex.php

@@ -27,9 +27,7 @@ public static function isMatch(string $pattern, string $subject, int $offset = 0
      */
     public static function match(string $pattern, string $subject, int $flags = 0, int $offset = 0): MatchResult
     {
-        if (($flags & PREG_OFFSET_CAPTURE) !== 0) {
-            throw new \InvalidArgumentException('PREG_OFFSET_CAPTURE is not supported as it changes the return type, use matchWithOffsets() instead');
-        }
+        self::checkOffsetCapture($flags);
 
         $count = Preg::match($pattern, $subject, $matches, $flags, $offset);
 
@@ -55,9 +53,7 @@ public static function matchWithOffsets(string $pattern, string $subject, int $f
      */
     public static function matchAll(string $pattern, string $subject, int $flags = 0, int $offset = 0): MatchAllResult
     {
-        if (($flags & PREG_OFFSET_CAPTURE) !== 0) {
-            throw new \InvalidArgumentException('PREG_OFFSET_CAPTURE is not supported as it changes the return type, use matchAllWithOffsets() instead');
-        }
+        self::checkOffsetCapture($flags);
 
         if (($flags & PREG_SET_ORDER) !== 0) {
             throw new \InvalidArgumentException('PREG_SET_ORDER is not supported as it changes the return type');
@@ -115,4 +111,11 @@ public static function replaceCallbackArray(array $pattern, $subject, int $limit
 
         return new ReplaceResult($count, $result);
     }
+
+    protected static function checkOffsetCapture(int $flags): void
+    {
+        if (($flags & PREG_OFFSET_CAPTURE) !== 0) {
+            throw new \InvalidArgumentException('PREG_OFFSET_CAPTURE is not supported as it changes the return type, use matchWithOffsets() instead');
+        }
+    }
 }

tests/RegexTests/ReplaceCallbackTest.php

@@ -36,7 +36,7 @@ public function testSuccess(): void
 
     public function testFailure(): void
     {
-       $result = Regex::replaceCallback('{abc}', function ($match) {
+        $result = Regex::replaceCallback('{abc}', function ($match) {
             return '('.$match[0].')';
         }, 'def');