Minor fixes for latest PHP compatibility.

php-kit · Jun 14, 2024 · 83915ef · 83915ef
1 parent d50c43e
commit 83915ef
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/src/arrays.php b/src/arrays.php
@@ -647,7 +647,7 @@ function array_toClass (array $array, $className)
  *
  * @return mixed
  */
-function get ($array = null, $key, $def = null)
+function get ($array, $key, $def = null)
 {
   return isset ($array[$key]) ? $array[$key] : $def;
 }

diff --git a/src/functions.php b/src/functions.php
@@ -15,7 +15,7 @@
  *                    </ul>
  * @return callable
  */
-function fn (callable $f)
+function _fn (callable $f)
 {
   if ($f instanceof Closure)
     return $f;
@@ -140,8 +140,8 @@ function f ($exp)
   if (isset($cache[$exp]))
     return $cache[$exp];
   list ($a, $f) = explode ('=>', $exp, 2);
-
-  return $cache[$exp] = create_function ($a, "return $f;");
+  $code = sprintf('return function(%s) { return %s; };', $a, $f);
+  return $cache[$exp] = eval($code);
 }
 
 /**
@@ -162,7 +162,8 @@ function fx ($exp)
   static $cache = [];
   if (isset($cache[$exp]))
     return $cache[$exp];
-  return $cache[$exp] = create_function ('$x', "return $exp;");
+  $code = sprintf('return function($x) { return %s; };', $exp);
+  return $cache[$exp] = eval($code);
 }
 
 /**

diff --git a/src/profiling.php b/src/profiling.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @param string $label Optinal label.
+ * @param string $label Optional label.
  * @param string $hr    The character sequence to use as an Horizontal Ruler for visually highlighting the profiler's
  *                      messages.
  */

diff --git a/src/system.php b/src/system.php
@@ -102,7 +102,7 @@ function runExternalCommand ($cmd, $input = '', $extraPath = '', array $extraEnv
   ];
 
   if ($extraPath) {
-    $path = $extraPath . PATH_SEPARATOR . array_at ($_SERVER, 'PATH', getenv ('PATH'));
+    $path = $extraPath . PATH_SEPARATOR . ($_SERVER['PATH'] ?? getenv ('PATH'));
     if (!isset($extraEnv))
       $extraEnv = [];
     $extraEnv['PATH'] = $path;