Skip to content

Commit a70c0d9

Browse files
tillmannrfqqdk
andcommitted
Upgrade phpunit
Co-authored-by: fqqdk <csaba.simon@emarsys.com>
1 parent fd12d8a commit a70c0d9

30 files changed

Lines changed: 1981 additions & 1099 deletions

Dockerfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
FROM php:8.0-apache
2+
3+
ENV COMPOSER_ALLOW_SUPERUSER="1"
4+
RUN curl -Ss https://getcomposer.org/installer | php && \
5+
mv composer.phar /usr/bin/composer

Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ build: ## build container
2121

2222
up: ## run
2323
docker-compose up -d
24-
## $(DOCKER) run -d -v "$$PWD":/var/www/html/ --rm --name=$(CONTAINER) -h $(CONTAINER).ett.local $(CONTAINER)
2524

2625
stop: ## stop container
2726
docker-compose stop
@@ -30,7 +29,7 @@ restart: stop up ## restart container and run
3029

3130
ssh: sh ## get a shell in the container (alias for sh)
3231
sh: ## get a shell in the container
33-
@docker-compose exec web /bin/bash
32+
docker-compose exec web /bin/bash
3433

3534
logs: ## show logs
3635
@docker-compose logs -f web

composer.json

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,11 @@
1515
"require": {
1616
"guzzlehttp/guzzle": "~6.0",
1717
"emartech/escher": "1.*",
18-
"php": "~7.0"
18+
"php": ">=7.3"
1919
},
2020
"require-dev": {
21-
"phpunit/phpunit": "6.*",
22-
"phpunit/php-timer": "1.0.8",
23-
"silex/silex": "~2.0",
24-
"emartech/php-test-helpers": "~0.1",
25-
"fqqdk/packagist-publisher": "*"
21+
"phpunit/phpunit": "9.*",
22+
"silex/silex": "~2.0"
2623
},
2724
"authors": [
2825
{

0 commit comments

Comments
 (0)