diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 79d7bac..f87b6f4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,4 +17,4 @@ jobs: ci: uses: codenamephp/workflows.php/.github/workflows/ci.yml@1 with: - php-versions: '["8.1","8.2"]' + php-versions: '["8.1","8.2","8.3"]' diff --git a/.idea/deployer.crontab.iml b/.idea/deployer.crontab.iml index e9e65a4..072c4c1 100644 --- a/.idea/deployer.crontab.iml +++ b/.idea/deployer.crontab.iml @@ -4,6 +4,7 @@ + diff --git a/.idea/php.xml b/.idea/php.xml index 6306c0e..f4f21ad 100644 --- a/.idea/php.xml +++ b/.idea/php.xml @@ -31,8 +31,8 @@ - - + + @@ -42,9 +42,98 @@ + + + + + /usr/local/etc/php/conf.d/98-webdevops.ini, /usr/local/etc/php/conf.d/99-docker.ini, /usr/local/etc/php/conf.d/apcu.ini, /usr/local/etc/php/conf.d/docker-fpm.ini, /usr/local/etc/php/conf.d/docker-php-ext-amqp.ini, /usr/local/etc/php/conf.d/docker-php-ext-bcmath.ini, /usr/local/etc/php/conf.d/docker-php-ext-bz2.ini, /usr/local/etc/php/conf.d/docker-php-ext-calendar.ini, /usr/local/etc/php/conf.d/docker-php-ext-exif.ini, /usr/local/etc/php/conf.d/docker-php-ext-gd.ini, /usr/local/etc/php/conf.d/docker-php-ext-gettext.ini, /usr/local/etc/php/conf.d/docker-php-ext-gmp.ini, /usr/local/etc/php/conf.d/docker-php-ext-imagick.ini, /usr/local/etc/php/conf.d/docker-php-ext-imap.ini, /usr/local/etc/php/conf.d/docker-php-ext-intl.ini, /usr/local/etc/php/conf.d/docker-php-ext-ldap.ini, /usr/local/etc/php/conf.d/docker-php-ext-mysqli.ini, /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini, /usr/local/etc/php/conf.d/docker-php-ext-pcntl.ini, /usr/local/etc/php/conf.d/docker-php-ext-pdo_mysql.ini, /usr/local/etc/php/conf.d/docker-php-ext-pdo_pgsql.ini, /usr/local/etc/php/conf.d/docker-php-ext-pgsql.ini, /usr/local/etc/php/conf.d/docker-php-ext-shmop.ini, /usr/local/etc/php/conf.d/docker-php-ext-soap.ini, /usr/local/etc/php/conf.d/docker-php-ext-sockets.ini, /usr/local/etc/php/conf.d/docker-php-ext-sodium.ini, /usr/local/etc/php/conf.d/docker-php-ext-sysvmsg.ini, /usr/local/etc/php/conf.d/docker-php-ext-sysvsem.ini, /usr/local/etc/php/conf.d/docker-php-ext-sysvshm.ini, /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini, /usr/local/etc/php/conf.d/docker-php-ext-xsl.ini, /usr/local/etc/php/conf.d/docker-php-ext-zip.ini, /usr/local/etc/php/conf.d/memcached.ini, /usr/local/etc/php/conf.d/mongodb.ini, /usr/local/etc/php/conf.d/redis.ini, /usr/local/etc/php/conf.d/tideways.ini, /usr/local/etc/php/conf.d/vips.ini, /usr/local/etc/php/conf.d/xmlrpc.ini + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.idea/phpunit.xml b/.idea/phpunit.xml new file mode 100644 index 0000000..4f8104c --- /dev/null +++ b/.idea/phpunit.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/docker/application/Dockerfile b/docker/application/Dockerfile index db7acbc..d3b5997 100644 --- a/docker/application/Dockerfile +++ b/docker/application/Dockerfile @@ -1,4 +1,4 @@ -FROM webdevops/php-dev:8.2 +FROM webdevops/php-dev:8.3 COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer COPY --from=phario/phive:0.15.2 /usr/local/bin/phive /usr/local/bin/phive diff --git a/phive.xml b/phive.xml index 746b4e5..1d90e76 100644 --- a/phive.xml +++ b/phive.xml @@ -17,7 +17,7 @@ --> - + diff --git a/src/Task/AbstractCrontabCommand.php b/src/Task/AbstractCrontabCommand.php index 5744afe..9e2fda1 100644 --- a/src/Task/AbstractCrontabCommand.php +++ b/src/Task/AbstractCrontabCommand.php @@ -47,7 +47,7 @@ public function __construct( */ final public function getOptionsWithUser() : array { $options = $this instanceof HasOptionsInterface ? $this->getOptions() : []; - !$this->user ?: $options[] = "-u $this->user"; + (string) $this->user !== '' && $options[] = "-u $this->user"; return $options; } @@ -55,4 +55,4 @@ final public function __invoke() : void { $output = $this->commandRunner->run($this->crontabCommandFactory->build($this->getOptionsWithUser())); !$this instanceof HasOutputInteface ?: $this->writeln->writeln(PHP_EOL . $output); } -} \ No newline at end of file +} diff --git a/tools/psalm b/tools/psalm index 1166330..42a174c 100755 Binary files a/tools/psalm and b/tools/psalm differ