Fix PHPStan

giggsey · giggsey · commit 9fa9df0afcae · 2025-03-19T16:18:32.000Z
diff --git a/src/PhoneNumberUtil.php b/src/PhoneNumberUtil.php
@@ -2177,7 +2177,7 @@ public function maybeStripNationalPrefixAndCarrierCode(string &$number, PhoneMet
                     )) {
                     return false;
                 }
-                if ($carrierCode !== null && $numOfGroups > 0 && $prefixMatcher->group($numOfGroups) !== null) {
+                if ($numOfGroups > 0 && $prefixMatcher->group($numOfGroups) !== null) {
                     $carrierCode .= $prefixMatcher->group(1);
                 }
 
@@ -2198,7 +2198,7 @@ public function maybeStripNationalPrefixAndCarrierCode(string &$number, PhoneMet
                 && !$this->matcherAPI->matchNationalNumber($transformedNumber, $generalDesc, false)) {
                 return false;
             }
-            if ($carrierCode !== null && $numOfGroups > 1) {
+            if ($numOfGroups > 1) {
                 $carrierCode .= $prefixMatcher->group(1);
             }
             $number = substr_replace($number, $transformedNumber, 0, mb_strlen($number));

Original file line number	Diff line number	Diff line change
`@@ -2177,7 +2177,7 @@ public function maybeStripNationalPrefixAndCarrierCode(string &$number, PhoneMet`
`2177`	`2177`	`)) {`
`2178`	`2178`	`return false;`
`2179`	`2179`	`}`
`2180`		`- if ($carrierCode !== null && $numOfGroups > 0 && $prefixMatcher->group($numOfGroups) !== null) {`
	`2180`	`+ if ($numOfGroups > 0 && $prefixMatcher->group($numOfGroups) !== null) {`
`2181`	`2181`	`$carrierCode .= $prefixMatcher->group(1);`
`2182`	`2182`	`}`
`2183`	`2183`
`@@ -2198,7 +2198,7 @@ public function maybeStripNationalPrefixAndCarrierCode(string &$number, PhoneMet`
`2198`	`2198`	`&& !$this->matcherAPI->matchNationalNumber($transformedNumber, $generalDesc, false)) {`
`2199`	`2199`	`return false;`
`2200`	`2200`	`}`
`2201`		`- if ($carrierCode !== null && $numOfGroups > 1) {`
	`2201`	`+ if ($numOfGroups > 1) {`
`2202`	`2202`	`$carrierCode .= $prefixMatcher->group(1);`
`2203`	`2203`	`}`
`2204`	`2204`	`$number = substr_replace($number, $transformedNumber, 0, mb_strlen($number));`