Skip to content

Commit

Permalink
Merge pull request #18 from codenamephp/dependabot/docker/docker/appl…
Browse files Browse the repository at this point in the history
…ication/webdevops/php-dev-8.3

Bump webdevops/php-dev from 8.2 to 8.3 in /docker/application
  • Loading branch information
bastianschwarz authored Jan 20, 2024
2 parents 5ccf906 + 35efcb6 commit 156fb10
Show file tree
Hide file tree
Showing 8 changed files with 107 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]'
1 change: 1 addition & 0 deletions .idea/deployer.crontab.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

93 changes: 91 additions & 2 deletions .idea/php.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions .idea/phpunit.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docker/application/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion phive.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
-->
<phive xmlns="https://phar.io/phive">
<phar name="phpunit" version="^10.0" location="./tools/phpunit.phar" copy="true" installed="10.0.16"/>
<phar name="psalm" version="^5.8" location="./tools/psalm" copy="true" installed="5.8.0"/>
<phar name="psalm" version="^5.8" location="./tools/psalm" copy="true" installed="5.20.0"/>
<phar name="composer-unused" version="^0.8.6" location="./tools/composer-unused" copy="true" installed="0.8.7"/>
<phar name="composer-require-checker" version="^4.5" location="./tools/composer-require-checker" copy="true" installed="4.5.0"/>
<phar name="infection" version="^0.26" location="./tools/infection" copy="true" installed="0.26.19"/>
Expand Down
4 changes: 2 additions & 2 deletions src/Task/AbstractCrontabCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@ 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;
}

final public function __invoke() : void {
$output = $this->commandRunner->run($this->crontabCommandFactory->build($this->getOptionsWithUser()));
!$this instanceof HasOutputInteface ?: $this->writeln->writeln(PHP_EOL . $output);
}
}
}
Binary file modified tools/psalm
Binary file not shown.

0 comments on commit 156fb10

Please sign in to comment.