Use development version of phpcompatibility and fix resulting errors

The last released version is severely outdated and does not support current PHP versions.
mstilkerich · Jan 10, 2023 · 16c6832 · 16c6832
1 parent a43426a
commit 16c6832
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -29,7 +29,7 @@
         "mstilkerich/carddavclient": "dev-master"
     },
     "require-dev": {
-        "phpcompatibility/php-compatibility": "*",
+        "phpcompatibility/php-compatibility": "dev-develop",
         "phpunit/phpunit": "~9",
         "phpunit/phpcov": "*",
         "dealerdirect/phpcodesniffer-composer-installer": ">= 0.7.0",

diff --git a/tests/TestLogger.php b/tests/TestLogger.php
@@ -141,7 +141,7 @@ public function expectMessage(string $expLevel, string $expMsg): void
 
         foreach ($this->logBuffer as &$recMsg) {
             [ $level, $msg ] = $recMsg;
-            if (($level == $expLevel) && str_contains($msg, $expMsg) && $recMsg[2] == "UNCHECKED") {
+            if (($level == $expLevel) && strpos($msg, $expMsg) !== false && $recMsg[2] == "UNCHECKED") {
                 $recMsg[2] = 'CHECKED';
                 $found = true;
                 break;

diff --git a/tests/Unit/DataConversionTest.php b/tests/Unit/DataConversionTest.php
@@ -724,7 +724,7 @@ private static function compareNodeList(string $dbgid, array $exp, array $rc): v
      */
     private function assertPhotoDownloadWarning(TestLogger $logger, string $vcffile): void
     {
-        if (str_contains($vcffile, 'InvalidUriPhoto')) {
+        if (strpos($vcffile, 'InvalidUriPhoto') !== false) {
             $logger->expectMessage(
                 'warning',
                 'downloadPhoto: Attempt to download photo from http://localhost/doesNotExist.jpg failed'

diff --git a/tests/Unit/Utils.php b/tests/Unit/Utils.php
@@ -119,7 +119,10 @@ public static function comparePhoto(string $pExpStr, string $pRcStr): void
         TestCase::assertTrue(function_exists('gd_info'), "php-gd required");
 
         // shortcut that also covers URI - if identical strings, save the comparison
-        if (empty($pExpStr) || empty($pRcStr) || str_contains($pExpStr, "http") || str_contains($pExpStr, "data:")) {
+        if (
+            empty($pExpStr) || empty($pRcStr) ||
+            strpos($pExpStr, "http") !== false || strpos($pExpStr, "data:") !== false
+        ) {
             TestCase::assertSame($pExpStr, $pRcStr, "PHOTO comparison on URI value failed");
             return;
         }