updated environment to php 8, refactoring.

Author: DKravtsov

.dockerignore

@@ -1,18 +1,24 @@
+### User-specific stuff:
 /.git*
 /.idea*
 .dockerignore
 .editorconfig
 
+###> symfony/framework-bundle ###
 /.env.local
 /.env.*.local
-.env.local.php
+/.env.local.php
 /public/bundles/
 /var/mysql-data
 /var/rabbitmq
 /var/elasticsearch-data
 /vendor/
+###< symfony/framework-bundle ###
+
+### Vendor bin dependencies
 /tools/*/vendor/
 
+### Docker
 Dockerfile
 docker-compose.yml
 docker-compose-test-ci.yml

.env

@@ -79,3 +79,9 @@ DATABASE_LOG_REQUEST_HISTORY_DAYS=15
 REQUEST_LOG_SENSITIVE_PROPERTIES='["password", "token", "authorization", "cookie"]'
 
 REQUEST_LOG_IGNORED_ROUTES='["", "/", "/api", "/api/", "/api/health", "/api/version", "/api/secret/*"]'
+
+###> symfony/lock ###
+# Choose one of the stores below
+# LOCK_DSN=redis://localhost
+LOCK_DSN=semaphore
+###< symfony/lock ###

.php_cs.dist renamed to .php-cs-fixer.dist.php

@@ -1,7 +1,11 @@
 <?php
 
+declare(strict_types=1);
+
 // https://mlocati.github.io/php-cs-fixer-configurator/
-return PhpCsFixer\Config::create()
+$finder = PhpCsFixer\Finder::create()->in(__DIR__)->exclude('somedir');
+
+return (new PhpCsFixer\Config())
     ->setRules([
         '@Symfony' => true,
         'array_syntax' => ['syntax' => 'short'],
@@ -11,7 +15,7 @@
         'cast_spaces' => ['space' => 'none'],
         'ordered_imports' => ['imports_order' => ['class', 'function', 'const']],
         'no_superfluous_phpdoc_tags' => ['remove_inheritdoc' => false, 'allow_mixed' => true, 'allow_unused_params' => true],
-        'declare_equal_normalize' => ['space' => 'single'],
+        'declare_equal_normalize' => ['space' => 'none'],
         'blank_line_before_statement' => ['statements' => ['continue', 'declare', 'return', 'throw', 'try']],
         'single_blank_line_before_namespace' => true,
         'blank_line_after_namespace' => true,
@@ -27,6 +31,4 @@
         'not_operator_with_successor_space' => false,
         'single_line_throw' => false,
         'blank_line_after_strict_types' => false,
-
-    ])
-;
+    ])->setFinder($finder);

Dockerfile

@@ -1,4 +1,4 @@
-FROM php:7.4-fpm
+FROM php:8.0-fpm
 
 # set main params
 ARG BUILD_ARGUMENT_DEBUG_ENABLED=false
@@ -37,7 +37,7 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y \
       libzip-dev \
       wget \
       librabbitmq-dev \
-    && pecl install amqp \
+    && pecl install amqp-1.11.0beta \
     && docker-php-ext-configure pdo_mysql --with-pdo-mysql=mysqlnd \
     && docker-php-ext-configure intl \
     && yes '' | pecl install -o -f redis && docker-php-ext-enable redis \

Makefile

@@ -200,7 +200,7 @@ report-code-coverage: ## update code coverage on coveralls.io. Note: COVERALLS_R
 
 ###> phpcs ###
 phpcs: ## Run PHP CodeSniffer
-	@make exec-bash cmd="./vendor/bin/phpcs --version && ./vendor/bin/phpcs --standard=PSR2 --colors -p src tests"
+	@make exec-bash cmd="./vendor/bin/phpcs --version && ./vendor/bin/phpcs --standard=PSR12 --colors -p src tests"
 ###< phpcs ###
 
 ###> ecs ###
@@ -233,7 +233,7 @@ phpcpd:
 
 ###> php mess detector ###
 phpmd:
-	@make exec cmd="php ./vendor/bin/phpmd src text phpmd_ruleset.xml --suffixes php --exclude *src/Migrations/*"
+	@make exec cmd="php ./vendor/bin/phpmd src text phpmd_ruleset.xml --suffixes php"
 ###< php mess detector ###
 
 ###> PHPStan static analysis tool ###

bin/console

@@ -1,19 +1,20 @@
 #!/usr/bin/env php
 <?php
-declare(strict_types = 1);
+
+declare(strict_types=1);
 
 use App\Kernel;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Input\ArgvInput;
 use Symfony\Component\Dotenv\Dotenv;
 use Symfony\Component\ErrorHandler\Debug;
 
-set_time_limit(0);
-
-if (!in_array(PHP_SAPI, ['cli', 'phpdbg', 'embed'], true)) {
+if (in_array(PHP_SAPI, ['cli', 'phpdbg', 'embed'], true) === false) {
     echo 'Warning: The console should be invoked via the CLI version of PHP, not the ' . PHP_SAPI . ' SAPI' . PHP_EOL;
 }
 
+set_time_limit(0);
+
 require dirname(__DIR__) . '/vendor/autoload.php';
 
 if (!class_exists(Application::class) || !class_exists(Dotenv::class)) {

composer.json

@@ -14,8 +14,8 @@
 		"Elasticsearch"
 	],
 	"homepage": "https://github.com/dimadeush/docker-symfony-api",
-	"version": "1.0.0",
-	"license": "proprietary",
+	"version": "0.0.0",
+	"license": "MIT",
 	"authors": [
 		{
 			"name": "Dmitriy Kravtsov",
@@ -25,69 +25,77 @@
 		}
 	],
 	"require": {
-		"php": "^7.4.0",
+		"php": "^8.0.0",
+		"ext-amqp": "*",
 		"ext-ctype": "*",
 		"ext-iconv": "*",
 		"ext-json": "*",
 		"ext-mbstring": "*",
 		"ext-pdo": "*",
 		"ext-pdo_mysql": "*",
-		"ext-amqp": "*",
-		"stof/doctrine-extensions-bundle": "^1.5",
 		"beberlei/doctrineextensions": "^1.3",
-		"doctrine/doctrine-migrations-bundle": "^3.0",
-		"systemsdk/easy-log-bundle": "1.10.*",
-		"elasticsearch/elasticsearch": "^7.10",
-		"jmose/command-scheduler-bundle": "^3.0",
-		"lexik/jwt-authentication-bundle": "^2.10",
+		"doctrine/annotations": "^1.13",
+		"doctrine/doctrine-bundle": "^2.4",
+		"doctrine/doctrine-migrations-bundle": "^3.1",
+		"doctrine/orm": "^2.9",
+		"dukecity/command-scheduler-bundle": "^4.0",
+		"elasticsearch/elasticsearch": "^7.13",
+		"gedmo/doctrine-extensions": "^3.1",
+		"lexik/jwt-authentication-bundle": "^2.12",
 		"mark-gerarts/automapper-plus-bundle": "^1.3",
+		"matomo/device-detector": "^4.3",
 		"matthiasnoback/symfony-console-form": "^3.6",
-		"nelmio/api-doc-bundle": "^4.1",
+		"nelmio/api-doc-bundle": "^4.4",
 		"nelmio/cors-bundle": "^2.1",
-		"matomo/device-detector": "^4.0",
+		"phpdocumentor/reflection-docblock": "^5.2",
 		"ramsey/uuid-doctrine": "^1.6",
-		"sensio/framework-extra-bundle": "^5.6",
+		"sensio/framework-extra-bundle": "^6.1",
 		"symfony/asset": "4.4.*",
 		"symfony/config": "4.4.*",
 		"symfony/console": "4.4.*",
 		"symfony/dotenv": "4.4.*",
 		"symfony/expression-language": "4.4.*",
-		"symfony/flex": "^1.9",
+		"symfony/flex": "^1.13",
 		"symfony/form": "4.4.*",
 		"symfony/framework-bundle": "4.4.*",
 		"symfony/http-client": "4.4.*",
 		"symfony/intl": "4.4.*",
 		"symfony/mailer": "4.4.*",
 		"symfony/messenger": "4.4.*",
-		"symfony/monolog-bundle": "^3.6",
-		"symfony/orm-pack": "*",
+		"symfony/monolog-bundle": "^3.7",
 		"symfony/process": "4.4.*",
+		"symfony/property-access": "4.4.*",
+		"symfony/property-info": "4.4.*",
+		"symfony/proxy-manager-bridge": "4.4.*",
 		"symfony/routing": "4.4.*",
 		"symfony/security-bundle": "4.4.*",
-		"symfony/serializer-pack": "*",
+		"symfony/serializer": "4.4.*",
 		"symfony/translation": "4.4.*",
 		"symfony/twig-bundle": "4.4.*",
 		"symfony/validator": "4.4.*",
 		"symfony/web-link": "4.4.*",
-		"symfony/yaml": "4.4.*"
+		"symfony/yaml": "4.4.*",
+		"systemsdk/easy-log-bundle": "1.10.*"
 	},
 	"conflict": {
 		"symfony/symfony": "*"
 	},
 	"require-dev": {
 		"bamarni/composer-bin-plugin": "^1.4",
 		"doctrine/doctrine-fixtures-bundle": "^3.4",
-		"ergebnis/composer-normalize": "^2.13",
-		"roave/security-advisories": "dev-master",
+		"ergebnis/composer-normalize": "^2.15",
+		"roave/security-advisories": "dev-latest",
+		"symfony/browser-kit": "4.4.*",
 		"symfony/debug-bundle": "4.4.*",
-		"symfony/maker-bundle": "^1.26",
+		"symfony/maker-bundle": "^1.33",
 		"symfony/requirements-checker": "^2.0",
+		"symfony/stopwatch": "4.4.*",
 		"symfony/var-dumper": "4.4.*",
 		"symfony/web-profiler-bundle": "4.4.*"
 	},
 	"config": {
 		"platform": {
-			"php": "7.4.0"
+			"php": "8.0.0"
 		},
 		"preferred-install": {
 			"*": "dist"
@@ -106,19 +114,23 @@
 	"autoload": {
 		"psr-4": {
 			"App\\": "src/"
-		}
+		},
+		"classmap": [],
+		"exclude-from-classmap": []
 	},
 	"autoload-dev": {
 		"psr-4": {
 			"App\\Tests\\": "tests/",
 			"PHPUnit\\": "tools/01_phpunit/vendor/phpunit/phpunit/src",
-			"Symfony\\Component\\BrowserKit\\": "tools/01_phpunit/vendor/symfony/browser-kit",
 			"Symfony\\Bridge\\PhpUnit\\": "tools/01_phpunit/vendor/symfony/phpunit-bridge",
 			"PHPMD\\": "tools/06_phpmd/vendor/phpmd/phpmd/src/bin",
-			"PhpCsFixer\\": "tools/03_ecs/vendor/friendsofphp/php-cs-fixer/src",
-			"SlevomatCodingStandard\\": "tools/03_ecs/vendor/slevomat/coding-standard/SlevomatCodingStandard",
-			"Symplify\\CodingStandard\\": "tools/03_ecs/vendor/symplify/coding-standard/src",
+			"PhpCsFixer\\": "tools/03_ecs/vendor/symplify/easy-coding-standard/vendor/friendsofphp/php-cs-fixer/src",
+			"Symplify\\CodingStandard\\": "tools/03_ecs/vendor/symplify/easy-coding-standard/vendor/symplify/coding-standard/src",
+			"Symplify\\RuleDocGenerator\\": "tools/03_ecs/vendor/symplify/easy-coding-standard/vendor/symplify/rule-doc-generator-contracts/src",
+			"PHPStan\\PhpDoc\\PHPUnit\\": "tools/02_phpstan/vendor/phpstan/phpstan-phpunit/src/PhpDoc/PHPUnit",
+			"PHPStan\\Rules\\PHPUnit\\": "tools/02_phpstan/vendor/phpstan/phpstan-phpunit/src/Rules/PHPUnit",
 			"PHPStan\\Symfony\\": "tools/02_phpstan/vendor/phpstan/phpstan-symfony/src/Symfony",
+			"PHPStan\\Type\\PHPUnit\\": "tools/02_phpstan/vendor/phpstan/phpstan-phpunit/src/Type/PHPUnit",
 			"PHPStan\\Type\\Symfony\\": "tools/02_phpstan/vendor/phpstan/phpstan-symfony/src/Type/Symfony"
 		}
 	},
@@ -128,17 +140,20 @@
 			"if test -d vendor/symfony/requirements-checker; then ./vendor/bin/requirements-checker; fi",
 			"if test -d vendor/bamarni/composer-bin-plugin; then composer bin all install; fi",
 			"if which local-php-security-checker; then local-php-security-checker --update-cache && local-php-security-checker; fi",
-			"@auto-scripts"
+			"@auto-scripts",
+			"@composer dump-autoload"
 		],
 		"post-update-cmd": [
 			"if test -d vendor/symfony/requirements-checker; then ./vendor/bin/requirements-checker; fi",
 			"if test -d vendor/bamarni/composer-bin-plugin; then composer bin all update; fi",
 			"if which local-php-security-checker; then local-php-security-checker --update-cache && local-php-security-checker; fi",
-			"@auto-scripts"
+			"@auto-scripts",
+			"@composer dump-autoload"
 		],
 		"auto-scripts": {
 			"cache:clear": "symfony-cmd",
 			"cache:warmup": "symfony-cmd",
+			"assets:install --symlink --relative %PUBLIC_DIR%": "symfony-cmd",
 			"assets:install %PUBLIC_DIR%": "symfony-cmd"
 		}
 	},