Skip to content

Commit

Permalink
Drop PHP 7.1
Browse files Browse the repository at this point in the history
* use dbrekelmans/bdi by default
* force newest composer version to be able to allow plugins
  • Loading branch information
robertfausk committed Feb 16, 2022
1 parent 8f920ad commit 13d93b9
Show file tree
Hide file tree
Showing 9 changed files with 52 additions and 48 deletions.
18 changes: 2 additions & 16 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-20.04
strategy:
matrix:
php: [ '7.1', '7.2', '7.3', '7.4', '8.0', '8.1' ]
php: [ '7.2', '7.3', '7.4', '8.0', '8.1' ]
symfony: ['symfony3', 'symfony4', 'symfony5']
include:
- php: '8.0'
Expand All @@ -38,26 +38,12 @@ jobs:
coverage: "none"
php-version: "${{ matrix.php }}"
tools: composer
# PHP 7.1 development web server segfaults if timezone not set.
ini-values: date.timezone=Europe/Berlin, error_reporting=-1, display_errors=On
- name: Install scenario
run: |
.scenarios.lock/install "${{ matrix.symfony }}" "${DEPENDENCIES}"
- name: Configure for PHP >= 7.2
if: "${{ matrix.php >= '7.2' }}"
run: |
composer require --no-update --dev dbrekelmans/bdi
- name: Add browser drivers for PHP >= 7.2
if: "${{ matrix.php >= '7.2' }}"
- name: Add browser drivers
run: |
vendor/bin/bdi detect drivers
- name: Add browser drivers for PHP == 7.1
if: "${{ matrix.php == '7.1' }}"
# additionally, place 'chromedriver' file also in folder 'driver' for symfony/panther >=0.9 and PHP 7.1
run: |
bin/updatePantherChromeDriver.sh
mkdir drivers
mv vendor/symfony/panther/chromedriver-bin/chromedriver_linux64 drivers/chromedriver
- name: Run unit tests
run: |
vendor/bin/phpunit -v
Expand Down
13 changes: 9 additions & 4 deletions .scenarios.lock/symfony3/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,17 @@
],
"require": {
"symfony/config": "^3.4",
"php": ">=7.1",
"php": ">=7.2",
"behat/behat": "^3.0.5",
"robertfausk/mink-panther-driver": "^1.0",
"friends-of-behat/mink-extension": "^2.3.0"
},
"require-dev": {
"roave/security-advisories": "dev-master",
"phpunit/phpunit": "~7.5|~9.3",
"dbrekelmans/bdi": "^1.0",
"g1a/composer-test-scenarios": "^3.0",
"matthiasnoback/symfony-config-test": "^4.1",
"g1a/composer-test-scenarios": "^3.0"
"phpunit/phpunit": "~7.5|~9.3",
"roave/security-advisories": "dev-master"
},
"autoload": {
"psr-4": {
Expand All @@ -43,6 +44,10 @@
},
"config": {
"sort-packages": true,
"allow-plugins": {
"g1a/composer-test-scenarios": true,
"pyrech/composer-changelogs": true
},
"vendor-dir": "../../vendor"
},
"extra": {
Expand Down
13 changes: 9 additions & 4 deletions .scenarios.lock/symfony4/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,17 @@
],
"require": {
"symfony/config": "^4.0",
"php": ">=7.1",
"php": ">=7.2",
"behat/behat": "^3.0.5",
"robertfausk/mink-panther-driver": "^1.0",
"friends-of-behat/mink-extension": "^2.3.0"
},
"require-dev": {
"roave/security-advisories": "dev-master",
"phpunit/phpunit": "~7.5|~9.3",
"dbrekelmans/bdi": "^1.0",
"g1a/composer-test-scenarios": "^3.0",
"matthiasnoback/symfony-config-test": "^4.1",
"g1a/composer-test-scenarios": "^3.0"
"phpunit/phpunit": "~7.5|~9.3",
"roave/security-advisories": "dev-master"
},
"autoload": {
"psr-4": {
Expand All @@ -43,6 +44,10 @@
},
"config": {
"sort-packages": true,
"allow-plugins": {
"g1a/composer-test-scenarios": true,
"pyrech/composer-changelogs": true
},
"vendor-dir": "../../vendor"
},
"extra": {
Expand Down
13 changes: 9 additions & 4 deletions .scenarios.lock/symfony5/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,17 @@
],
"require": {
"symfony/config": "^5.0",
"php": ">=7.1",
"php": ">=7.2",
"behat/behat": "^3.0.5",
"robertfausk/mink-panther-driver": "^1.0",
"friends-of-behat/mink-extension": "^2.3.0"
},
"require-dev": {
"roave/security-advisories": "dev-master",
"phpunit/phpunit": "~7.5|~9.3",
"dbrekelmans/bdi": "^1.0",
"g1a/composer-test-scenarios": "^3.0",
"matthiasnoback/symfony-config-test": "^4.1",
"g1a/composer-test-scenarios": "^3.0"
"phpunit/phpunit": "~7.5|~9.3",
"roave/security-advisories": "dev-master"
},
"autoload": {
"psr-4": {
Expand All @@ -43,6 +44,10 @@
},
"config": {
"sort-packages": true,
"allow-plugins": {
"g1a/composer-test-scenarios": true,
"pyrech/composer-changelogs": true
},
"vendor-dir": "../../vendor"
},
"extra": {
Expand Down
13 changes: 9 additions & 4 deletions .scenarios.lock/symfony6/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,17 @@
],
"require": {
"symfony/config": "^6.0",
"php": ">=7.1",
"php": ">=7.2",
"behat/behat": "^3.0.5",
"robertfausk/mink-panther-driver": "^1.0",
"friends-of-behat/mink-extension": "^2.3.0"
},
"require-dev": {
"roave/security-advisories": "dev-master",
"phpunit/phpunit": "~7.5|~9.3",
"dbrekelmans/bdi": "^1.0",
"g1a/composer-test-scenarios": "^3.0",
"matthiasnoback/symfony-config-test": "^4.1",
"g1a/composer-test-scenarios": "^3.0"
"phpunit/phpunit": "~7.5|~9.3",
"roave/security-advisories": "dev-master"
},
"autoload": {
"psr-4": {
Expand All @@ -43,6 +44,10 @@
},
"config": {
"sort-packages": true,
"allow-plugins": {
"g1a/composer-test-scenarios": true,
"pyrech/composer-changelogs": true
},
"vendor-dir": "../../vendor"
},
"extra": {
Expand Down
4 changes: 3 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG PHP_VERSION=7.2

FROM composer:latest as composer
FROM composer:2 as composer
FROM php:${PHP_VERSION}-cli

# replace shell with bash so we can source files
Expand Down Expand Up @@ -40,5 +40,7 @@ RUN if [[ "${PHP_VERSION}" = "7.4*" ]] || [[ "${PHP_VERSION}" = "8.0*" ]]; then
docker-php-ext-install gd \
;fi

RUN composer self-update

WORKDIR /var/www/html
COPY . /var/www/html
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ private function spin(\Closure $closure, ?int $tries = 25): ?NodeElement

## How to contribute?

Start docker-compose with php version of your choice. At the moment the following php versions can be used with docker-compose: php7.1, php7.2, php7.3, php7.4 and php8.0.
Start docker-compose with php version of your choice. At the moment the following php versions can be used with docker-compose: php7.2, php7.3, php7.4, php8.0 and php8.1.

docker-compose up php8.1

Expand Down
15 changes: 10 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,18 @@
}
],
"require": {
"php": ">=7.1",
"php": ">=7.2",
"behat/behat": "^3.0.5",
"robertfausk/mink-panther-driver": "^1.0",
"symfony/config": "^3.4|^4.0|^5.0|^6.0",
"friends-of-behat/mink-extension": "^2.3.0"
},
"require-dev": {
"roave/security-advisories": "dev-master",
"phpunit/phpunit": "~7.5|~9.3",
"dbrekelmans/bdi": "^1.0",
"g1a/composer-test-scenarios": "^3.0",
"matthiasnoback/symfony-config-test": "^4.1",
"g1a/composer-test-scenarios": "^3.0"
"phpunit/phpunit": "~7.5|~9.3",
"roave/security-advisories": "dev-master"
},
"autoload": {
"psr-4": {
Expand All @@ -42,7 +43,11 @@
}
},
"config": {
"sort-packages": true
"sort-packages": true,
"allow-plugins": {
"g1a/composer-test-scenarios": true,
"pyrech/composer-changelogs": true
}
},
"extra": {
"branch-alias": {
Expand Down
9 changes: 0 additions & 9 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
version: "3"
services:

php7.1:
tty: true
build:
context: .
args:
- PHP_VERSION=7.1
volumes:
- .:/var/www/html

php7.2:
tty: true
build:
Expand Down

0 comments on commit 13d93b9

Please sign in to comment.