ENH PHP 8.1 compatibility

silverstripe · Apr 4, 2022 · 0bf0082 · 0bf0082
1 parent deecedd
commit 0bf0082
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/code/PortChecker.php b/code/PortChecker.php
@@ -24,7 +24,7 @@ public static function isPortOpen($host, $port)
             $host = 'localhost';
         }
 
-        $connection = @fsockopen($host, $port);
+        $connection = @fsockopen((string) $host, (int) $port);
         if (is_resource($connection)) {
             fclose($connection);
             return true;

diff --git a/code/ServerFactory.php b/code/ServerFactory.php
@@ -46,9 +46,9 @@ public function launchServer($options)
         $port = PortChecker::findNextAvailablePort($host, $options['preferredPort']);
 
         $base = __DIR__;
-        $command = "exec " . escapeshellcmd($bin) .
+        $command = "exec " . escapeshellcmd((string) $bin) .
             ' -S ' . escapeshellarg($host . ':' . $port) .
-            ' -t ' . escapeshellarg($this->path) . ' ' .
+            ' -t ' . escapeshellarg((string) $this->path) . ' ' .
             escapeshellarg($base . '/server-handler.php');
 
         if (!empty($options['bootstrapFile'])) {

diff --git a/code/constants.php b/code/constants.php
@@ -6,7 +6,7 @@
 // Detect BASE_PATH with public-folder awareness
 define(
     'BASE_PATH',
-    basename(getcwd()) === 'public'
+    basename((string) getcwd()) === 'public'
         ? dirname(getcwd())
         : getcwd()
 );
diff --git a/code/server-handler.php b/code/server-handler.php
@@ -18,7 +18,7 @@
 }
 
 $uri = urldecode(
-    parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)
+    (string) parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)
 );
 
 if ($uri !== "/" && file_exists(PUBLIC_PATH . $uri) && !is_dir(PUBLIC_PATH . $uri)) {