diff --git a/composer.json b/composer.json index c8d1f8a2..23249e6e 100644 --- a/composer.json +++ b/composer.json @@ -37,6 +37,7 @@ "ext-pdo": "*", "ext-posix": "*", "ext-redis": "*", + "ext-zlib": "*", "badges/poser": "^2.3", "composer/metadata-minifier": "^1.0", "composer/semver": "^3.2", @@ -80,6 +81,7 @@ "infection": "vendor/bin/infection", "lint": "vendor/bin/parallel-lint --exclude vendor .", "phpcs": "vendor/bin/phpcs --standard=ruleset.xml src/ tests/", + "phpcbf": "vendor/bin/phpcbf --standard=ruleset.xml src/ tests/", "phpstan": "vendor/bin/phpstan analyse --level=max --autoload-file=vendor/autoload.php bin/ public/ src/", "phpunit": "vendor/bin/phpunit ./tests/ --coverage-html=./report/coverage/ --whitelist=./src/ --testdox-html=./report/testdox.html --disallow-test-output --process-isolation", "psalm": "vendor/bin/psalm --taint-analysis", @@ -99,6 +101,7 @@ "infection": "Runs mutation test framework", "lint": "Runs complete codebase lint testing", "phpcs": "Runs coding style checking", + "phpcbf": "Runs coding style fixer", "phpstan": "Runs complete codebase static analysis", "phpunit": "Runs unit and integration testing", "psalm": "Runs complete codebase taint analysis", diff --git a/composer.lock b/composer.lock index 4d159d1c..609a0121 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "46bdd78df819fb75c7116762ddf10fe1", + "content-hash": "136e4ba104e929766bbc7aa4f7ba8079", "packages": [ { "name": "badges/poser", @@ -4850,16 +4850,16 @@ }, { "name": "justinrainbow/json-schema", - "version": "5.2.11", + "version": "5.2.12", "source": { "type": "git", "url": "https://github.com/justinrainbow/json-schema.git", - "reference": "2ab6744b7296ded80f8cc4f9509abbff393399aa" + "reference": "ad87d5a5ca981228e0e205c2bc7dfb8e24559b60" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/2ab6744b7296ded80f8cc4f9509abbff393399aa", - "reference": "2ab6744b7296ded80f8cc4f9509abbff393399aa", + "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/ad87d5a5ca981228e0e205c2bc7dfb8e24559b60", + "reference": "ad87d5a5ca981228e0e205c2bc7dfb8e24559b60", "shasum": "" }, "require": { @@ -4914,9 +4914,9 @@ ], "support": { "issues": "https://github.com/justinrainbow/json-schema/issues", - "source": "https://github.com/justinrainbow/json-schema/tree/5.2.11" + "source": "https://github.com/justinrainbow/json-schema/tree/5.2.12" }, - "time": "2021-07-22T09:24:00+00:00" + "time": "2022-04-13T08:02:27+00:00" }, { "name": "myclabs/deep-copy", @@ -5612,16 +5612,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.5.4", + "version": "1.5.6", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "bbf68cae24f6dc023c607ea0f87da55dd9d55c2b" + "reference": "799dd8c2d2c9c704bb55d2078078cb970cf0f6d1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/bbf68cae24f6dc023c607ea0f87da55dd9d55c2b", - "reference": "bbf68cae24f6dc023c607ea0f87da55dd9d55c2b", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/799dd8c2d2c9c704bb55d2078078cb970cf0f6d1", + "reference": "799dd8c2d2c9c704bb55d2078078cb970cf0f6d1", "shasum": "" }, "require": { @@ -5647,7 +5647,7 @@ "description": "PHPStan - PHP Static Analysis Tool", "support": { "issues": "https://github.com/phpstan/phpstan/issues", - "source": "https://github.com/phpstan/phpstan/tree/1.5.4" + "source": "https://github.com/phpstan/phpstan/tree/1.5.6" }, "funding": [ { @@ -5667,7 +5667,7 @@ "type": "tidelift" } ], - "time": "2022-04-03T12:39:00+00:00" + "time": "2022-04-15T11:13:37+00:00" }, { "name": "phpunit/php-code-coverage", @@ -6115,12 +6115,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "44e64dc3426a056b16041e56619b96619564b28d" + "reference": "dad1e44d86f958c5be9c5f355c9554ce22f1b1a7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/44e64dc3426a056b16041e56619b96619564b28d", - "reference": "44e64dc3426a056b16041e56619b96619564b28d", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/dad1e44d86f958c5be9c5f355c9554ce22f1b1a7", + "reference": "dad1e44d86f958c5be9c5f355c9554ce22f1b1a7", "shasum": "" }, "conflict": { @@ -6176,7 +6176,7 @@ "contao/core-bundle": "<4.9.18|>=4.10,<4.11.7|= 4.10.0", "contao/listing-bundle": ">=4,<4.4.8", "contao/managed-edition": "<=1.5", - "craftcms/cms": "<3.7.14", + "craftcms/cms": "<3.7.29", "croogo/croogo": "<3.0.7", "cuyz/valinor": ">=0.5,<0.7", "datadog/dd-trace": ">=0.30,<0.30.2", @@ -6265,7 +6265,7 @@ "illuminate/database": "<6.20.26|>=7,<7.30.5|>=8,<8.40", "illuminate/encryption": ">=4,<=4.0.11|>=4.1,<=4.1.31|>=4.2,<=4.2.22|>=5,<=5.0.35|>=5.1,<=5.1.46|>=5.2,<=5.2.45|>=5.3,<=5.3.31|>=5.4,<=5.4.36|>=5.5,<5.5.40|>=5.6,<5.6.15", "illuminate/view": "<6.20.42|>=7,<7.30.6|>=8,<8.75", - "impresscms/impresscms": "<1.4.3", + "impresscms/impresscms": "<=1.4.3", "in2code/femanager": "<5.5.1|>=6,<6.3.1", "intelliants/subrion": "<=4.2.1", "ivankristianto/phpwhois": "<=4.3", @@ -6288,6 +6288,7 @@ "laminas/laminas-http": "<2.14.2", "laravel/fortify": "<1.11.1", "laravel/framework": "<6.20.42|>=7,<7.30.6|>=8,<8.75", + "laravel/laravel": "<=5.8.38", "laravel/socialite": ">=1,<1.0.99|>=2,<2.0.10", "latte/latte": "<2.10.8", "lavalite/cms": "<=5.8", @@ -6362,7 +6363,7 @@ "phpoffice/phpspreadsheet": "<1.16", "phpseclib/phpseclib": "<2.0.31|>=3,<3.0.7", "phpservermon/phpservermon": "<=3.5.2", - "phpunit/phpunit": "<4.8.28|>=5,<5.6.3", + "phpunit/phpunit": ">=4.8.19,<4.8.28|>=5,<5.6.3", "phpwhois/phpwhois": "<=4.2.5", "phpxmlrpc/extras": "<0.6.1", "pimcore/data-hub": "<1.2.4", @@ -6378,7 +6379,7 @@ "prestashop/ps_emailsubscription": "<2.6.1", "prestashop/ps_facetedsearch": "<3.4.1", "prestashop/ps_linklist": "<3.1", - "privatebin/privatebin": "<1.2.2|>=1.3,<1.3.2", + "privatebin/privatebin": "<1.4", "propel/propel": ">=2-alpha.1,<=2-alpha.7", "propel/propel1": ">=1,<=1.7.1", "pterodactyl/panel": "<1.7", @@ -6421,7 +6422,7 @@ "simplito/elliptic-php": "<1.0.6", "slim/slim": "<2.6", "smarty/smarty": "<3.1.43|>=4,<4.0.3", - "snipe/snipe-it": "<= 6.0.0-RC-5|<5.3.11", + "snipe/snipe-it": "<5.4.2|>= 6.0.0-RC-1, <= 6.0.0-RC-5", "socalnick/scn-social-auth": "<1.15.2", "socialiteproviders/steam": "<1.1", "spipu/html2pdf": "<5.2.4", @@ -6474,6 +6475,7 @@ "symfony/yaml": ">=2,<2.0.22|>=2.1,<2.1.7", "t3/dce": ">=2.2,<2.6.2", "t3g/svg-sanitizer": "<1.0.3", + "tastyigniter/tastyigniter": "<3.3", "tecnickcom/tcpdf": "<6.2.22", "terminal42/contao-tablelookupwizard": "<3.3.5", "thelia/backoffice-default-template": ">=2.1,<2.1.2", @@ -6510,6 +6512,8 @@ "wikimedia/parsoid": "<0.12.2", "willdurand/js-translation-bundle": "<2.1.1", "wp-cli/wp-cli": "<2.5", + "wpanel/wpanel4-cms": "<=4.3.1", + "wwbn/avideo": "<=11.6", "yeswiki/yeswiki": "<4.1", "yetiforce/yetiforce-crm": "<=6.3", "yidashi/yii2cmf": "<=2", @@ -6585,7 +6589,7 @@ "type": "tidelift" } ], - "time": "2022-04-06T19:03:57+00:00" + "time": "2022-04-14T16:08:49+00:00" }, { "name": "sanmai/later", @@ -8428,7 +8432,8 @@ "ext-pcntl": "*", "ext-pdo": "*", "ext-posix": "*", - "ext-redis": "*" + "ext-redis": "*", + "ext-zlib": "*" }, "platform-dev": [], "plugin-api-version": "2.3.0" diff --git a/docker/nginx.Dockerfile b/docker/nginx.Dockerfile index 59ec86db..a14f3920 100644 --- a/docker/nginx.Dockerfile +++ b/docker/nginx.Dockerfile @@ -6,6 +6,12 @@ ENV TZ=:/etc/localtime # default PHP-FPM upstream ENV PHP_FPM=php-fpm +#============================================ +# Force base image upgrade +#============================================ +RUN apk add --no-cache --upgrade apk-tools && \ + apk upgrade --available + # nginx settings COPY docker/nginx/nginx.conf /etc/nginx/nginx.conf COPY docker/nginx/default.conf /etc/nginx/conf.d/default.conf diff --git a/docker/php.Dockerfile b/docker/php.Dockerfile index 38fb652f..7ca119f9 100644 --- a/docker/php.Dockerfile +++ b/docker/php.Dockerfile @@ -1,13 +1,19 @@ #============================================ # BUILD #============================================ -FROM php:8.1.4-cli-alpine3.15 AS builder +FROM php:8.1.5-cli-alpine3.15 AS builder # https://blog.packagecloud.io/eng/2017/02/21/set-environment-variable-save-thousands-of-system-calls/ ENV TZ=:/etc/localtime WORKDIR /usr/src +#============================================ +# Force base image upgrade +#============================================ +RUN apk add --no-cache --upgrade apk-tools && \ + apk upgrade --available + #============================================ # Dist dependencies #============================================ @@ -85,12 +91,18 @@ RUN composer install --no-progress --ignore-platform-reqs --no-dev --prefer-dist #============================================ # COMMAND LINE INTERFACE #============================================ -FROM php:8.1.4-cli-alpine3.15 as cli +FROM php:8.1.5-cli-alpine3.15 as cli # https://blog.packagecloud.io/eng/2017/02/21/set-environment-variable-save-thousands-of-system-calls/ ENV TZ=:/etc/localtime ENV PHP_ENV=development +#============================================ +# Force base image upgrade +#============================================ +RUN apk add --no-cache --upgrade apk-tools && \ + apk upgrade --available + #============================================ # Settings #============================================ @@ -159,12 +171,18 @@ CMD ["php"] #============================================ # FPM SAPI #============================================ -FROM php:8.1.4-fpm-alpine3.15 as fpm +FROM php:8.1.5-fpm-alpine3.15 as fpm # https://blog.packagecloud.io/eng/2017/02/21/set-environment-variable-save-thousands-of-system-calls/ ENV TZ=:/etc/localtime ENV PHP_ENV=development +#============================================ +# Force base image upgrade +#============================================ +RUN apk add --no-cache --upgrade apk-tools && \ + apk upgrade --available + #============================================ # Settings #============================================