Skip to content

fix: run cachetool without args #3742

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

Merged
antonmedv merged 1 commit into from
Dec 8, 2023
Merged

fix: run cachetool without args #3742

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
10 changes: 5 additions & 5 deletions contrib/cachetool.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@

## Configuration

- **cachetool** *(optional)*: accepts a *string* or an *array* of strings with the unix socket or ip address to php-fpm. If `cachetool` is not given, then the application will look for a `cachetool.yml` file and read the configuration from there.
- **cachetool** *(optional)*: accepts a *string* or an *array* of strings with the unix socket or ip address to php-fpm. If `cachetool` is not given, then the application will look for a configuration file. The file must be named .cachetool.yml or .cachetool.yaml. CacheTool will look for this file on the current directory and in any parent directory until it finds one. If the paths above fail it will try to load /etc/cachetool.yml or /etc/cachetool.yaml configuration file.

```php
set('cachetool', '/var/run/php-fpm.sock');
// or
set('cachetool', '127.0.0.1:9000');
// or
set('cachetool', ['/var/run/php-fpm.sock', '/var/run/php-fpm-other.sock]);
set('cachetool', ['/var/run/php-fpm.sock', '/var/run/php-fpm-other.sock']);
```

You can also specify different cachetool settings for each host:
Expand Down Expand Up @@ -72,13 +72,13 @@
$return = [$fullOptions];
} elseif (count($options) > 0) {
foreach ($options as $option) {
if ($option !== '') {
if (is_string($option) && $option !== '') {
$return[] = "--fcgi={$option}";
}
}
}

return $return;
return $return ?: [''];
Copy link
Copy Markdown

@claytonrcarter claytonrcarter Dec 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had to double check, but [] ?: [''] returns [''], so this makes sense and it should resolve the issue I'm seeing in 7.3.3.

Thank you! 👍

});

/**
Expand All @@ -93,7 +93,7 @@
});

/**
* Clear APCU cache
* Clear APCu cache
*/
desc('Clears APCu system cache');
task('cachetool:clear:apcu', function () {
Expand Down
6 changes: 3 additions & 3 deletions docs/contrib/cachetool.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ require 'contrib/cachetool.php';

## Configuration

- **cachetool** *(optional)*: accepts a *string* or an *array* of strings with the unix socket or ip address to php-fpm. If `cachetool` is not given, then the application will look for a `cachetool.yml` file and read the configuration from there.
- **cachetool** *(optional)*: accepts a *string* or an *array* of strings with the unix socket or ip address to php-fpm. If `cachetool` is not given, then the application will look for a configuration file. The file must be named .cachetool.yml or .cachetool.yaml. CacheTool will look for this file on the current directory and in any parent directory until it finds one. If the paths above fail it will try to load /etc/cachetool.yml or /etc/cachetool.yaml configuration file.

```php
set('cachetool', '/var/run/php-fpm.sock');
// or
set('cachetool', '127.0.0.1:9000');
// or
set('cachetool', ['/var/run/php-fpm.sock', '/var/run/php-fpm-other.sock]);
set('cachetool', ['/var/run/php-fpm.sock', '/var/run/php-fpm-other.sock']);
```

You can also specify different cachetool settings for each host:
Expand Down Expand Up @@ -127,7 +127,7 @@ Clear opcache cache

Clears APCu system cache.

Clear APCU cache
Clear APCu cache


### cachetool:clear:stat
Expand Down