refacto: Move some file to match with comment

Author: mihani

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

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

.dockerignore

@@ -78,9 +78,9 @@ 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
@@ -120,9 +120,9 @@ 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
@@ -150,4 +150,9 @@ jobs:
           composer-options: "--no-scripts"
 
       - name: Rector
-        run: make rector
+        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

.editorconfig

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

.github/workflows/ci.yml

@@ -14,7 +14,7 @@ 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
+	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
 
 	$(DOCKER_COMPOSE_BIN) up -d --build
@@ -26,15 +26,15 @@ 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
 
 ### Supprime les volumes docker, les fichiers et les dossier généré par le projet
 reset:
 	$(DOCKER_COMPOSE_BIN) down --remove-orphans -v
-	rm -f ./.env -f ./docker.env.local -f .docker/data/history -f compose.override.yml
+	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
 
 ### Reinstalle le projet from scratch
@@ -71,7 +71,7 @@ test-integration: # not work
 
 ### 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:
@@ -81,13 +81,16 @@ cs-lint:
 cs-fix:
 	$(DOCKER_COMPOSE_BIN) exec --user localUser apachephp ./bin/php-cs-fixer fix -vv
 
-### (Dans Docker) Rector (dry run)
+### Rector (dry run)
 rector: var/cache/dev/AppKernelDevDebugContainer.xml
-	./bin/rector --dry-run
+	$(DOCKER_COMPOSE_BIN) exec --user localUser apachephp ./bin/rector --dry-run
 
-### (Dans Docker) Rector (fix)
+### Rector (fix)
 rector-fix: var/cache/dev/AppKernelDevDebugContainer.xml
-	./bin/rector
+	$(DOCKER_COMPOSE_BIN) exec --user localUser apachephp ./bin/rector
+
+var/cache/dev/AppKernelDevDebugContainer.xml:
+	$(DOCKER_COMPOSE_BIN) exec --user localUser apachephp bin/console cache:warmup --env=dev
 
 ### Tests fonctionnels
 test-functional:
@@ -125,7 +128,7 @@ pre-commit: Makefile
 
 post-checkout: Makefile
 	echo "#!/bin/sh" > .git/hooks/post-checkout
-	echo "docker compose run --rm -u localUser apachephp make vendor" >> .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
 
 help:
@@ -147,6 +150,3 @@ help:
 
 .PHONY: install tests hooks console phpstan help
 .SILENT: help
-
-var/cache/dev/AppKernelDevDebugContainer.xml:
-	php bin/console cache:warmup --env=dev

.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

Makefile

@@ -0,0 +1,55 @@
+FROM php:8.2-apache AS afup_web_base
+
+ARG UID=1008
+ARG GID=1008
+
+WORKDIR /var/www/html
+
+# Update package list and install system dependencies
+RUN apt-get update  \
+    && apt-get install -y --no-install-recommends \
+	acl \
+	git \
+	file \
+	gettext \
+    gosu; \
+    rm -rf /var/lib/apt/lists/*; \
+    # verify that the binary works
+    gosu nobody true;
+
+RUN groupadd -g ${GID} localUser && \
+    useradd -l -u ${UID} -g ${GID} -m -s /bin/bash localUser && \
+    usermod -a -G www-data localUser
+
+ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
+
+RUN set -eux; \
+    install-php-extensions @composer-2.2.25 zip intl pdo_mysql mysqli gd opcache pcntl \
+    ;
+
+COPY --link php/conf.d/10-app.ini $PHP_INI_DIR/conf.d/
+
+COPY --link --chmod=755 php/docker-healthcheck.sh /usr/local/bin/docker-healthcheck
+HEALTHCHECK --start-period=1m CMD docker-healthcheck
+
+COPY --link --chmod=755 php/docker-entrypoint.sh /usr/local/bin/docker-entrypoint
+
+ENTRYPOINT ["docker-entrypoint"]
+CMD ["apache2-foreground"]
+
+FROM afup_web_base AS afup_web_dev
+
+COPY --link php/conf.d/20-app.dev.ini $PHP_INI_DIR/conf.d/
+
+RUN set -eux; \
+	install-php-extensions xdebug \
+    ;
+
+COPY --link apache/apache.conf /etc/apache2/sites-available/000-default.conf
+COPY --link apache/cert/apache.crt /etc/apache2/ssl/apache.crt
+COPY --link apache/cert/apache.key /etc/apache2/ssl/apache.key
+
+RUN sed --in-place "s/User \${APACHE_RUN_USER}/User localUser/" /etc/apache2/apache2.conf && \
+    sed --in-place "s/Group \${APACHE_RUN_GROUP}/Group localUser/" /etc/apache2/apache2.conf && \
+    a2ensite 000-default && \
+    a2enmod rewrite ssl