Skip to content

Commit

Permalink
Merge pull request #7 from robertfausk/ga_php8.1_symfony6
Browse files Browse the repository at this point in the history
Add support for PHP 8.1 and Symfony6; drop support for PHP 7.1; use GitHub Actions instead of Travis CI
  • Loading branch information
robertfausk authored Feb 16, 2022
2 parents d6e2b80 + 8534364 commit 7498e38
Show file tree
Hide file tree
Showing 13 changed files with 219 additions and 104 deletions.
59 changes: 59 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
name: CI

on:
push:
pull_request:

defaults:
run:
shell: bash

jobs:

tests:
name: Tests
runs-on: ubuntu-20.04
strategy:
matrix:
php: [ '7.2', '7.3', '7.4', '8.0', '8.1' ]
symfony: ['symfony3', 'symfony4', 'symfony5']
include:
- php: '8.0'
symfony: 'symfony6'
- php: '8.1'
symfony: 'symfony6'
fail-fast: false
env:
MATRIX_PHP: ${{ matrix.php }}
MATRIX_SYMFONY: ${{ matrix.symfony }}

steps:
- name: Checkout
uses: actions/checkout@v2
with:
fetch-depth: 1
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
coverage: "none"
php-version: "${{ matrix.php }}"
tools: composer
- name: Install scenario
run: |
.scenarios.lock/install "${{ matrix.symfony }}" "${DEPENDENCIES}"
- name: Add browser drivers
run: |
vendor/bin/bdi detect drivers
- name: Run unit tests
run: |
vendor/bin/phpunit -v
- name: Run behat tests
run: |
vendor/bin/behat --config=tests/Behat/behat.yml
- name: Archive logs artifacts
if: ${{ failure() }}
uses: actions/upload-artifact@v2
with:
name: logs_php-${{ matrix.php }}
path: |
logs
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
1 change: 1 addition & 0 deletions .scenarios.lock/symfony6/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
vendor
58 changes: 58 additions & 0 deletions .scenarios.lock/symfony6/composer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
{
"name": "robertfausk/behat-panther-extension",
"type": "behat-extension",
"description": "Symfony Panther extension for Behat",
"keywords": [
"behat",
"symfony",
"panther",
"web",
"test",
"browser",
"gui"
],
"license": "MIT",
"authors": [
{
"name": "Robert Freigang",
"email": "[email protected]"
}
],
"require": {
"symfony/config": "^6.0",
"php": ">=7.2",
"behat/behat": "^3.0.5",
"robertfausk/mink-panther-driver": "^1.0",
"friends-of-behat/mink-extension": "^2.3.0"
},
"require-dev": {
"dbrekelmans/bdi": "^1.0",
"g1a/composer-test-scenarios": "^3.0",
"matthiasnoback/symfony-config-test": "^4.1",
"phpunit/phpunit": "~7.5|~9.3",
"roave/security-advisories": "dev-master"
},
"autoload": {
"psr-4": {
"Robertfausk\\Behat\\PantherExtension\\": "../../src/"
}
},
"autoload-dev": {
"psr-4": {
"Tests\\": "../../tests/"
}
},
"config": {
"sort-packages": true,
"allow-plugins": {
"g1a/composer-test-scenarios": true,
"pyrech/composer-changelogs": true
},
"vendor-dir": "../../vendor"
},
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
}
}
}
43 changes: 0 additions & 43 deletions .travis.yml

This file was deleted.

11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
v1.0.7 / 2022-02-16
===================

Features:
* Add support for ```Symfony 6```
* Add support for ```PHP 8.1```
* Drop support for ```PHP 7.1``` cause of too much maintenance afford. Stick with ```v1.0.6``` if you want to use ```PHP 7.1```.

Misc:
* Use GitHub Actions instead of Travis CI for continuous integration.

v1.0.6 / 2021-03-30
===================

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
56 changes: 28 additions & 28 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2019-2021 Robert Freigang
Copyright (c) 2019-2022 Robert Freigang

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -24,34 +24,34 @@ DEPENDENCY LICENSES:

Name Version License
behat/behat v3.7.0 MIT
behat/gherkin v4.8.0 MIT
behat/mink v1.8.1 MIT
behat/gherkin v4.9.0 MIT
behat/mink v1.9.0 MIT
behat/transliterator v1.3.0 Artistic-1.0
friends-of-behat/mink-extension v2.5.0 MIT
php-webdriver/webdriver 1.9.0 MIT
psr/container 1.0.0 MIT
psr/log 1.1.3 MIT
robertfausk/mink-panther-driver v1.0.7 MIT
symfony/browser-kit v5.2.3 MIT
php-webdriver/webdriver 1.12.0 MIT
psr/container 1.1.2 MIT
psr/log 2.0.0 MIT
robertfausk/mink-panther-driver v1.0.8 MIT
symfony/browser-kit v5.4.3 MIT
symfony/config v3.4.47 MIT
symfony/console v4.4.19 MIT
symfony/css-selector v5.2.3 MIT
symfony/console v4.4.37 MIT
symfony/css-selector v5.4.3 MIT
symfony/dependency-injection v3.4.47 MIT
symfony/deprecation-contracts v2.2.0 MIT
symfony/dom-crawler v5.2.3 MIT
symfony/event-dispatcher v4.4.19 MIT
symfony/event-dispatcher-contracts v1.1.9 MIT
symfony/filesystem v4.4.19 MIT
symfony/http-client v5.2.3 MIT
symfony/http-client-contracts v2.3.1 MIT
symfony/panther v1.0.1 MIT
symfony/polyfill-ctype v1.22.1 MIT
symfony/polyfill-mbstring v1.22.1 MIT
symfony/polyfill-php72 v1.22.1 MIT
symfony/polyfill-php73 v1.22.1 MIT
symfony/polyfill-php80 v1.22.1 MIT
symfony/process v5.2.3 MIT
symfony/service-contracts v2.2.0 MIT
symfony/translation v4.4.19 MIT
symfony/translation-contracts v2.3.0 MIT
symfony/yaml v5.2.3 MIT
symfony/deprecation-contracts v2.5.0 MIT
symfony/dom-crawler v5.4.3 MIT
symfony/event-dispatcher v4.4.37 MIT
symfony/event-dispatcher-contracts v1.1.11 MIT
symfony/filesystem v4.4.37 MIT
symfony/http-client v5.4.3 MIT
symfony/http-client-contracts v2.5.0 MIT
symfony/panther v1.1.1 MIT
symfony/polyfill-ctype v1.24.0 MIT
symfony/polyfill-mbstring v1.24.0 MIT
symfony/polyfill-php72 v1.24.0 MIT
symfony/polyfill-php73 v1.24.0 MIT
symfony/polyfill-php80 v1.24.0 MIT
symfony/process v5.4.3 MIT
symfony/service-contracts v2.5.0 MIT
symfony/translation v4.4.37 MIT
symfony/translation-contracts v2.5.0 MIT
symfony/yaml v5.3.14 MIT
Loading

0 comments on commit 7498e38

Please sign in to comment.