Skip to content

Commit

Permalink
chore: updated composer.json & Dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
petrknap committed Nov 6, 2024
1 parent d592f46 commit 7f2ea03
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 10 deletions.
7 changes: 1 addition & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,10 @@ RUN apt-get update \
&& apt-get install -y --no-install-recommends \
git \
unzip \
&& php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
&& php -r "copy('https://composer.github.io/installer.sig', 'composer-setup.php.sig');" \
&& php -r "if (trim(hash_file('SHA384', 'composer-setup.php')) === trim(file_get_contents('composer-setup.php.sig'))) { echo 'Installer verified' . PHP_EOL; exit(0); } else { echo 'Installer corrupt' . PHP_EOL; unlink('composer-setup.php'); unlink('composer-setup.php.sig'); exit(-1); }" \
&& php composer-setup.php \
&& php -r "unlink('composer-setup.php'); unlink('composer-setup.php.sig');" \
&& mv composer.phar /usr/local/bin/composer \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* \
;
COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer
# endregion

# region included composer-library
Expand Down
7 changes: 3 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"WARNING": "This file is updated automatically. All keys will be overwritten, except of 'conflict', 'keywords', 'require', 'require-dev', 'scripts' and 'suggest'.",
"autoload": {
"psr-4": {
"PetrKnap\\CriticalSection\\": "src"
Expand Down Expand Up @@ -34,12 +33,12 @@
"name": "petrknap/critical-section",
"require": {
"php": ">=8.1",
"petrknap/shorts": "^2.1",
"petrknap/shorts": "^2.1|^3.0",
"symfony/lock": "^6.0|^7.0"
},
"require-dev": {
"nunomaduro/phpinsights": "^2.11",
"phpstan/phpstan": "^1.10",
"phpstan/phpstan": "^1.12",
"phpunit/phpunit": "^9.6",
"squizlabs/php_codesniffer": "^3.7"
},
Expand All @@ -57,7 +56,7 @@
"phpcs --colors --standard=PSR12 --exclude=Generic.Files.LineLength src tests",
"phpstan analyse --level max src --ansi --no-interaction",
"phpstan analyse --level 5 tests --ansi --no-interaction",
"phpinsights analyse src --ansi --no-interaction"
"phpinsights analyse src tests --ansi --no-interaction --format=github-action | sed -e \"s#::error file=$PWD/#::notice file=#g\""
],
"test-implementation": [
"@test"
Expand Down

0 comments on commit 7f2ea03

Please sign in to comment.