feat: update to symfony 6 (#311)

rgomezcasas · web-flow · commit 98ec9630645b · 2022-06-16T12:38:04.000+02:00
* feat: update to symfony 6

* ci: ignore composer.lock labeling the pr

* feat: migrate to the latest doctrine version

* feat: update docker images

* feat: update symfony session component

* feat: update to elasticsearch 8

feat: update to elasticsearch 8

* ci: wait until elastic is up
diff --git a/.env b/.env
@@ -8,7 +8,7 @@ APP_SECRET=29ac4a5187930cd4b689aa0f3ee7cbc0
 #--------------------------------#
 # MySql
 MOOC_DATABASE_DRIVER=pdo_mysql
-MOOC_DATABASE_HOST=codelytv-php_ddd_skeleton-mooc-mysql
+MOOC_DATABASE_HOST=codely-php_ddd_skeleton-mooc-mysql
 MOOC_DATABASE_PORT=3306
 MOOC_DATABASE_NAME=mooc
 MOOC_DATABASE_USER=root
@@ -18,22 +18,22 @@ MOOC_DATABASE_PASSWORD=
 #--------------------------------#
 # MySql
 BACKOFFICE_DATABASE_DRIVER=pdo_mysql
-BACKOFFICE_DATABASE_HOST=codelytv-php_ddd_skeleton-mooc-mysql
+BACKOFFICE_DATABASE_HOST=codely-php_ddd_skeleton-mooc-mysql
 BACKOFFICE_DATABASE_PORT=3306
 BACKOFFICE_DATABASE_NAME=mooc
 BACKOFFICE_DATABASE_USER=root
 BACKOFFICE_DATABASE_PASSWORD=
 
 # Elasticsearch
-BACKOFFICE_ELASTICSEARCH_HOST=codelytv-php_ddd_skeleton-backoffice-elastic
+BACKOFFICE_ELASTICSEARCH_HOST=codely-php_ddd_skeleton-backoffice-elastic
 BACKOFFICE_ELASTICSEARCH_INDEX_PREFIX=backoffice
 
 #             COMMON             #
 #--------------------------------#
 # RabbitMQ
-RABBITMQ_HOST=codelytv-php_ddd_skeleton-rabbitmq
+RABBITMQ_HOST=codely-php_ddd_skeleton-rabbitmq
 RABBITMQ_PORT=5672
-RABBITMQ_LOGIN=codelytv
+RABBITMQ_LOGIN=codely
 RABBITMQ_PASSWORD=c0d3ly
 RABBITMQ_EXCHANGE=domain_events
 RABBITMQ_MAX_RETRIES=5
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -32,6 +32,13 @@ jobs:
               sleep 2
           done
 
+      - name: 🧪 Wait for the elasticsearch to get up
+        run: |
+          while ! make ping-elasticsearch &>/dev/null; do
+              echo "Waiting for elasticsearch connection..."
+              sleep 2
+          done
+
       - name: 🐰 Wait for the message broker to get up
         run: |
           while ! make ping-rabbitmq &>/dev/null; do
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
@@ -7,11 +7,12 @@ jobs:
     runs-on: ubuntu-latest
     name: Label the PR size
     steps:
-      - uses: codelytv/pr-size-labeler@v1.3.0
+      - uses: codelytv/pr-size-labeler@v1.8.1
         with:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           xs_max_size: '10'
           s_max_size: '300'
           m_max_size: '600'
           l_max_size: '1400'
           fail_if_xl: 'true'
+          files_to_ignore: 'composer.lock'
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.1.1-fpm-alpine
+FROM php:8.1.6-fpm-alpine
 WORKDIR /app
 
 RUN wget https://github.com/FriendsOfPHP/pickle/releases/download/v0.7.9/pickle.phar \
diff --git a/Makefile b/Makefile
@@ -27,7 +27,7 @@ composer-require-module: INTERACTIVE=-ti --interactive
 .PHONY: composer
 composer composer-install composer-update composer-require composer-require-module: composer-env-file
 	@docker run --rm $(INTERACTIVE) --volume $(current-dir):/app --user $(id -u):$(id -g) \
-		composer:2.2 $(CMD) \
+		composer:2.3.7 $(CMD) \
 			--ignore-platform-reqs \
 			--no-ansi
 
@@ -38,14 +38,14 @@ reload: composer-env-file
 
 .PHONY: test
 test: composer-env-file
-	docker exec codelytv-php_ddd_skeleton-mooc_backend-php ./vendor/bin/phpunit --testsuite mooc
-	docker exec codelytv-php_ddd_skeleton-mooc_backend-php ./vendor/bin/phpunit --testsuite shared
-	docker exec codelytv-php_ddd_skeleton-mooc_backend-php ./vendor/bin/behat -p mooc_backend --format=progress -v
-	docker exec codelytv-php_ddd_skeleton-backoffice_backend-php ./vendor/bin/phpunit --testsuite backoffice
+	docker exec codely-php_ddd_skeleton-mooc_backend-php ./vendor/bin/phpunit --testsuite mooc
+	docker exec codely-php_ddd_skeleton-mooc_backend-php ./vendor/bin/phpunit --testsuite shared
+	docker exec codely-php_ddd_skeleton-mooc_backend-php ./vendor/bin/behat -p mooc_backend --format=progress -v
+	docker exec codely-php_ddd_skeleton-backoffice_backend-php ./vendor/bin/phpunit --testsuite backoffice
 
 .PHONY: static-analysis
 static-analysis: composer-env-file
-	docker exec codelytv-php_ddd_skeleton-mooc_backend-php ./vendor/bin/psalm
+	docker exec codely-php_ddd_skeleton-mooc_backend-php ./vendor/bin/psalm
 
 .PHONY: run-tests
 run-tests: composer-env-file
@@ -79,14 +79,18 @@ rebuild: composer-env-file
 
 .PHONY: ping-mysql
 ping-mysql:
-	@docker exec codelytv-php_ddd_skeleton-mooc-mysql mysqladmin --user=root --password= --host "127.0.0.1" ping --silent
+	@docker exec codely-php_ddd_skeleton-mooc-mysql mysqladmin --user=root --password= --host "127.0.0.1" ping --silent
+
+.PHONY: ping-elasticsearch
+ping-elasticsearch:
+	@curl -I -XHEAD localhost:9200
 
 .PHONY: ping-rabbitmq
 ping-rabbitmq:
-	@docker exec codelytv-php_ddd_skeleton-rabbitmq rabbitmqctl ping --silent
+	@docker exec codely-php_ddd_skeleton-rabbitmq rabbitmqctl ping --silent
 
 clean-cache:
 	@rm -rf apps/*/*/var
-	@docker exec codelytv-php_ddd_skeleton-backoffice_backend-php ./apps/backoffice/backend/bin/console cache:warmup
-	@docker exec codelytv-php_ddd_skeleton-backoffice_frontend-php ./apps/backoffice/frontend/bin/console cache:warmup
-	@docker exec codelytv-php_ddd_skeleton-mooc_backend-php ./apps/mooc/backend/bin/console cache:warmup
+	@docker exec codely-php_ddd_skeleton-backoffice_backend-php ./apps/backoffice/backend/bin/console cache:warmup
+	@docker exec codely-php_ddd_skeleton-backoffice_frontend-php ./apps/backoffice/frontend/bin/console cache:warmup
+	@docker exec codely-php_ddd_skeleton-mooc_backend-php ./apps/mooc/backend/bin/console cache:warmup
diff --git a/apps/backoffice/backend/bin/console b/apps/backoffice/backend/bin/console
@@ -4,15 +4,15 @@
 use CodelyTv\Apps\Backoffice\Backend\BackofficeBackendKernel;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Input\ArgvInput;
-use Symfony\Component\Debug\Debug;
+use Symfony\Component\ErrorHandler\Debug;
 
 if (false === in_array(PHP_SAPI, ['cli', 'phpdbg', 'embed'], true)) {
     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';
+require dirname(__DIR__) . '../../../vendor/autoload.php';
 
 if (!class_exists(Application::class)) {
     throw new RuntimeException('You need to add "symfony/framework-bundle" as a Composer dependency.');
diff --git a/apps/backoffice/frontend/bin/console b/apps/backoffice/frontend/bin/console
@@ -4,15 +4,15 @@
 use CodelyTv\Apps\Backoffice\Frontend\BackofficeFrontendKernel;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Input\ArgvInput;
-use Symfony\Component\Debug\Debug;
+use Symfony\Component\ErrorHandler\Debug;
 
 if (false === in_array(PHP_SAPI, ['cli', 'phpdbg', 'embed'], true)) {
     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';
+require dirname(__DIR__) . '../../../vendor/autoload.php';
 
 if (!class_exists(Application::class)) {
     throw new RuntimeException('You need to add "symfony/framework-bundle" as a Composer dependency.');
diff --git a/apps/backoffice/frontend/config/services.yaml b/apps/backoffice/frontend/config/services.yaml
@@ -2,6 +2,10 @@ imports:
   - { resource: ../../../../src/Backoffice/Shared/Infrastructure/Symfony/DependencyInjection/backoffice_services.yaml }
   - { resource: ../../../../src/Mooc/Shared/Infrastructure/Symfony/DependencyInjection/mooc_services.yaml }
 
+framework:
+  session:
+    handler_id: null
+
 services:
   _defaults:
     autoconfigure: true
diff --git a/apps/backoffice/frontend/src/Controller/Courses/CoursesPostWebController.php b/apps/backoffice/frontend/src/Controller/Courses/CoursesPostWebController.php
@@ -47,9 +47,9 @@ private function createCourse(Request $request): RedirectResponse
     {
         $this->dispatch(
             new CreateCourseCommand(
-                $request->request->getAlpha('id'),
-                $request->request->getAlpha('name'),
-                $request->request->getAlpha('duration')
+                (string) $request->request->get('id'),
+                (string) $request->request->get('name'),
+                (string) $request->request->get('duration')
             )
         );
 
diff --git a/apps/mooc/backend/bin/console b/apps/mooc/backend/bin/console
@@ -4,15 +4,15 @@
 use CodelyTv\Apps\Mooc\Backend\MoocBackendKernel;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Input\ArgvInput;
-use Symfony\Component\Debug\Debug;
+use Symfony\Component\ErrorHandler\Debug;
 
 if (false === in_array(PHP_SAPI, ['cli', 'phpdbg', 'embed'], true)) {
     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';
+require dirname(__DIR__) . '../../../vendor/autoload.php';
 
 if (!class_exists(Application::class)) {
     throw new RuntimeException('You need to add "symfony/framework-bundle" as a Composer dependency.');
diff --git a/apps/mooc/backend/src/Controller/Courses/CoursesPutController.php b/apps/mooc/backend/src/Controller/Courses/CoursesPutController.php
@@ -16,8 +16,8 @@ public function __invoke(string $id, Request $request): Response
         $this->dispatch(
             new CreateCourseCommand(
                 $id,
-                $request->request->getAlpha('name'),
-                $request->request->getAlpha('duration')
+                (string) $request->request->get('name'),
+                (string) $request->request->get('duration')
             )
         );
 
diff --git a/composer.json b/composer.json
@@ -12,46 +12,46 @@
     "ext-zend-opcache": "*",
     "ext-pdo": "*",
 
-    "symfony/framework-bundle": "^5.4",
-    "symfony/messenger": "^5.4",
-    "symfony/dotenv": "^5.4",
-    "symfony/yaml": "^5.4",
-    "symfony/twig-bundle": "^5.4",
-    "symfony/validator": "^5.4",
-    "symfony/cache": "^5.4",
+    "symfony/framework-bundle": "^6",
+    "symfony/messenger": "^6",
+    "symfony/dotenv": "^6",
+    "symfony/yaml": "^6",
+    "symfony/twig-bundle": "^6",
+    "symfony/validator": "^6",
+    "symfony/cache": "^6",
 
-    "lambdish/phunctional": "^2.0",
+    "lambdish/phunctional": "^2",
 
-    "ramsey/uuid": "^4.2",
+    "ramsey/uuid": "^4",
 
-    "doctrine/dbal": "^2.10",
-    "doctrine/orm": "^2.7",
+    "doctrine/dbal": "^3",
+    "doctrine/orm": "^2",
 
-    "ocramius/proxy-manager": "^2.13",
-    "laminas/laminas-zendframework-bridge": "^1.4",
+    "ocramius/proxy-manager": "^2",
+    "laminas/laminas-zendframework-bridge": "^1",
 
-    "elasticsearch/elasticsearch": "^7.3",
-    "monolog/monolog": "^2.1",
+    "elasticsearch/elasticsearch": "^7",
+    "monolog/monolog": "^3",
 
-    "endclothing/prometheus_client_php": "^1.0"
+    "endclothing/prometheus_client_php": "^1"
   },
   "require-dev": {
     "ext-xdebug": "*",
 
     "roave/security-advisories": "dev-master",
 
-    "behat/behat": "^3.10",
-    "friends-of-behat/mink-extension": "^2.6",
-    "friends-of-behat/symfony-extension": "^2.3",
-    "behat/mink-browserkit-driver": "^2.0",
+    "behat/behat": "^3",
+    "friends-of-behat/mink-extension": "^2",
+    "friends-of-behat/symfony-extension": "^2",
+    "behat/mink-browserkit-driver": "^2",
 
-    "phpunit/phpunit": "^9.2",
-    "mockery/mockery": "^1.4",
+    "phpunit/phpunit": "^9",
+    "mockery/mockery": "^1",
 
-    "fzaninotto/faker": "^1.9",
+    "fakerphp/faker": "^1",
 
-    "symfony/debug": "^4.4",
-    "vimeo/psalm": "^4.10"
+    "symfony/error-handler": "^6",
+    "vimeo/psalm": "^4"
   },
   "autoload": {
     "psr-4": {
diff --git a/composer.lock b/composer.lock
diff --git a/docker-compose.yml b/docker-compose.yml
diff --git a/src/Shared/Infrastructure/Doctrine/DoctrineEntityManagerFactory.php b/src/Shared/Infrastructure/Doctrine/DoctrineEntityManagerFactory.php
diff --git a/src/Shared/Infrastructure/Symfony/FlashSession.php b/src/Shared/Infrastructure/Symfony/FlashSession.php
diff --git a/src/Shared/Infrastructure/Symfony/WebController.php b/src/Shared/Infrastructure/Symfony/WebController.php
diff --git a/tests/Shared/Infrastructure/PhpUnit/InfrastructureTestCase.php b/tests/Shared/Infrastructure/PhpUnit/InfrastructureTestCase.php

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM php:8.1.1-fpm-alpine`
	`1`	`+FROM php:8.1.6-fpm-alpine`
`2`	`2`	`WORKDIR /app`
`3`	`3`
`4`	`4`	`RUN wget https://github.com/FriendsOfPHP/pickle/releases/download/v0.7.9/pickle.phar \`
Original file line number	Diff line number	Diff line change
`@@ -47,9 +47,9 @@ private function createCourse(Request $request): RedirectResponse`
`47`	`47`	`{`
`48`	`48`	`$this->dispatch(`
`49`	`49`	`new CreateCourseCommand(`
`50`		`- $request->request->getAlpha('id'),`
`51`		`- $request->request->getAlpha('name'),`
`52`		`- $request->request->getAlpha('duration')`
	`50`	`+ (string) $request->request->get('id'),`
	`51`	`+ (string) $request->request->get('name'),`
	`52`	`+ (string) $request->request->get('duration')`
`53`	`53`	`)`
`54`	`54`	`);`
`55`	`55`