Skip to content

Commit 24520c1

Browse files
authored
Merge pull request #10 from TimelessTron/Update-to-php-8.3-and-docker-compose-call
Update php to 8.4 and Update docker compose call
2 parents d4210e9 + 5d7c1e1 commit 24520c1

File tree

3 files changed

+21
-12
lines changed

3 files changed

+21
-12
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,14 @@ jobs:
3838
composer-options: "--ignore-platform-reqs"
3939
experimental: true
4040
dependencies: "highest"
41+
- php: "8.3"
42+
composer-options: "--ignore-platform-reqs"
43+
experimental: true
44+
dependencies: "highest"
45+
- php: "8.4"
46+
composer-options: "--ignore-platform-reqs"
47+
experimental: true
48+
dependencies: "highest"
4149
steps:
4250
- name: Set up PHP
4351
uses: shivammathur/setup-php@2.24.0

Makefile

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,36 +11,37 @@ help: ## Display this help
1111
install: composer-install build up ## Install required software and initialize your local configuration
1212

1313
build: ## Build application docker images
14-
@bash -c "docker-compose build ${PHP_CONTAINER_NAME}"
14+
@bash -c "docker compose build ${PHP_CONTAINER_NAME}"
1515

1616
up: ## Start application containers and required services
17-
@bash -c "export MOCKSERVER_LOG_LEVEL=WARN; docker-compose up -d"
17+
@bash -c "export MOCKSERVER_LOG_LEVEL=WARN; docker compose up -d"
1818

1919
debug: ## Start application containers and required services in debug mode
20-
@bash -c "export MOCKSERVER_LOG_LEVEL=INFO; docker-compose up -d"
20+
@bash -c "export MOCKSERVER_LOG_LEVEL=INFO; docker compose up -d"
2121

2222
down: ## Stop application containers and required services
23-
@docker-compose down
23+
@docker compose down
2424

2525
test: ## Execute all phpunit test
26-
@docker-compose exec ${PHP_CONTAINER_NAME} ./vendor/bin/phpunit ${TEST}
26+
@docker compose exec ${PHP_CONTAINER_NAME} ./vendor/bin/phpunit ${TEST}
2727

2828
code-sniff cs: ## Detect coding standard violations in all project files using code sniffer
29-
@docker-compose exec ${PHP_CONTAINER_NAME} ./vendor/bin/phpcs
29+
@docker compose exec ${PHP_CONTAINER_NAME} ./vendor/bin/phpcs
3030

3131
code-format cf: ## Fix coding standard violations in all project files
32-
@docker-compose exec ${PHP_CONTAINER_NAME} ./vendor/bin/phpcbf
32+
@docker compose exec ${PHP_CONTAINER_NAME} ./vendor/bin/phpcbf
3333

3434
code-find-bugs phpstan: ## Run static analysis tool to find possible bugs using phpstan
35-
@docker-compose exec ${PHP_CONTAINER_NAME} ./vendor/bin/phpstan analyse
35+
@docker compose exec ${PHP_CONTAINER_NAME} ./vendor/bin/phpstan analyse
3636

3737
code-find-smells md: ## Run static analysis tool to find code smells using mess detector
38-
@docker-compose exec ${PHP_CONTAINER_NAME} ./vendor/bin/phpmd src,tests text phpmd.xml --suffixes php
38+
@docker compose exec ${PHP_CONTAINER_NAME} ./vendor/bin/phpmd src,tests text phpmd.xml --suffixes php
3939

4040
composer-update: ## Run composer update
4141
@docker run --rm --interactive --tty --volume $PWD:/app composer update
4242

4343
composer-install: ## Run composer update
4444
@docker run --rm --interactive --tty --volume $PWD:/app composer install
4545

46-
46+
console c: ## Run the container bash console
47+
docker exec -it php /bin/bash

docker/php/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
FROM php:8.1
1+
FROM php:8.4
22

33
RUN pecl install xdebug && \
44
docker-php-ext-enable xdebug
55

66
COPY rootfs /
77

8-
WORKDIR /app
8+
WORKDIR /app

0 commit comments

Comments
 (0)