Merge branch 'PHP-8.1'

* PHP-8.1:
  Fix PDO URI test

Author: cmb69

ext/pdo_mysql/tests/pdo_mysql___construct_uri.phpt

@@ -19,10 +19,9 @@ MySQLPDOTest::skip();
             $dsn = MySQLPDOTest::getDSN();
             $user = PDO_MYSQL_TEST_USER;
             $pass = PDO_MYSQL_TEST_PASS;
-            $uri = sprintf('uri:file://%s', (substr(PHP_OS, 0, 3) == 'WIN' ? str_replace('\\', '/', $file) : $file));
+            $uri = 'uri:file://' . $file;
 
             if ($fp = @fopen($file, 'w')) {
-                // ok, great we can create a file with a DSN in it
                 fwrite($fp, $dsn);
                 fclose($fp);
                 clearstatcache();
@@ -39,38 +38,23 @@ MySQLPDOTest::skip();
             }
 
             if ($fp = @fopen($file, 'w')) {
-                fwrite($fp, sprintf('mysql:dbname=letshopeinvalid;%s%s',
-                    chr(0), $dsn));
+                fwrite($fp, $dsn . chr(0) . ';host=nonsense;unix_socket=nonsense');
                 fclose($fp);
                 clearstatcache();
                 assert(file_exists($file));
                 try {
                     $db = new PDO($uri, $user, $pass);
                 } catch (PDOException $e) {
-                    $expected = array(
-                        "SQLSTATE[HY000] [1049]",
-                        "SQLSTATE[42000] [1049]",
-                        "SQLSTATE[HY000] [2002]"
-                    );
-                    $isExpected = false;
-                    foreach ($expected as $prefix) {
-                        if (str_starts_with($e->getMessage(), $prefix)) {
-                            $isExpected = true;
-                        }
-                    }
-
-                    printf("[003] URI=%s, DSN=%s, File=%s (%d bytes, '%s'), chr(0) test, %s\n",
-                    $uri, $dsn,
-                    $file, filesize($file), file_get_contents($file),
-                    ($isExpected ? 'EXPECTED ERROR' : $e->getMessage()));
+                    printf("[003] URI=%s, DSN=%s, File=%s (%d bytes, '%s'), %s\n",
+                        $uri, $dsn,
+                        $file, filesize($file), file_get_contents($file),
+                        $e->getMessage());
                 }
                 unlink($file);
             }
 
         }
 
-        /* TODO: safe mode */
-
     } catch (PDOException $e) {
         printf("[001] %s, [%s] %s\n",
             $e->getMessage(),
@@ -81,5 +65,4 @@ MySQLPDOTest::skip();
     print "done!";
 ?>
 --EXPECTF--
-[003] URI=uri:file://%spdomuri.tst, DSN=mysql%sdbname=%s, File=%spdomuri.tst (%d bytes, 'mysql%sdbname=letshopeinvalid%s'), chr(0) test, EXPECTED ERROR
 done!