PHP 8.1 compatible (#320)

Co-authored-by: Frank van Hest <[email protected]>
beberlei · Dec 16, 2021 · dbc94e5 · dbc94e5
1 parent 5e721d7
commit dbc94e5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0']
+        php-versions: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1']
 
     steps:
     - name: Checkout

diff --git a/lib/Assert/Assertion.php b/lib/Assert/Assertion.php
@@ -953,7 +953,7 @@ public static function startsWith($string, $needle, $message = null, string $pro
     {
         static::string($string, $message, $propertyPath);
 
-        if (0 !== \mb_strpos($string, $needle, null, $encoding)) {
+        if (0 !== \mb_strpos($string, $needle, 0, $encoding)) {
             $message = \sprintf(
                 static::generateMessage($message ?: 'Value "%s" does not start with "%s".'),
                 static::stringify($string),
@@ -987,7 +987,7 @@ public static function endsWith($string, $needle, $message = null, string $prope
 
         $stringPosition = \mb_strlen($string, $encoding) - \mb_strlen($needle, $encoding);
 
-        if (\mb_strripos($string, $needle, null, $encoding) !== $stringPosition) {
+        if (\mb_strripos($string, $needle, 0, $encoding) !== $stringPosition) {
             $message = \sprintf(
                 static::generateMessage($message ?: 'Value "%s" does not end with "%s".'),
                 static::stringify($string),
@@ -1019,7 +1019,7 @@ public static function contains($string, $needle, $message = null, string $prope
     {
         static::string($string, $message, $propertyPath);
 
-        if (false === \mb_strpos($string, $needle, null, $encoding)) {
+        if (false === \mb_strpos($string, $needle, 0, $encoding)) {
             $message = \sprintf(
                 static::generateMessage($message ?: 'Value "%s" does not contain "%s".'),
                 static::stringify($string),
@@ -1051,7 +1051,7 @@ public static function notContains($string, $needle, $message = null, string $pr
     {
         static::string($string, $message, $propertyPath);
 
-        if (false !== \mb_strpos($string, $needle, null, $encoding)) {
+        if (false !== \mb_strpos($string, $needle, 0, $encoding)) {
             $message = \sprintf(
                 static::generateMessage($message ?: 'Value "%s" contains "%s".'),
                 static::stringify($string),
@@ -2620,7 +2620,12 @@ public static function satisfy($value, $callback, $message = null, string $prope
     public static function ip($value, $flag = null, $message = null, string $propertyPath = null): bool
     {
         static::string($value, $message, $propertyPath);
-        if (!\filter_var($value, FILTER_VALIDATE_IP, $flag)) {
+        if ($flag === null) {
+            $filterVarResult = \filter_var($value, FILTER_VALIDATE_IP);
+        } else {
+            $filterVarResult = \filter_var($value, FILTER_VALIDATE_IP, $flag);
+        }
+        if (!$filterVarResult) {
             $message = \sprintf(
                 static::generateMessage($message ?: 'Value "%s" was expected to be a valid IP address.'),
                 static::stringify($value)