From f6121b8367420d9039beaf47906db4ab1d6baad5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= <dunglas@gmail.com>
Date: Fri, 30 Oct 2020 13:07:06 +0100
Subject: [PATCH 1/5] Add support for PHP 8

---
 .travis.yml   | 1 +
 composer.json | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 851fa39..af6dccb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,7 @@ php:
     - '7.2'
     - '7.3'
     - '7.4'
+    - '8.0snapshot'
 
 env:
     - SYMFONY_VERSION=4.4.*
diff --git a/composer.json b/composer.json
index 204747f..e34d6db 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,7 @@
         }
     ],
     "require": {
-        "php": "^7.2",
+        "php": "^7.2 || ^8.0",
         "behat/behat": "^3.6.1",
         "symfony/dependency-injection": "^4.4|^5.0",
         "symfony/http-kernel": "^4.4|^5.0",

From 8e736edf2c49ababf59a4bead052cd7b9311da8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= <dunglas@gmail.com>
Date: Fri, 30 Oct 2020 16:26:42 +0100
Subject: [PATCH 2/5] remove Symfony 5.0 from the matrix because it isn't
 maintained anymore

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index af6dccb..5ae586a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,6 @@ php:
 
 env:
     - SYMFONY_VERSION=4.4.*
-    - SYMFONY_VERSION=5.0.*
     - SYMFONY_VERSION=5.1.*
 
 cache:

From 7bd72b4cfafe9b7cad2008642d640ed638116910 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= <dunglas@gmail.com>
Date: Fri, 30 Oct 2020 16:34:22 +0100
Subject: [PATCH 3/5] make Travis happy

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 5ae586a..8983f57 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,6 +16,7 @@ cache:
 
 before_install:
     - phpenv config-rm xdebug.ini || true
+    - composer self-update --2 # For Composer v2 for PHP 8 while it's not installed by default by Travis
 
 install:
     - composer require symfony/dependency-injection:${SYMFONY_VERSION} --no-update --no-scripts --prefer-dist
@@ -27,7 +28,7 @@ install:
     - composer require --dev symfony/process:${SYMFONY_VERSION} --no-update --no-scripts --prefer-dist
     - composer require --dev symfony/yaml:${SYMFONY_VERSION} --no-update --no-scripts --prefer-dist
 
-    - composer update --prefer-dist
+    - composer update --prefer-dist --ignore-platform-req=php # ignore-platform-req=php is necessary temporarly because some deps aren't compatible with PHP8 yet
 
 script:
     - composer check

From 494affd2d93f4a63fe9778434d5027f5ac8dccf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= <dunglas@gmail.com>
Date: Mon, 2 Nov 2020 13:33:53 +0100
Subject: [PATCH 4/5] Try to fix the build

---
 .travis.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8983f57..e49f307 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,10 @@
 language: php
 
 php:
-    - '7.2'
-    - '7.3'
-    - '7.4'
-    - '8.0snapshot'
+  - '7.2'
+  - '7.3'
+  - '7.4'
+  - '8.0snapshot'
 
 env:
     - SYMFONY_VERSION=4.4.*
@@ -28,7 +28,8 @@ install:
     - composer require --dev symfony/process:${SYMFONY_VERSION} --no-update --no-scripts --prefer-dist
     - composer require --dev symfony/yaml:${SYMFONY_VERSION} --no-update --no-scripts --prefer-dist
 
-    - composer update --prefer-dist --ignore-platform-req=php # ignore-platform-req=php is necessary temporarly because some deps aren't compatible with PHP8 yet
+    # ignore-platform-req=php is necessary temporarily because PageObjectExtension isn't compatible with PHP8 yet: /~https://github.com/FriendsOfBehat/PageObjectExtension/pull/16
+    - if [[ ${TRAVIS_PHP_VERSION:0:3} == "8.0" ]]; then composer update --prefer-dist --ignore-platform-req=php; else composer update --prefer-dist; fi
 
 script:
     - composer check

From 9d7a615ebd3f44f4fcaa33522c46aa7ff64d2690 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= <dunglas@gmail.com>
Date: Mon, 2 Nov 2020 15:34:19 +0100
Subject: [PATCH 5/5] cleanup

---
 .travis.yml   | 2 +-
 composer.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e49f307..a5cf165 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ cache:
 
 before_install:
     - phpenv config-rm xdebug.ini || true
-    - composer self-update --2 # For Composer v2 for PHP 8 while it's not installed by default by Travis
+    - composer self-update --2 # Upgrade to Compose 2 (needed for PHP 8 support), only needed while it's not installed by default
 
 install:
     - composer require symfony/dependency-injection:${SYMFONY_VERSION} --no-update --no-scripts --prefer-dist
diff --git a/composer.json b/composer.json
index e34d6db..12bf568 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,7 @@
         }
     ],
     "require": {
-        "php": "^7.2 || ^8.0",
+        "php": "^7.2|^8.0",
         "behat/behat": "^3.6.1",
         "symfony/dependency-injection": "^4.4|^5.0",
         "symfony/http-kernel": "^4.4|^5.0",