Fixing tests

kazet · Aug 31, 2024 · f94d11c · f94d11c
1 parent a260fb5
commit f94d11c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/docker_image/Dockerfile b/docker_image/Dockerfile
@@ -48,7 +48,7 @@ RUN docker-php-ext-enable pcntl
 # assume for now we want to observe bugs of that kind.
 RUN bash -c 'echo "allow_url_include = On" > /usr/local/etc/php/conf.d/allow.ini'
 
-RUN bash -c "cd / && curl -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar"
+RUN bash -c "cd / && curl -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar && chmod +x wp-cli.phar"
 RUN bash -c "cd / && git clone https://github.com/vishnubob/wait-for-it"
 
 COPY apache_config/000-default.conf /etc/apache2/sites-enabled/

diff --git a/docker_image/functions.php b/docker_image/functions.php
@@ -77,7 +77,13 @@ function __garlic_file_exists($path) {
 
 
 if (!function_exists("__garlic_array_merge")) {
-    function __garlic_array_merge($original, ...$arrays) {
+    function __garlic_array_merge(...$arrays) {
+        if (count($arrays) == 0) {
+            return array();
+        }
+
+        $original = array_shift($arrays);
+
         foreach($arrays as $other) {
             if ($other instanceof MagicArray) {
                 return $other;