diff --git a/Dockerfile b/Dockerfile index d5e59d05..161a474c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -73,11 +73,9 @@ RUN yarn install --immutable ## Actual deployable frontend image FROM nginx:alpine AS frontend-deployment -#FROM phpdockerio/nginx-pagespeed:latest AS frontend-deployment WORKDIR /application -#COPY infrastructure/nginx/pagespeed.conf /etc/nginx/pagespeed.conf COPY infrastructure/nginx/nginx.conf /etc/nginx/conf.d/default.conf # NGINX config: update php-fpm hostname to localhost (same pod in k8s), activate pagespeed config, deactivate SSL diff --git a/Makefile b/Makefile index 549613bd..1257a25c 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ MKCERT_LOCATION=bin/mkcert HOSTS_VERSION=3.6.4 HOSTS_LOCATION=bin/hosts SITE_HOST=phpdocker.local -PHP_RUN=docker-compose run -e XDEBUG_MODE=coverage --rm php-fpm +PHP_RUN=docker compose run -e XDEBUG_MODE=coverage --rm php-fpm INFECTION_THREADS?=8 BUILD_TAG?:=$(shell date +'%Y-%m-%d-%H-%M-%S')-$(shell git rev-parse --short HEAD) @@ -27,10 +27,10 @@ echo-build-tag-2: echo $(BUILD_TAG) start: - docker-compose up -d --scale php-fpm=2 + docker compose up -d --scale php-fpm=2 stop: - docker-compose stop + docker compose stop shell: $(PHP_RUN) bash @@ -38,12 +38,12 @@ shell: init: clean install-mkcert create-certs install-hosts clean-hosts init-hosts build-local install-dependencies install-assets-dev fix-permissions fix-cache-permissions-dev start clean: clear-cache - docker-compose down + docker compose down sudo rm -rf vendor make clear-cache build-local: - docker-compose build + docker compose build fix-permissions: sudo chown -Rf $(shell id -u):$(shell id -g) . diff --git a/composer.json b/composer.json index bc9c245b..6f7973df 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,6 @@ "ext-iconv": "*", "ext-redis": "*", "ext-zip": "*", - "doctrine/annotations": "^2.0", "michelf/php-markdown": "^2.0", "symfony/console": "^6.0", "symfony/dotenv": "^6.0", diff --git a/composer.lock b/composer.lock index f1c92d9b..786eda74 100644 --- a/composer.lock +++ b/composer.lock @@ -4,161 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "99f7a61cc81d832e7357fb445413b623", + "content-hash": "99cd57d8447bd955a7152361719b8f8c", "packages": [ - { - "name": "doctrine/annotations", - "version": "2.0.1", - "source": { - "type": "git", - "url": "https://github.com/doctrine/annotations.git", - "reference": "e157ef3f3124bbf6fe7ce0ffd109e8a8ef284e7f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/e157ef3f3124bbf6fe7ce0ffd109e8a8ef284e7f", - "reference": "e157ef3f3124bbf6fe7ce0ffd109e8a8ef284e7f", - "shasum": "" - }, - "require": { - "doctrine/lexer": "^2 || ^3", - "ext-tokenizer": "*", - "php": "^7.2 || ^8.0", - "psr/cache": "^1 || ^2 || ^3" - }, - "require-dev": { - "doctrine/cache": "^2.0", - "doctrine/coding-standard": "^10", - "phpstan/phpstan": "^1.8.0", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "symfony/cache": "^5.4 || ^6", - "vimeo/psalm": "^4.10" - }, - "suggest": { - "php": "PHP 8.0 or higher comes with attributes, a native replacement for annotations" - }, - "type": "library", - "autoload": { - "psr-4": { - "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, - { - "name": "Roman Borschel", - "email": "roman@code-factory.org" - }, - { - "name": "Benjamin Eberlei", - "email": "kontakt@beberlei.de" - }, - { - "name": "Jonathan Wage", - "email": "jonwage@gmail.com" - }, - { - "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com" - } - ], - "description": "Docblock Annotations Parser", - "homepage": "https://www.doctrine-project.org/projects/annotations.html", - "keywords": [ - "annotations", - "docblock", - "parser" - ], - "support": { - "issues": "https://github.com/doctrine/annotations/issues", - "source": "https://github.com/doctrine/annotations/tree/2.0.1" - }, - "time": "2023-02-02T22:02:53+00:00" - }, - { - "name": "doctrine/lexer", - "version": "3.0.1", - "source": { - "type": "git", - "url": "https://github.com/doctrine/lexer.git", - "reference": "31ad66abc0fc9e1a1f2d9bc6a42668d2fbbcd6dd" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/lexer/zipball/31ad66abc0fc9e1a1f2d9bc6a42668d2fbbcd6dd", - "reference": "31ad66abc0fc9e1a1f2d9bc6a42668d2fbbcd6dd", - "shasum": "" - }, - "require": { - "php": "^8.1" - }, - "require-dev": { - "doctrine/coding-standard": "^12", - "phpstan/phpstan": "^1.10", - "phpunit/phpunit": "^10.5", - "psalm/plugin-phpunit": "^0.18.3", - "vimeo/psalm": "^5.21" - }, - "type": "library", - "autoload": { - "psr-4": { - "Doctrine\\Common\\Lexer\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, - { - "name": "Roman Borschel", - "email": "roman@code-factory.org" - }, - { - "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com" - } - ], - "description": "PHP Doctrine Lexer parser library that can be used in Top-Down, Recursive Descent Parsers.", - "homepage": "https://www.doctrine-project.org/projects/lexer.html", - "keywords": [ - "annotations", - "docblock", - "lexer", - "parser", - "php" - ], - "support": { - "issues": "https://github.com/doctrine/lexer/issues", - "source": "https://github.com/doctrine/lexer/tree/3.0.1" - }, - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer", - "type": "tidelift" - } - ], - "time": "2024-02-05T11:56:58+00:00" - }, { "name": "michelf/php-markdown", "version": "2.0.0", @@ -520,16 +367,16 @@ }, { "name": "symfony/cache", - "version": "v6.4.8", + "version": "v6.4.10", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "287142df5579ce223c485b3872df3efae8390984" + "reference": "6702d2d777260e6ff3451fee2d7d78ab5f715cdc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/287142df5579ce223c485b3872df3efae8390984", - "reference": "287142df5579ce223c485b3872df3efae8390984", + "url": "https://api.github.com/repos/symfony/cache/zipball/6702d2d777260e6ff3451fee2d7d78ab5f715cdc", + "reference": "6702d2d777260e6ff3451fee2d7d78ab5f715cdc", "shasum": "" }, "require": { @@ -596,7 +443,7 @@ "psr6" ], "support": { - "source": "https://github.com/symfony/cache/tree/v6.4.8" + "source": "https://github.com/symfony/cache/tree/v6.4.10" }, "funding": [ { @@ -612,7 +459,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-07-17T06:05:49+00:00" }, { "name": "symfony/cache-contracts", @@ -767,16 +614,16 @@ }, { "name": "symfony/console", - "version": "v6.4.9", + "version": "v6.4.10", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "6edb5363ec0c78ad4d48c5128ebf4d083d89d3a9" + "reference": "504974cbe43d05f83b201d6498c206f16fc0cdbc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/6edb5363ec0c78ad4d48c5128ebf4d083d89d3a9", - "reference": "6edb5363ec0c78ad4d48c5128ebf4d083d89d3a9", + "url": "https://api.github.com/repos/symfony/console/zipball/504974cbe43d05f83b201d6498c206f16fc0cdbc", + "reference": "504974cbe43d05f83b201d6498c206f16fc0cdbc", "shasum": "" }, "require": { @@ -841,7 +688,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.4.9" + "source": "https://github.com/symfony/console/tree/v6.4.10" }, "funding": [ { @@ -857,20 +704,20 @@ "type": "tidelift" } ], - "time": "2024-06-28T09:49:33+00:00" + "time": "2024-07-26T12:30:32+00:00" }, { "name": "symfony/dependency-injection", - "version": "v6.4.9", + "version": "v6.4.10", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "a4df9dfe5da2d177af6643610c7bee2cb76a9f5e" + "reference": "5caf9c5f6085f13b27d70a236b776c07e4a1c3eb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/a4df9dfe5da2d177af6643610c7bee2cb76a9f5e", - "reference": "a4df9dfe5da2d177af6643610c7bee2cb76a9f5e", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/5caf9c5f6085f13b27d70a236b776c07e4a1c3eb", + "reference": "5caf9c5f6085f13b27d70a236b776c07e4a1c3eb", "shasum": "" }, "require": { @@ -922,7 +769,7 @@ "description": "Allows you to standardize and centralize the way objects are constructed in your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dependency-injection/tree/v6.4.9" + "source": "https://github.com/symfony/dependency-injection/tree/v6.4.10" }, "funding": [ { @@ -938,7 +785,7 @@ "type": "tidelift" } ], - "time": "2024-06-19T10:45:28+00:00" + "time": "2024-07-26T07:32:07+00:00" }, { "name": "symfony/deprecation-contracts", @@ -1009,16 +856,16 @@ }, { "name": "symfony/dotenv", - "version": "v6.4.8", + "version": "v6.4.10", "source": { "type": "git", "url": "https://github.com/symfony/dotenv.git", - "reference": "55aefa0029adff89ecffdb560820e945c7983f06" + "reference": "2ae0c84cc9be0dc1eeb86016970b63c764d8472e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dotenv/zipball/55aefa0029adff89ecffdb560820e945c7983f06", - "reference": "55aefa0029adff89ecffdb560820e945c7983f06", + "url": "https://api.github.com/repos/symfony/dotenv/zipball/2ae0c84cc9be0dc1eeb86016970b63c764d8472e", + "reference": "2ae0c84cc9be0dc1eeb86016970b63c764d8472e", "shasum": "" }, "require": { @@ -1063,7 +910,7 @@ "environment" ], "support": { - "source": "https://github.com/symfony/dotenv/tree/v6.4.8" + "source": "https://github.com/symfony/dotenv/tree/v6.4.10" }, "funding": [ { @@ -1079,20 +926,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-07-09T18:29:35+00:00" }, { "name": "symfony/error-handler", - "version": "v6.4.9", + "version": "v6.4.10", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "c9b7cc075b3ab484239855622ca05cb0b99c13ec" + "reference": "231f1b2ee80f72daa1972f7340297d67439224f0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/c9b7cc075b3ab484239855622ca05cb0b99c13ec", - "reference": "c9b7cc075b3ab484239855622ca05cb0b99c13ec", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/231f1b2ee80f72daa1972f7340297d67439224f0", + "reference": "231f1b2ee80f72daa1972f7340297d67439224f0", "shasum": "" }, "require": { @@ -1138,7 +985,7 @@ "description": "Provides tools to manage errors and ease debugging PHP code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/error-handler/tree/v6.4.9" + "source": "https://github.com/symfony/error-handler/tree/v6.4.10" }, "funding": [ { @@ -1154,7 +1001,7 @@ "type": "tidelift" } ], - "time": "2024-06-21T16:04:15+00:00" + "time": "2024-07-26T12:30:32+00:00" }, { "name": "symfony/event-dispatcher", @@ -1380,16 +1227,16 @@ }, { "name": "symfony/finder", - "version": "v6.4.8", + "version": "v6.4.10", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "3ef977a43883215d560a2cecb82ec8e62131471c" + "reference": "af29198d87112bebdd397bd7735fbd115997824c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/3ef977a43883215d560a2cecb82ec8e62131471c", - "reference": "3ef977a43883215d560a2cecb82ec8e62131471c", + "url": "https://api.github.com/repos/symfony/finder/zipball/af29198d87112bebdd397bd7735fbd115997824c", + "reference": "af29198d87112bebdd397bd7735fbd115997824c", "shasum": "" }, "require": { @@ -1424,7 +1271,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v6.4.8" + "source": "https://github.com/symfony/finder/tree/v6.4.10" }, "funding": [ { @@ -1440,20 +1287,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-07-24T07:06:38+00:00" }, { "name": "symfony/flex", - "version": "v2.4.5", + "version": "v2.4.6", "source": { "type": "git", "url": "https://github.com/symfony/flex.git", - "reference": "b0a405f40614c9f584b489d54f91091817b0e26e" + "reference": "4dc11919791f81d087a12db2ab4c7e044431ef6b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/flex/zipball/b0a405f40614c9f584b489d54f91091817b0e26e", - "reference": "b0a405f40614c9f584b489d54f91091817b0e26e", + "url": "https://api.github.com/repos/symfony/flex/zipball/4dc11919791f81d087a12db2ab4c7e044431ef6b", + "reference": "4dc11919791f81d087a12db2ab4c7e044431ef6b", "shasum": "" }, "require": { @@ -1489,7 +1336,7 @@ "description": "Composer plugin for Symfony", "support": { "issues": "https://github.com/symfony/flex/issues", - "source": "https://github.com/symfony/flex/tree/v2.4.5" + "source": "https://github.com/symfony/flex/tree/v2.4.6" }, "funding": [ { @@ -1505,20 +1352,20 @@ "type": "tidelift" } ], - "time": "2024-03-02T08:16:47+00:00" + "time": "2024-04-27T10:22:22+00:00" }, { "name": "symfony/form", - "version": "v6.4.8", + "version": "v6.4.10", "source": { "type": "git", "url": "https://github.com/symfony/form.git", - "reference": "196ebc738e59bec2bbf1f49c24cc221b47f77f5d" + "reference": "67dd6a3fd986cae9a90a8c2c526464c06f525863" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/form/zipball/196ebc738e59bec2bbf1f49c24cc221b47f77f5d", - "reference": "196ebc738e59bec2bbf1f49c24cc221b47f77f5d", + "url": "https://api.github.com/repos/symfony/form/zipball/67dd6a3fd986cae9a90a8c2c526464c06f525863", + "reference": "67dd6a3fd986cae9a90a8c2c526464c06f525863", "shasum": "" }, "require": { @@ -1586,7 +1433,7 @@ "description": "Allows to easily create, process and reuse HTML forms", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/form/tree/v6.4.8" + "source": "https://github.com/symfony/form/tree/v6.4.10" }, "funding": [ { @@ -1602,20 +1449,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-07-19T08:21:35+00:00" }, { "name": "symfony/framework-bundle", - "version": "v6.4.9", + "version": "v6.4.10", "source": { "type": "git", "url": "https://github.com/symfony/framework-bundle.git", - "reference": "c1d1cb0e508e11639283e1e6f8918eef0fa524bd" + "reference": "6cbdb0cc3ddbb63499262cd3036882b08ee2690b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/c1d1cb0e508e11639283e1e6f8918eef0fa524bd", - "reference": "c1d1cb0e508e11639283e1e6f8918eef0fa524bd", + "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/6cbdb0cc3ddbb63499262cd3036882b08ee2690b", + "reference": "6cbdb0cc3ddbb63499262cd3036882b08ee2690b", "shasum": "" }, "require": { @@ -1734,7 +1581,7 @@ "description": "Provides a tight integration between Symfony components and the Symfony full-stack framework", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/framework-bundle/tree/v6.4.9" + "source": "https://github.com/symfony/framework-bundle/tree/v6.4.10" }, "funding": [ { @@ -1750,20 +1597,20 @@ "type": "tidelift" } ], - "time": "2024-06-26T08:32:27+00:00" + "time": "2024-07-26T13:24:20+00:00" }, { "name": "symfony/http-foundation", - "version": "v6.4.8", + "version": "v6.4.10", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "27de8cc95e11db7a50b027e71caaab9024545947" + "reference": "117f1f20a7ade7bcea28b861fb79160a21a1e37b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/27de8cc95e11db7a50b027e71caaab9024545947", - "reference": "27de8cc95e11db7a50b027e71caaab9024545947", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/117f1f20a7ade7bcea28b861fb79160a21a1e37b", + "reference": "117f1f20a7ade7bcea28b861fb79160a21a1e37b", "shasum": "" }, "require": { @@ -1811,7 +1658,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v6.4.8" + "source": "https://github.com/symfony/http-foundation/tree/v6.4.10" }, "funding": [ { @@ -1827,20 +1674,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-07-26T12:36:27+00:00" }, { "name": "symfony/http-kernel", - "version": "v6.4.9", + "version": "v6.4.10", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "cc4a9bec6e1bdd2405f40277a68a6ed1bb393005" + "reference": "147e0daf618d7575b5007055340d09aece5cf068" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/cc4a9bec6e1bdd2405f40277a68a6ed1bb393005", - "reference": "cc4a9bec6e1bdd2405f40277a68a6ed1bb393005", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/147e0daf618d7575b5007055340d09aece5cf068", + "reference": "147e0daf618d7575b5007055340d09aece5cf068", "shasum": "" }, "require": { @@ -1925,7 +1772,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v6.4.9" + "source": "https://github.com/symfony/http-kernel/tree/v6.4.10" }, "funding": [ { @@ -1941,7 +1788,7 @@ "type": "tidelift" } ], - "time": "2024-06-28T11:48:06+00:00" + "time": "2024-07-26T14:52:04+00:00" }, { "name": "symfony/mime", @@ -2814,6 +2661,82 @@ ], "time": "2024-05-31T15:07:36+00:00" }, + { + "name": "symfony/polyfill-php81", + "version": "v1.30.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php81.git", + "reference": "3fb075789fb91f9ad9af537c4012d523085bd5af" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/3fb075789fb91f9ad9af537c4012d523085bd5af", + "reference": "3fb075789fb91f9ad9af537c4012d523085bd5af", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "type": "library", + "extra": { + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php81\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php81/tree/v1.30.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-06-19T12:30:46+00:00" + }, { "name": "symfony/polyfill-php83", "version": "v1.30.0", @@ -2969,16 +2892,16 @@ }, { "name": "symfony/property-info", - "version": "v6.4.9", + "version": "v6.4.10", "source": { "type": "git", "url": "https://github.com/symfony/property-info.git", - "reference": "1a0357ed93a6ab09482435a7818defaa85cad69b" + "reference": "edaea9dcc723cb4a0ab6a00f7d6f8c07c0d8ff77" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/property-info/zipball/1a0357ed93a6ab09482435a7818defaa85cad69b", - "reference": "1a0357ed93a6ab09482435a7818defaa85cad69b", + "url": "https://api.github.com/repos/symfony/property-info/zipball/edaea9dcc723cb4a0ab6a00f7d6f8c07c0d8ff77", + "reference": "edaea9dcc723cb4a0ab6a00f7d6f8c07c0d8ff77", "shasum": "" }, "require": { @@ -3032,7 +2955,7 @@ "validator" ], "support": { - "source": "https://github.com/symfony/property-info/tree/v6.4.9" + "source": "https://github.com/symfony/property-info/tree/v6.4.10" }, "funding": [ { @@ -3048,20 +2971,20 @@ "type": "tidelift" } ], - "time": "2024-06-21T16:04:15+00:00" + "time": "2024-07-26T07:32:07+00:00" }, { "name": "symfony/routing", - "version": "v6.4.8", + "version": "v6.4.10", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "8a40d0f9b01f0fbb80885d3ce0ad6714fb603a58" + "reference": "aad19fe10753ba842f0d653a8db819c4b3affa87" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/8a40d0f9b01f0fbb80885d3ce0ad6714fb603a58", - "reference": "8a40d0f9b01f0fbb80885d3ce0ad6714fb603a58", + "url": "https://api.github.com/repos/symfony/routing/zipball/aad19fe10753ba842f0d653a8db819c4b3affa87", + "reference": "aad19fe10753ba842f0d653a8db819c4b3affa87", "shasum": "" }, "require": { @@ -3115,7 +3038,7 @@ "url" ], "support": { - "source": "https://github.com/symfony/routing/tree/v6.4.8" + "source": "https://github.com/symfony/routing/tree/v6.4.10" }, "funding": [ { @@ -3131,7 +3054,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-07-15T09:26:24+00:00" }, { "name": "symfony/runtime", @@ -3214,16 +3137,16 @@ }, { "name": "symfony/security-core", - "version": "v6.4.9", + "version": "v6.4.10", "source": { "type": "git", "url": "https://github.com/symfony/security-core.git", - "reference": "2d58f4c3ff50b1b4eef0a333c2b1e3eef46807f4" + "reference": "432dec55da108c471adcf58c351af01372a52164" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/security-core/zipball/2d58f4c3ff50b1b4eef0a333c2b1e3eef46807f4", - "reference": "2d58f4c3ff50b1b4eef0a333c2b1e3eef46807f4", + "url": "https://api.github.com/repos/symfony/security-core/zipball/432dec55da108c471adcf58c351af01372a52164", + "reference": "432dec55da108c471adcf58c351af01372a52164", "shasum": "" }, "require": { @@ -3280,7 +3203,7 @@ "description": "Symfony Security Component - Core Library", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/security-core/tree/v6.4.9" + "source": "https://github.com/symfony/security-core/tree/v6.4.10" }, "funding": [ { @@ -3296,7 +3219,7 @@ "type": "tidelift" } ], - "time": "2024-06-28T07:59:05+00:00" + "time": "2024-07-26T12:30:32+00:00" }, { "name": "symfony/security-csrf", @@ -3451,16 +3374,16 @@ }, { "name": "symfony/string", - "version": "v6.4.9", + "version": "v6.4.10", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "76792dbd99690a5ebef8050d9206c60c59e681d7" + "reference": "ccf9b30251719567bfd46494138327522b9a9446" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/76792dbd99690a5ebef8050d9206c60c59e681d7", - "reference": "76792dbd99690a5ebef8050d9206c60c59e681d7", + "url": "https://api.github.com/repos/symfony/string/zipball/ccf9b30251719567bfd46494138327522b9a9446", + "reference": "ccf9b30251719567bfd46494138327522b9a9446", "shasum": "" }, "require": { @@ -3517,7 +3440,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.4.9" + "source": "https://github.com/symfony/string/tree/v6.4.10" }, "funding": [ { @@ -3533,7 +3456,7 @@ "type": "tidelift" } ], - "time": "2024-06-28T09:25:38+00:00" + "time": "2024-07-22T10:21:14+00:00" }, { "name": "symfony/translation-contracts", @@ -3808,16 +3731,16 @@ }, { "name": "symfony/validator", - "version": "v6.4.9", + "version": "v6.4.10", "source": { "type": "git", "url": "https://github.com/symfony/validator.git", - "reference": "ee0a4d6a327a963aee094f730da238f7ea18cb01" + "reference": "bcf939a9d1acd7d2912e9474c0c3d7840a03cbcd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/validator/zipball/ee0a4d6a327a963aee094f730da238f7ea18cb01", - "reference": "ee0a4d6a327a963aee094f730da238f7ea18cb01", + "url": "https://api.github.com/repos/symfony/validator/zipball/bcf939a9d1acd7d2912e9474c0c3d7840a03cbcd", + "reference": "bcf939a9d1acd7d2912e9474c0c3d7840a03cbcd", "shasum": "" }, "require": { @@ -3885,7 +3808,7 @@ "description": "Provides tools to validate values", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/validator/tree/v6.4.9" + "source": "https://github.com/symfony/validator/tree/v6.4.10" }, "funding": [ { @@ -3901,20 +3824,20 @@ "type": "tidelift" } ], - "time": "2024-06-22T07:42:41+00:00" + "time": "2024-07-26T12:30:32+00:00" }, { "name": "symfony/var-dumper", - "version": "v6.4.9", + "version": "v6.4.10", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "c31566e4ca944271cc8d8ac6887cbf31b8c6a172" + "reference": "a71cc3374f5fb9759da1961d28c452373b343dd4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/c31566e4ca944271cc8d8ac6887cbf31b8c6a172", - "reference": "c31566e4ca944271cc8d8ac6887cbf31b8c6a172", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/a71cc3374f5fb9759da1961d28c452373b343dd4", + "reference": "a71cc3374f5fb9759da1961d28c452373b343dd4", "shasum": "" }, "require": { @@ -3970,7 +3893,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.4.9" + "source": "https://github.com/symfony/var-dumper/tree/v6.4.10" }, "funding": [ { @@ -3986,7 +3909,7 @@ "type": "tidelift" } ], - "time": "2024-06-27T13:23:14+00:00" + "time": "2024-07-26T12:30:32+00:00" }, { "name": "symfony/var-exporter", @@ -4139,16 +4062,16 @@ }, { "name": "twig/extra-bundle", - "version": "v3.10.0", + "version": "v3.11.0", "source": { "type": "git", "url": "https://github.com/twigphp/twig-extra-bundle.git", - "reference": "cdc6e23aeb7f4953c1039568c3439aab60c56454" + "reference": "bf8a304eac15838d7724fdf64c345bdefbb75f03" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/twig-extra-bundle/zipball/cdc6e23aeb7f4953c1039568c3439aab60c56454", - "reference": "cdc6e23aeb7f4953c1039568c3439aab60c56454", + "url": "https://api.github.com/repos/twigphp/twig-extra-bundle/zipball/bf8a304eac15838d7724fdf64c345bdefbb75f03", + "reference": "bf8a304eac15838d7724fdf64c345bdefbb75f03", "shasum": "" }, "require": { @@ -4197,7 +4120,7 @@ "twig" ], "support": { - "source": "https://github.com/twigphp/twig-extra-bundle/tree/v3.10.0" + "source": "https://github.com/twigphp/twig-extra-bundle/tree/v3.11.0" }, "funding": [ { @@ -4209,20 +4132,20 @@ "type": "tidelift" } ], - "time": "2024-05-11T07:35:57+00:00" + "time": "2024-06-21T06:25:01+00:00" }, { "name": "twig/twig", - "version": "v3.10.3", + "version": "v3.11.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "67f29781ffafa520b0bbfbd8384674b42db04572" + "reference": "e80fb8ebba85c7341a97a9ebf825d7fd4b77708d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/67f29781ffafa520b0bbfbd8384674b42db04572", - "reference": "67f29781ffafa520b0bbfbd8384674b42db04572", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/e80fb8ebba85c7341a97a9ebf825d7fd4b77708d", + "reference": "e80fb8ebba85c7341a97a9ebf825d7fd4b77708d", "shasum": "" }, "require": { @@ -4230,7 +4153,8 @@ "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-ctype": "^1.8", "symfony/polyfill-mbstring": "^1.3", - "symfony/polyfill-php80": "^1.22" + "symfony/polyfill-php80": "^1.22", + "symfony/polyfill-php81": "^1.29" }, "require-dev": { "psr/container": "^1.0|^2.0", @@ -4276,7 +4200,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.10.3" + "source": "https://github.com/twigphp/Twig/tree/v3.11.0" }, "funding": [ { @@ -4288,7 +4212,7 @@ "type": "tidelift" } ], - "time": "2024-05-16T10:04:27+00:00" + "time": "2024-08-08T16:15:16+00:00" } ], "packages-dev": [ @@ -4823,16 +4747,16 @@ }, { "name": "friends-of-behat/symfony-extension", - "version": "v2.5.0", + "version": "v2.6.0", "source": { "type": "git", "url": "https://github.com/FriendsOfBehat/SymfonyExtension.git", - "reference": "92653f5c8a5d14300434411eb76aed584802e722" + "reference": "dfb1c9c96cc0fb7c8e1caa060695426a12e1efbd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfBehat/SymfonyExtension/zipball/92653f5c8a5d14300434411eb76aed584802e722", - "reference": "92653f5c8a5d14300434411eb76aed584802e722", + "url": "https://api.github.com/repos/FriendsOfBehat/SymfonyExtension/zipball/dfb1c9c96cc0fb7c8e1caa060695426a12e1efbd", + "reference": "dfb1c9c96cc0fb7c8e1caa060695426a12e1efbd", "shasum": "" }, "require": { @@ -4885,9 +4809,9 @@ "description": "Integrates Behat with Symfony.", "support": { "issues": "https://github.com/FriendsOfBehat/SymfonyExtension/issues", - "source": "https://github.com/FriendsOfBehat/SymfonyExtension/tree/v2.5.0" + "source": "https://github.com/FriendsOfBehat/SymfonyExtension/tree/v2.6.0" }, - "time": "2024-01-11T14:57:03+00:00" + "time": "2024-07-03T15:49:43+00:00" }, { "name": "masterminds/html5", @@ -5018,16 +4942,16 @@ }, { "name": "nikic/php-parser", - "version": "v5.0.2", + "version": "v5.1.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "139676794dc1e9231bf7bcd123cfc0c99182cb13" + "reference": "683130c2ff8c2739f4822ff7ac5c873ec529abd1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/139676794dc1e9231bf7bcd123cfc0c99182cb13", - "reference": "139676794dc1e9231bf7bcd123cfc0c99182cb13", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/683130c2ff8c2739f4822ff7ac5c873ec529abd1", + "reference": "683130c2ff8c2739f4822ff7ac5c873ec529abd1", "shasum": "" }, "require": { @@ -5038,7 +4962,7 @@ }, "require-dev": { "ircmaxell/php-yacc": "^0.0.7", - "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" + "phpunit/phpunit": "^9.0" }, "bin": [ "bin/php-parse" @@ -5070,9 +4994,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v5.0.2" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.1.0" }, - "time": "2024-03-05T20:51:40+00:00" + "time": "2024-07-01T20:03:41+00:00" }, { "name": "phar-io/manifest", @@ -5194,16 +5118,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.11.5", + "version": "1.11.10", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "490f0ae1c92b082f154681d7849aee776a7c1443" + "reference": "640410b32995914bde3eed26fa89552f9c2c082f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/490f0ae1c92b082f154681d7849aee776a7c1443", - "reference": "490f0ae1c92b082f154681d7849aee776a7c1443", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/640410b32995914bde3eed26fa89552f9c2c082f", + "reference": "640410b32995914bde3eed26fa89552f9c2c082f", "shasum": "" }, "require": { @@ -5248,7 +5172,7 @@ "type": "github" } ], - "time": "2024-06-17T15:10:54+00:00" + "time": "2024-08-08T09:02:50+00:00" }, { "name": "phpunit/php-code-coverage", @@ -5571,45 +5495,45 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.19", + "version": "9.6.20", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "a1a54a473501ef4cdeaae4e06891674114d79db8" + "reference": "49d7820565836236411f5dc002d16dd689cde42f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a1a54a473501ef4cdeaae4e06891674114d79db8", - "reference": "a1a54a473501ef4cdeaae4e06891674114d79db8", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/49d7820565836236411f5dc002d16dd689cde42f", + "reference": "49d7820565836236411f5dc002d16dd689cde42f", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.3.1 || ^2", + "doctrine/instantiator": "^1.5.0 || ^2", "ext-dom": "*", "ext-json": "*", "ext-libxml": "*", "ext-mbstring": "*", "ext-xml": "*", "ext-xmlwriter": "*", - "myclabs/deep-copy": "^1.10.1", - "phar-io/manifest": "^2.0.3", - "phar-io/version": "^3.0.2", + "myclabs/deep-copy": "^1.12.0", + "phar-io/manifest": "^2.0.4", + "phar-io/version": "^3.2.1", "php": ">=7.3", - "phpunit/php-code-coverage": "^9.2.28", - "phpunit/php-file-iterator": "^3.0.5", + "phpunit/php-code-coverage": "^9.2.31", + "phpunit/php-file-iterator": "^3.0.6", "phpunit/php-invoker": "^3.1.1", - "phpunit/php-text-template": "^2.0.3", - "phpunit/php-timer": "^5.0.2", - "sebastian/cli-parser": "^1.0.1", - "sebastian/code-unit": "^1.0.6", + "phpunit/php-text-template": "^2.0.4", + "phpunit/php-timer": "^5.0.3", + "sebastian/cli-parser": "^1.0.2", + "sebastian/code-unit": "^1.0.8", "sebastian/comparator": "^4.0.8", - "sebastian/diff": "^4.0.3", - "sebastian/environment": "^5.1.3", - "sebastian/exporter": "^4.0.5", - "sebastian/global-state": "^5.0.1", - "sebastian/object-enumerator": "^4.0.3", - "sebastian/resource-operations": "^3.0.3", - "sebastian/type": "^3.2", + "sebastian/diff": "^4.0.6", + "sebastian/environment": "^5.1.5", + "sebastian/exporter": "^4.0.6", + "sebastian/global-state": "^5.0.7", + "sebastian/object-enumerator": "^4.0.4", + "sebastian/resource-operations": "^3.0.4", + "sebastian/type": "^3.2.1", "sebastian/version": "^3.0.2" }, "suggest": { @@ -5654,7 +5578,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.19" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.20" }, "funding": [ { @@ -5670,7 +5594,7 @@ "type": "tidelift" } ], - "time": "2024-04-05T04:35:58+00:00" + "time": "2024-07-10T11:45:39+00:00" }, { "name": "sebastian/cli-parser", @@ -6911,16 +6835,16 @@ }, { "name": "symfony/phpunit-bridge", - "version": "v5.4.41", + "version": "v5.4.42", "source": { "type": "git", "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "26c1a402b9f5547da43769fef67865355e104b31" + "reference": "49b7764b137617afd3d9aee72f1040eaa6f35be7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/26c1a402b9f5547da43769fef67865355e104b31", - "reference": "26c1a402b9f5547da43769fef67865355e104b31", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/49b7764b137617afd3d9aee72f1040eaa6f35be7", + "reference": "49b7764b137617afd3d9aee72f1040eaa6f35be7", "shasum": "" }, "require": { @@ -6975,7 +6899,7 @@ "description": "Provides utilities for PHPUnit, especially user deprecation notices management", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/phpunit-bridge/tree/v5.4.41" + "source": "https://github.com/symfony/phpunit-bridge/tree/v5.4.42" }, "funding": [ { @@ -6991,7 +6915,7 @@ "type": "tidelift" } ], - "time": "2024-06-14T19:09:16+00:00" + "time": "2024-07-26T12:21:55+00:00" }, { "name": "symfony/stopwatch", @@ -7057,16 +6981,16 @@ }, { "name": "symfony/translation", - "version": "v6.4.8", + "version": "v6.4.10", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "a002933b13989fc4bd0b58e04bf7eec5210e438a" + "reference": "94041203f8ac200ae9e7c6a18fa6137814ccecc9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/a002933b13989fc4bd0b58e04bf7eec5210e438a", - "reference": "a002933b13989fc4bd0b58e04bf7eec5210e438a", + "url": "https://api.github.com/repos/symfony/translation/zipball/94041203f8ac200ae9e7c6a18fa6137814ccecc9", + "reference": "94041203f8ac200ae9e7c6a18fa6137814ccecc9", "shasum": "" }, "require": { @@ -7132,7 +7056,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v6.4.8" + "source": "https://github.com/symfony/translation/tree/v6.4.10" }, "funding": [ { @@ -7148,20 +7072,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-07-26T12:30:32+00:00" }, { "name": "symfony/web-profiler-bundle", - "version": "v6.4.8", + "version": "v6.4.10", "source": { "type": "git", "url": "https://github.com/symfony/web-profiler-bundle.git", - "reference": "bcc806d1360991de3bf78ac5ca0202db85de9bfc" + "reference": "370c9f1e3567cd4670d44311838e37d16182c3a7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/web-profiler-bundle/zipball/bcc806d1360991de3bf78ac5ca0202db85de9bfc", - "reference": "bcc806d1360991de3bf78ac5ca0202db85de9bfc", + "url": "https://api.github.com/repos/symfony/web-profiler-bundle/zipball/370c9f1e3567cd4670d44311838e37d16182c3a7", + "reference": "370c9f1e3567cd4670d44311838e37d16182c3a7", "shasum": "" }, "require": { @@ -7214,7 +7138,7 @@ "dev" ], "support": { - "source": "https://github.com/symfony/web-profiler-bundle/tree/v6.4.8" + "source": "https://github.com/symfony/web-profiler-bundle/tree/v6.4.10" }, "funding": [ { @@ -7230,7 +7154,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-07-19T07:26:48+00:00" }, { "name": "theseer/tokenizer", diff --git a/config/packages/framework.yaml b/config/packages/framework.yaml index fa91d6af..bbd61079 100644 --- a/config/packages/framework.yaml +++ b/config/packages/framework.yaml @@ -10,6 +10,8 @@ framework: session: handler_id: Symfony\Component\HttpFoundation\Session\Storage\Handler\RedisSessionHandler storage_factory_id: session.storage.factory.native + cookie_secure: auto + cookie_samesite: strict #esi: true #fragments: true diff --git a/config/packages/validator.yaml b/config/packages/validator.yaml index c8c09f75..12bab6b8 100644 --- a/config/packages/validator.yaml +++ b/config/packages/validator.yaml @@ -1,6 +1,7 @@ framework: validation: - enable_annotations: true + # Mandatory + email_validation_mode: strict when@test: framework: diff --git a/docker-compose.yaml b/docker-compose.yaml index 04dadde6..4fcd412f 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -7,12 +7,11 @@ services: image: redis:alpine webserver: - image: phpdockerio/nginx-pagespeed:latest + image: nginx:alpine working_dir: /application volumes: - .:/application - ./infrastructure/nginx/nginx.conf:/etc/nginx/conf.d/default.conf - - ./infrastructure/nginx/pagespeed.conf:/etc/nginx/pagespeed.conf - ./infrastructure/local/:/etc/ssl/local/ ports: - "10000:443" diff --git a/infrastructure/nginx/nginx.conf b/infrastructure/nginx/nginx.conf index 5dd72a7e..1b3edfd2 100644 --- a/infrastructure/nginx/nginx.conf +++ b/infrastructure/nginx/nginx.conf @@ -36,7 +36,4 @@ server { fastcgi_buffer_size 32k; include fastcgi_params; } - - # Pagespeed config - # %DISABLED DEPLOYMENT include /etc/nginx/pagespeed.conf; } diff --git a/infrastructure/nginx/pagespeed.conf b/infrastructure/nginx/pagespeed.conf deleted file mode 100644 index e4793361..00000000 --- a/infrastructure/nginx/pagespeed.conf +++ /dev/null @@ -1,34 +0,0 @@ -pagespeed on; -pagespeed FileCachePath /var/cache/ngx_pagespeed; -pagespeed FileCacheSizeKb 102400; -pagespeed FileCacheCleanIntervalMs 3600000; -pagespeed FileCacheInodeLimit 50000; -pagespeed EnableCachePurge on; -pagespeed PurgeMethod PURGE; -pagespeed RewriteLevel CoreFilters; - -# core filters -pagespeed EnableFilters add_head; -pagespeed EnableFilters remove_quotes; -pagespeed EnableFilters combine_css; -pagespeed EnableFilters combine_javascript; -pagespeed EnableFilters rewrite_images; - -# extra -pagespeed EnableFilters insert_dns_prefetch; -pagespeed EnableFilters hint_preload_subresources; -pagespeed DisableFilters prioritize_critical_css; -pagespeed EnableFilters sprite_images; -pagespeed EnableFilters collapse_whitespace; -pagespeed EnableFilters dedup_inlined_images; -pagespeed EnableFilters inline_preview_images,resize_mobile_images; -pagespeed EnableFilters lazyload_images; -pagespeed EnableFilters rewrite_javascript; -pagespeed EnableFilters responsive_images,resize_images; -pagespeed FetchHttps enable; - -location ~ "\.pagespeed\.([a-z]\.)?[a-z]{2}\.[^.]{10}\.[^.]+" { - add_header "" ""; -} -location ~ "^/pagespeed_static/" { } -location ~ "^/ngx_pagespeed_beacon$" { } diff --git a/src/Form/Generator/ElasticsearchType.php b/src/Form/Generator/ElasticsearchType.php index a6fa1ff4..e225aa5d 100644 --- a/src/Form/Generator/ElasticsearchType.php +++ b/src/Form/Generator/ElasticsearchType.php @@ -31,7 +31,7 @@ */ class ElasticsearchType extends AbstractGeneratorType { - private const VALIDATION_GROUP = 'elasticsearchOptions'; + private const string VALIDATION_GROUP = 'elasticsearchOptions'; /** * Builds the form definition. diff --git a/src/Form/Generator/PostgresType.php b/src/Form/Generator/PostgresType.php index 6826bf4c..94996eeb 100644 --- a/src/Form/Generator/PostgresType.php +++ b/src/Form/Generator/PostgresType.php @@ -32,7 +32,7 @@ */ class PostgresType extends AbstractGeneratorType { - private const VALIDATION_GROUP = 'postgresOptions'; + private const string VALIDATION_GROUP = 'postgresOptions'; /** * Builds the form definition. diff --git a/src/PHPDocker/Generator/Files/DockerCompose.php b/src/PHPDocker/Generator/Files/DockerCompose.php index 3419054e..f4c22f05 100644 --- a/src/PHPDocker/Generator/Files/DockerCompose.php +++ b/src/PHPDocker/Generator/Files/DockerCompose.php @@ -25,7 +25,7 @@ class DockerCompose implements GeneratedFileInterface { - private const DOCKER_COMPOSE_FILE_VERSION = '3.1'; + private const string DOCKER_COMPOSE_FILE_VERSION = '3.1'; /** @var array */ private array $services; diff --git a/src/PHPDocker/Generator/Files/Dockerfile.php b/src/PHPDocker/Generator/Files/Dockerfile.php index d48e67ea..7324bdd3 100644 --- a/src/PHPDocker/Generator/Files/Dockerfile.php +++ b/src/PHPDocker/Generator/Files/Dockerfile.php @@ -25,7 +25,7 @@ class Dockerfile implements GeneratedFileInterface { - private const FILENAME = 'php-fpm' . DIRECTORY_SEPARATOR . 'Dockerfile'; + private const string FILENAME = 'php-fpm' . DIRECTORY_SEPARATOR . 'Dockerfile'; public function __construct(private readonly Environment $twig, private readonly Project $project) { diff --git a/src/PHPDocker/Generator/Files/NginxConf.php b/src/PHPDocker/Generator/Files/NginxConf.php index de723807..bb0e51f8 100644 --- a/src/PHPDocker/Generator/Files/NginxConf.php +++ b/src/PHPDocker/Generator/Files/NginxConf.php @@ -23,9 +23,9 @@ use App\PHPDocker\Project\Project; use Twig\Environment; -class NginxConf implements GeneratedFileInterface +readonly class NginxConf implements GeneratedFileInterface { - public function __construct(private readonly Environment $twig, private readonly Project $project) + public function __construct(private Environment $twig, private Project $project) { } diff --git a/src/PHPDocker/Generator/Files/PhpIni.php b/src/PHPDocker/Generator/Files/PhpIni.php index 6b5ab85c..ea1014cf 100644 --- a/src/PHPDocker/Generator/Files/PhpIni.php +++ b/src/PHPDocker/Generator/Files/PhpIni.php @@ -20,13 +20,12 @@ namespace App\PHPDocker\Generator\Files; use App\PHPDocker\Interfaces\GeneratedFileInterface; -use App\PHPDocker\Project\Project; use Twig\Environment; -class PhpIni implements GeneratedFileInterface +readonly class PhpIni implements GeneratedFileInterface { - public function __construct(private readonly Environment $twig) + public function __construct(private Environment $twig) { } diff --git a/src/PHPDocker/Generator/Files/ReadmeHtml.php b/src/PHPDocker/Generator/Files/ReadmeHtml.php index 1fb3f596..0e2609d8 100644 --- a/src/PHPDocker/Generator/Files/ReadmeHtml.php +++ b/src/PHPDocker/Generator/Files/ReadmeHtml.php @@ -23,9 +23,9 @@ use Michelf\MarkdownExtra; use Twig\Environment; -class ReadmeHtml implements GeneratedFileInterface +readonly class ReadmeHtml implements GeneratedFileInterface { - public function __construct(private readonly Environment $twig, private readonly MarkdownExtra $markdown, private readonly string $readmeMd) + public function __construct(private Environment $twig, private MarkdownExtra $markdown, private string $readmeMd) { } diff --git a/src/PHPDocker/Generator/Files/ReadmeMd.php b/src/PHPDocker/Generator/Files/ReadmeMd.php index b21af796..725cc80f 100644 --- a/src/PHPDocker/Generator/Files/ReadmeMd.php +++ b/src/PHPDocker/Generator/Files/ReadmeMd.php @@ -23,9 +23,9 @@ use App\PHPDocker\Project\Project; use Twig\Environment; -class ReadmeMd implements GeneratedFileInterface +readonly class ReadmeMd implements GeneratedFileInterface { - public function __construct(private readonly Environment $twig, private readonly Project $project) + public function __construct(private Environment $twig, private Project $project) { } diff --git a/src/PHPDocker/Generator/Generator.php b/src/PHPDocker/Generator/Generator.php index e6303bb1..3dd3e1ff 100644 --- a/src/PHPDocker/Generator/Generator.php +++ b/src/PHPDocker/Generator/Generator.php @@ -37,8 +37,8 @@ */ class Generator { - private const BASE_ZIP_FOLDER = 'phpdocker'; - private const ARCHIVE_FILENAME = 'phpdocker.zip'; + private const string BASE_ZIP_FOLDER = 'phpdocker'; + private const string ARCHIVE_FILENAME = 'phpdocker.zip'; public function __construct( private readonly Archiver $archiver, diff --git a/src/PHPDocker/PhpExtension/AvailableExtensionsFactory.php b/src/PHPDocker/PhpExtension/AvailableExtensionsFactory.php index 2954de7f..4775684e 100644 --- a/src/PHPDocker/PhpExtension/AvailableExtensionsFactory.php +++ b/src/PHPDocker/PhpExtension/AvailableExtensionsFactory.php @@ -26,14 +26,14 @@ */ class AvailableExtensionsFactory { - private const PHP_VERSION_81 = '8.1'; - private const PHP_VERSION_82 = '8.2'; - private const PHP_VERSION_83 = '8.3'; + private const string PHP_VERSION_81 = '8.1'; + private const string PHP_VERSION_82 = '8.2'; + private const string PHP_VERSION_83 = '8.3'; /** * Supported PHP versions */ - private const SUPPORTED_VERSIONS = [ + private const array SUPPORTED_VERSIONS = [ self::PHP_VERSION_81 => Php81AvailableExtensions::class, self::PHP_VERSION_82 => Php82AvailableExtensions::class, self::PHP_VERSION_83 => Php83AvailableExtensions::class, diff --git a/src/PHPDocker/Project/ServiceOptions/Elasticsearch.php b/src/PHPDocker/Project/ServiceOptions/Elasticsearch.php index 9bc034fd..4073dcb0 100644 --- a/src/PHPDocker/Project/ServiceOptions/Elasticsearch.php +++ b/src/PHPDocker/Project/ServiceOptions/Elasticsearch.php @@ -29,10 +29,10 @@ class Elasticsearch extends Base /** * Available versions */ - private const VERSION_56 = '5.6'; - private const VERSION_65 = '6.5.4'; + private const string VERSION_56 = '5.6'; + private const string VERSION_65 = '6.5.4'; - private const ALLOWED_VERSIONS = [ + private const array ALLOWED_VERSIONS = [ self::VERSION_65 => '6.5.x', self::VERSION_56 => '5.6.x', ]; diff --git a/src/PHPDocker/Project/ServiceOptions/MariaDB.php b/src/PHPDocker/Project/ServiceOptions/MariaDB.php index 2d0c0462..1d930fe8 100644 --- a/src/PHPDocker/Project/ServiceOptions/MariaDB.php +++ b/src/PHPDocker/Project/ServiceOptions/MariaDB.php @@ -26,17 +26,17 @@ class MariaDB extends AbstractMySQL /** * Available versions */ - private const VERSION_104 = '10.4'; - private const VERSION_105 = '10.5'; - private const VERSION_106 = '10.6'; - private const VERSION_107 = '10.7'; - private const VERSION_108 = '10.8'; - private const VERSION_109 = '10.9'; - private const VERSION_1010 = '10.10'; - private const VERSION_1011 = '10.11'; - private const VERSION_110 = '11.0'; + private const string VERSION_104 = '10.4'; + private const string VERSION_105 = '10.5'; + private const string VERSION_106 = '10.6'; + private const string VERSION_107 = '10.7'; + private const string VERSION_108 = '10.8'; + private const string VERSION_109 = '10.9'; + private const string VERSION_1010 = '10.10'; + private const string VERSION_1011 = '10.11'; + private const string VERSION_110 = '11.0'; - private const ALLOWED_VERSIONS = [ + private const array ALLOWED_VERSIONS = [ self::VERSION_110 => '11.0.x', self::VERSION_1011 => '10.11.x', self::VERSION_1010 => '10.10.x', diff --git a/src/PHPDocker/Project/ServiceOptions/MySQL.php b/src/PHPDocker/Project/ServiceOptions/MySQL.php index 446b50e8..d4b4d94c 100644 --- a/src/PHPDocker/Project/ServiceOptions/MySQL.php +++ b/src/PHPDocker/Project/ServiceOptions/MySQL.php @@ -26,12 +26,12 @@ class MySQL extends AbstractMySQL /** * Available versions */ - private const VERSION_55 = '5.5'; - private const VERSION_56 = '5.6'; - private const VERSION_57 = '5.7'; - private const VERSION_80 = '8.0'; + private const string VERSION_55 = '5.5'; + private const string VERSION_56 = '5.6'; + private const string VERSION_57 = '5.7'; + private const string VERSION_80 = '8.0'; - private const ALLOWED_VERSIONS = [ + private const array ALLOWED_VERSIONS = [ self::VERSION_80 => '8.0', self::VERSION_57 => '5.7.x', self::VERSION_56 => '5.6.x', diff --git a/src/PHPDocker/Project/ServiceOptions/Php.php b/src/PHPDocker/Project/ServiceOptions/Php.php index c0315e98..8237b256 100644 --- a/src/PHPDocker/Project/ServiceOptions/Php.php +++ b/src/PHPDocker/Project/ServiceOptions/Php.php @@ -28,9 +28,9 @@ */ class Php extends Base { - public const PHP_VERSION_81 = '8.1'; - public const PHP_VERSION_82 = '8.2'; - public const PHP_VERSION_83 = '8.3'; + public const string PHP_VERSION_81 = '8.1'; + public const string PHP_VERSION_82 = '8.2'; + public const string PHP_VERSION_83 = '8.3'; private string $version; @@ -40,7 +40,7 @@ class Php extends Base /** * Supported PHP versions */ - private const SUPPORTED_VERSIONS = [ + private const array SUPPORTED_VERSIONS = [ self::PHP_VERSION_83, self::PHP_VERSION_82, self::PHP_VERSION_81, diff --git a/src/PHPDocker/Project/ServiceOptions/Postgres.php b/src/PHPDocker/Project/ServiceOptions/Postgres.php index 605d8061..ff7f9177 100644 --- a/src/PHPDocker/Project/ServiceOptions/Postgres.php +++ b/src/PHPDocker/Project/ServiceOptions/Postgres.php @@ -29,15 +29,15 @@ class Postgres extends Base /** * Available versions */ - private const VERSION_15 = '15'; - private const VERSION_14 = '14'; - private const VERSION_13 = '13'; - private const VERSION_12 = '12'; - private const VERSION_11 = '11'; - private const VERSION_10 = '10'; - private const VERSION_96 = '9.6'; - - private const ALLOWED_VERSIONS = [ + private const string VERSION_15 = '15'; + private const string VERSION_14 = '14'; + private const string VERSION_13 = '13'; + private const string VERSION_12 = '12'; + private const string VERSION_11 = '11'; + private const string VERSION_10 = '10'; + private const string VERSION_96 = '9.6'; + + private const array ALLOWED_VERSIONS = [ self::VERSION_15 => '15.x', self::VERSION_14 => '14.x', self::VERSION_13 => '13.x',