refacto: Move some file to match with comment

Author: mihani

.docker/php/conf.d/20-app.prod.ini

@@ -1 +1 @@
-data/
+data/

.dockerignore

@@ -62,7 +62,7 @@ jobs:
           composer-options: "--no-scripts"
 
       - name: PHPStan
-        run: make phpstan
+        run: ./bin/phpstan --memory-limit=-1
 
   functional:
     name: "Functional tests"
@@ -77,16 +77,15 @@ jobs:
           key: |
             docker-${{ runner.os }}-${{ hashFiles(
               'compose.yml',
-              'docker/dockerfiles/apachephp/Dockerfile',
-              'docker/dockerfiles/mysql/Dockerfile',
-              'docker/dockerfiles/mysqltest/Dockerfile'
+              'docker/apachephp/Dockerfile',
+              'docker/mysql/dev/Dockerfile',
+              'docker/mysql/test/Dockerfile'
             ) }}
 
       - name: Tests - Functional
         run: |
-          cp docker.env docker.env.local
-          cp .env.dist .env
-          mkdir -p ./htdocs/uploads -p ./tmp
+          make init-file
+          make init-folder
           docker compose up -d
           docker compose exec --user localUser apachephp composer install --no-scripts
           docker compose run --rm node bash -c "npm install --legacy-peer-deps && npm run build"
@@ -119,18 +118,15 @@ jobs:
           key: |
             docker-${{ runner.os }}-${{ hashFiles(
               'compose.yml',
-              'Dockerfile',
-              'docker/dockerfiles/mysql/Dockerfile',
-              'docker/dockerfiles/mysqltest/Dockerfile'
+              'docker/apachephp/Dockerfile',
+              'docker/mysql/dev/Dockerfile',
+              'docker/mysql/test/Dockerfile'
             ) }}
 
       - name: Tests - Integration
         run: |
-          cp docker.env docker.env.local
-          cp -n .env.dist .env
-          docker compose up -d
-          docker compose exec --user localUser apachephp composer install --no-scripts
-          docker compose exec -u localUser apachephp ./bin/phpunit --testsuite integration
+          make init-file
+          make test-integration-ci
 
   rector:
     name: "Rector"
@@ -149,4 +145,4 @@ jobs:
           composer-options: "--no-scripts"
 
       - name: Rector
-        run: make rector
+        run: ./bin/rector --dry-run

.editorconfig

@@ -3,7 +3,7 @@
 
 ###> docker file ###
 docker.env.local
-.docker/data/history
+docker/data/history
 
 deps.lock
 .idea

.github/workflows/ci.yml

@@ -1,8 +1,6 @@
 default: help
 
 # Variables
-CURRENT_UID ?= $(shell id -u)
-DOCKER_UP_OPTIONS ?=
 DOCKER_COMPOSE_BIN ?= docker compose
 
 # Colors
