Merge pull request #372 from phpdocker-io/symfony-7-prep

Symfony 7 prep

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

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,23 +27,23 @@ 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
 
 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) .

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",