Merge pull request #4806 from samsonasik/apply-rector-simplify-regex

[Rector] Apply Rector: SimplifyRegexPatternRector

Author: samsonasik

rector.php

@@ -5,6 +5,7 @@
 use Rector\CodeQuality\Rector\Foreach_\UnusedForeachValueToArrayKeysRector;
 use Rector\CodeQuality\Rector\FuncCall\AddPregQuoteDelimiterRector;
 use Rector\CodeQuality\Rector\FuncCall\ChangeArrayPushToArrayAssignRector;
+use Rector\CodeQuality\Rector\FuncCall\SimplifyRegexPatternRector;
 use Rector\CodeQuality\Rector\FuncCall\SimplifyStrposLowerRector;
 use Rector\CodeQuality\Rector\If_\CombineIfRector;
 use Rector\CodeQuality\Rector\If_\ShortenElseIfRector;
@@ -96,4 +97,5 @@
     $services->set(MoveVariableDeclarationNearReferenceRector::class);
     $services->set(RemoveVarTagFromClassConstantRector::class);
     $services->set(AddPregQuoteDelimiterRector::class);
+    $services->set(SimplifyRegexPatternRector::class);
 };

system/HTTP/CURLRequest.php

@@ -534,7 +534,7 @@ protected function setResponseHeaders(array $headers = [])
 
                 $this->response->setHeader($title, $value);
             } elseif (strpos($header, 'HTTP') === 0) {
-                preg_match('#^HTTP\/([12](?:\.[01])?) ([0-9]+) (.+)#', $header, $matches);
+                preg_match('#^HTTP\/([12](?:\.[01])?) (\d+) (.+)#', $header, $matches);
 
                 if (isset($matches[1])) {
                     $this->response->setProtocolVersion($matches[1]);

system/I18n/Time.php

@@ -1312,7 +1312,7 @@ public function getCalendar()
     protected static function hasRelativeKeywords(string $time): bool
     {
         // skip common format with a '-' in it
-        if (preg_match('/[0-9]{4}-[0-9]{1,2}-[0-9]{1,2}/', $time) !== 1) {
+        if (preg_match('/\d{4}-\d{1,2}-\d{1,2}/', $time) !== 1) {
             return preg_match(static::$relativePattern, $time) > 0;
         }
 

system/Validation/FormatRules.php

@@ -126,8 +126,8 @@ public function string($str = null): bool
      */
     public function decimal(?string $str = null): bool
     {
-        // @see https://regex101.com/r/HULifl/1/
-        return (bool) preg_match('/\A[-+]?[0-9]{0,}\.?[0-9]+\z/', $str);
+        // @see https://regex101.com/r/HULifl/2/
+        return (bool) preg_match('/\A[-+]?\d{0,}\.?\d+\z/', $str);
     }
 
     /**
@@ -151,7 +151,7 @@ public function hex(?string $str = null): bool
      */
     public function integer(?string $str = null): bool
     {
-        return (bool) preg_match('/\A[\-+]?[0-9]+\z/', $str);
+        return (bool) preg_match('/\A[\-+]?\d+\z/', $str);
     }
 
     /**
@@ -187,8 +187,8 @@ public function is_natural_no_zero(?string $str = null): bool
      */
     public function numeric(?string $str = null): bool
     {
-        // @see https://regex101.com/r/bb9wtr/1
-        return (bool) preg_match('/\A[\-+]?[0-9]*\.?[0-9]+\z/', $str);
+        // @see https://regex101.com/r/bb9wtr/2
+        return (bool) preg_match('/\A[\-+]?\d*\.?\d+\z/', $str);
     }
 
     /**