@@ -13,9 +11,8 @@ TEXT_BOLD = \033[1m
 
 ##@ Setup 📜
 ### Installer le projet from scratch
-install:
-	cp -n .env.dist .env && cp -n docker.env docker.env.local && cp -n ./docker/data/history.dist ./docker/data/history && cp -n compose.override.yml-dist compose.override.yml
-	mkdir -p ./htdocs/uploads -p ./tmp
+install: init-file init-folder
+	cp -n ./docker/data/history.dist ./docker/data/history && cp -n compose.override.yml-dist compose.override.yml
 
 	$(DOCKER_COMPOSE_BIN) up -d --build
 
@@ -26,7 +23,7 @@ install:
 	$(MAKE) --no-print-directory build-assets
 
 	# Reset la base de donnée
-	cat ./.docker/mysql/reset-db.sql | $(DOCKER_COMPOSE_BIN) run -T --rm db /opt/mysql_no_db
+	cat ./docker/mysql/reset-db.sql | $(DOCKER_COMPOSE_BIN) run -T --rm db /opt/mysql_no_db
 
 	$(DOCKER_COMPOSE_BIN) exec --user localUser apachephp php bin/phinx migrate
 	$(DOCKER_COMPOSE_BIN) exec --user localUser apachephp php bin/phinx seed:run
@@ -35,7 +32,7 @@ install:
 reset:
 	$(DOCKER_COMPOSE_BIN) down --remove-orphans -v
 	rm -f ./.env -f ./docker.env.local -f ./docker/data/history -f compose.override.yml
-	sudo rm -rf ./var ./vendor ./node_modules ./htdocs/bundles ./htdocs/docs ./htdocs/uploads ./htdocs/assets ./tmp
+	sudo rm -rf ./var/cache/dev ./var/cache/prod ./var/cache/test ./var/logs/*.log ./vendor ./node_modules ./htdocs/bundles ./htdocs/docs ./htdocs/uploads ./htdocs/assets ./tmp
 
 ### Reinstalle le projet from scratch
 reinstall: reset install
@@ -54,24 +51,20 @@ watch-assets:
 	$(DOCKER_COMPOSE_BIN) run --rm node npm run watch
 
 ##@ Quality ✨
-### Installe l'environment de test
-install-test:
-	mkdir -p ./htdocs/uploads -p ./tmp
-
 ### Lance toute la suite de tests
 tests: cs-lint unit-test test-integration behat
 
 ### Lance les tests unitaire
 unit-test:
-	$(DOCKER_COMPOSE_BIN) exec --user localUser apachephptest ./bin/phpunit --testsuite unit
+	$(DOCKER_COMPOSE_BIN) exec --user localUser apachephp ./bin/phpunit --testsuite unit
 
 ### Tests d'intégration
 test-integration: # not work
-	$(DOCKER_COMPOSE_BIN) exec --user localUser apachephptest ./bin/phpunit --testsuite integration
+	$(DOCKER_COMPOSE_BIN) exec --user localUser apachephp ./bin/phpunit --testsuite integration
 
 ### Tests fonctionnels
 behat:
-	$(DOCKER_COMPOSE_BIN) exec --user localUser apachephptest ./bin/behat
+	$(DOCKER_COMPOSE_BIN) exec --user localUser apachephp ./bin/behat
 
 ### PHP CS Fixer (dry run)
 cs-lint:
@@ -108,7 +101,7 @@ test-integration-ci:
 
 ### Analyse PHPStan
 phpstan:
-	docker run -v $(shell pwd):/app --rm ghcr.io/phpstan/phpstan
+	$(DOCKER_COMPOSE_BIN) exec -u localUser apachephp ./bin/phpstan --memory-limit=-1
 
 ##@ Docker 🐳
 ### Démarrer un bash dans le container PHP
@@ -139,9 +132,12 @@ help:
 .PHONY: install tests hooks console phpstan help
 .SILENT: help
 
+## Target only used by other make command
+# Used by "rector" target
 var/cache/dev/AppKernelDevDebugContainer.xml:
 	$(DOCKER_COMPOSE_BIN) exec --user localUser apachephp bin/console cache:warmup --env=dev
 
+# Used by "hooks" target
 pre-commit:
 	echo "#!/bin/sh" > .git/hooks/pre-commit
 	echo "docker compose run --rm -u localUser apachephp make test" >> .git/hooks/pre-commit
@@ -151,3 +147,11 @@ post-checkout:
 	echo "#!/bin/sh" > .git/hooks/post-checkout
 	echo "docker compose run --rm -u localUser apachephp composer install --no-scripts" >> .git/hooks/post-checkout
 	chmod +x .git/hooks/post-checkout
+
+# Used by CI and "install" target
+init-file:
+	cp -n .env.dist .env && cp -n docker.env docker.env.local
+
+# Used by CI and "install" target
+init-folder:
+	mkdir -p ./htdocs/uploads -p ./tmp

.gitignore

@@ -1,7 +1,7 @@
 services:
   apachephp:
     build:
-      context: .
+      context: ./docker/apachephp
       target: afup_web_dev
     container_name: afup-web-apachephp
     environment:
@@ -13,15 +13,15 @@ services:
     volumes:
       - ./:/var/www/html
       # Permet d'avoir un bash history ainsi que des alias bash quand on est dans le container
-      - ./.docker/config/bashrc:/home/localUser/.bashrc
-      - ./.docker/config/bash_aliases:/home/localUser/.bash_aliases
-      - ./.docker/data/history:/home/localUser/.bash_history
+      - ./docker/config/bashrc:/home/localUser/.bashrc
+      - ./docker/config/bash_aliases:/home/localUser/.bash_aliases
+      - ./docker/data/history:/home/localUser/.bash_history
     depends_on:
       - db
       - mailcatcher
 
   db:
-    build: ./docker/dockerfiles/mysql
+    build: ./docker/mysql/dev
     container_name: afup-web-db
     environment:
       MYSQL_ROOT_PASSWORD: root
@@ -44,7 +44,7 @@ services:
     profiles: [front] # Avec ce paramètre node n'est pas lancé quand on docker compose up
 
   dbtest:
-    build: ./docker/dockerfiles/mysqltest
+    build: ./docker/mysql/test
     container_name: afup-web-db-test
     environment:
       MYSQL_ROOT_PASSWORD: root
@@ -60,7 +60,7 @@ services:
 
   apachephptest:
     build:
-      context: .
+      context: ./docker/apachephp
       target: afup_web_dev
     container_name: afup-web-apachephp-test
     environment:
@@ -74,9 +74,9 @@ services:
     volumes:
       - ./:/var/www/html
       # Permet d'avoir un bash history ainsi que des alias bash quand on est dans le container
-      - ./.docker/config/bashrc:/localUser/.bashrc
-      - ./.docker/config/bash_aliases:/localUser/.bash_aliases
-      - ./.docker/data/history:/localUser/.bash_history
+      - ./docker/config/bashrc:/localUser/.bashrc
+      - ./docker/config/bash_aliases:/localUser/.bash_aliases
+      - ./docker/data/history:/localUser/.bash_history
     healthcheck:
       test: [ "CMD", "curl", "-f", "https://apachephptest:80" ]
       interval: 30s
@@ -92,4 +92,4 @@ services:
     image: nginx:1.25.4
     container_name: afup-web-static
     volumes:
-      - ./.docker/data/test/static-resources:/usr/share/nginx/html:ro
+      - ./docker/data/test/static-resources:/usr/share/nginx/html:ro

Dockerfile

@@ -99,6 +99,12 @@ Il faut se connecter au container via `make console` puis :
 ./bin/behat
 ```
 
+ou
+
+```bash
+make behat
+```
+
 > [!TIP]
 > Il est possible de spécifier un test dans la ligne de commande :
 > ```bash
@@ -119,15 +125,15 @@ Si par la suite, vous souhaitez lancer un test, il faut bien penser à les allum
 Les tests unitaires sont écrits via PHPUnit.
 
 ```bash
-bash unit-test
+make unit-test
 ```
 
 ### Tests d'intégration
 
 Ces tests sont écrits via PHPUnit et utilisent le kernel de Symfony : https://symfony.com/doc/current/testing.html#integration-tests
 
 ```bash
-bash test-integration
+make test-integration
 ```
 
 Une alternative est d'utiliser la commande `make test-integration`, attention cette commande arrête les containeurs de