diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6a6ba26..089dfc5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,6 +38,14 @@ jobs: composer-options: "--ignore-platform-reqs" experimental: true dependencies: "highest" + - php: "8.3" + composer-options: "--ignore-platform-reqs" + experimental: true + dependencies: "highest" + - php: "8.4" + composer-options: "--ignore-platform-reqs" + experimental: true + dependencies: "highest" steps: - name: Set up PHP uses: shivammathur/setup-php@2.24.0 diff --git a/Makefile b/Makefile index 276d62c..972a233 100644 --- a/Makefile +++ b/Makefile @@ -11,31 +11,31 @@ help: ## Display this help install: composer-install build up ## Install required software and initialize your local configuration build: ## Build application docker images - @bash -c "docker-compose build ${PHP_CONTAINER_NAME}" + @bash -c "docker compose build ${PHP_CONTAINER_NAME}" up: ## Start application containers and required services - @bash -c "export MOCKSERVER_LOG_LEVEL=WARN; docker-compose up -d" + @bash -c "export MOCKSERVER_LOG_LEVEL=WARN; docker compose up -d" debug: ## Start application containers and required services in debug mode - @bash -c "export MOCKSERVER_LOG_LEVEL=INFO; docker-compose up -d" + @bash -c "export MOCKSERVER_LOG_LEVEL=INFO; docker compose up -d" down: ## Stop application containers and required services - @docker-compose down + @docker compose down test: ## Execute all phpunit test - @docker-compose exec ${PHP_CONTAINER_NAME} ./vendor/bin/phpunit ${TEST} + @docker compose exec ${PHP_CONTAINER_NAME} ./vendor/bin/phpunit ${TEST} code-sniff cs: ## Detect coding standard violations in all project files using code sniffer - @docker-compose exec ${PHP_CONTAINER_NAME} ./vendor/bin/phpcs + @docker compose exec ${PHP_CONTAINER_NAME} ./vendor/bin/phpcs code-format cf: ## Fix coding standard violations in all project files - @docker-compose exec ${PHP_CONTAINER_NAME} ./vendor/bin/phpcbf + @docker compose exec ${PHP_CONTAINER_NAME} ./vendor/bin/phpcbf code-find-bugs phpstan: ## Run static analysis tool to find possible bugs using phpstan - @docker-compose exec ${PHP_CONTAINER_NAME} ./vendor/bin/phpstan analyse + @docker compose exec ${PHP_CONTAINER_NAME} ./vendor/bin/phpstan analyse code-find-smells md: ## Run static analysis tool to find code smells using mess detector - @docker-compose exec ${PHP_CONTAINER_NAME} ./vendor/bin/phpmd src,tests text phpmd.xml --suffixes php + @docker compose exec ${PHP_CONTAINER_NAME} ./vendor/bin/phpmd src,tests text phpmd.xml --suffixes php composer-update: ## Run composer update @docker run --rm --interactive --tty --volume $PWD:/app composer update @@ -43,4 +43,5 @@ composer-update: ## Run composer update composer-install: ## Run composer update @docker run --rm --interactive --tty --volume $PWD:/app composer install - +console c: ## Run the container bash console + docker exec -it php /bin/bash diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile index 9eedf99..f02e97f 100644 --- a/docker/php/Dockerfile +++ b/docker/php/Dockerfile @@ -1,8 +1,8 @@ -FROM php:8.1 +FROM php:8.4 RUN pecl install xdebug && \ docker-php-ext-enable xdebug COPY rootfs / -WORKDIR /app \ No newline at end of file +WORKDIR /app