Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing tests #39

Merged
merged 1 commit into from
Aug 31, 2024
Merged

Fixing tests #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker_image/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
8 changes: 7 additions & 1 deletion docker_image/functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading