From d84bfdb084e5ade174c697aea4ddb5f6d6c5ff63 Mon Sep 17 00:00:00 2001
From: Toon Verwerft <toonverwerft@gmail.com>
Date: Fri, 27 Nov 2020 11:06:10 +0100
Subject: [PATCH] Add PHP80 compatibility

---
 .github/ISSUE_TEMPLATE/Bug.md                 | 34 ++++++++++++
 .github/ISSUE_TEMPLATE/Feature_Request.md     | 18 +++++++
 .github/ISSUE_TEMPLATE/Support_Question.md    | 15 ++++++
 .github/PULL_REQUEST_TEMPLATE.md              | 11 ++++
 .github/workflows/grumphp.yaml                | 53 +++++++++++++++++++
 .travis.yml                                   | 33 ------------
 composer.json                                 | 11 ++--
 grumphp.yml.dist                              | 12 ++---
 .../JsonApiProblemExceptionListenerTest.php   |  3 ++
 .../Exception/ApiProblemHttpExceptionTest.php |  3 ++
 .../ApiProblemExceptionTransformerTest.php    |  3 ++
 test/Transformer/ChainTest.php                |  3 ++
 12 files changed, 152 insertions(+), 47 deletions(-)
 create mode 100644 .github/ISSUE_TEMPLATE/Bug.md
 create mode 100644 .github/ISSUE_TEMPLATE/Feature_Request.md
 create mode 100644 .github/ISSUE_TEMPLATE/Support_Question.md
 create mode 100644 .github/PULL_REQUEST_TEMPLATE.md
 create mode 100644 .github/workflows/grumphp.yaml
 delete mode 100644 .travis.yml

diff --git a/.github/ISSUE_TEMPLATE/Bug.md b/.github/ISSUE_TEMPLATE/Bug.md
new file mode 100644
index 0000000..2e7d29c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Bug.md
@@ -0,0 +1,34 @@
+---
+name: 🐞 Bug Report
+about: Something is broken? 🔨
+---
+
+### Bug Report
+
+<!-- Fill in the relevant information below to help triage your issue. -->
+
+|    Q        |   A
+|------------ | ------
+| BC Break    | yes/no
+| Version     | x.y.z
+
+#### Summary
+
+<!-- Provide a summary describing the problem you are experiencing. -->
+
+#### Current behaviour
+
+<!-- What is the current (buggy) behaviour? -->
+
+#### How to reproduce
+
+<!--
+Provide steps to reproduce the bug.
+If possible, also add a code snippet with relevant configuration, driver/platform information, SQL queries, etc.
+Adding a failing Unit or Functional Test would help us a lot - you can submit one in a Pull Request separately, referencing this bug report.
+-->
+
+#### Expected behaviour
+
+<!-- What was the expected (correct) behaviour? -->
+
diff --git a/.github/ISSUE_TEMPLATE/Feature_Request.md b/.github/ISSUE_TEMPLATE/Feature_Request.md
new file mode 100644
index 0000000..2620581
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Feature_Request.md
@@ -0,0 +1,18 @@
+---
+name: 🎉 Feature Request
+about: You have a neat idea that should be implemented? 🎩
+---
+
+### Feature Request
+
+<!-- Fill in the relevant information below to help triage your issue. -->
+
+|    Q        |   A
+|------------ | ------
+| New Feature | yes
+| RFC         | yes/no
+| BC Break    | yes/no
+
+#### Summary
+
+<!-- Provide a summary of the feature you would like to see implemented. -->
diff --git a/.github/ISSUE_TEMPLATE/Support_Question.md b/.github/ISSUE_TEMPLATE/Support_Question.md
new file mode 100644
index 0000000..813fb01
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Support_Question.md
@@ -0,0 +1,15 @@
+---
+name: ❓ Support Question
+about: Have a problem that you can't figure out? 🤔
+---
+
+<!-- Fill in the relevant information below to help triage your issue. -->
+
+|    Q        |   A
+|------------ | -----
+| Version     | x.y.z
+
+
+### Support Question
+
+<!-- Describe the issue you are facing here. -->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000..d88b155
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,11 @@
+<!-- Fill in the relevant information below to help triage your pull request. -->
+
+|      Q       |   A
+|------------- | -----------
+| Type         | bug/feature/improvement
+| BC Break     | yes/no
+| Fixed issues | <!-- use #NUM format to reference an issue -->
+
+#### Summary
+
+<!-- Provide a summary of your change. -->
diff --git a/.github/workflows/grumphp.yaml b/.github/workflows/grumphp.yaml
new file mode 100644
index 0000000..b99ffd2
--- /dev/null
+++ b/.github/workflows/grumphp.yaml
@@ -0,0 +1,53 @@
+name: GrumPHP
+
+on: [push, pull_request]
+jobs:
+    run:
+        runs-on: ${{ matrix.operating-system }}
+        strategy:
+            matrix:
+                operating-system: [ubuntu-latest]
+                php-versions: ['7.3', '7.4', '8.0']
+                composer-options: ['', '--prefer-lowest']
+            fail-fast: false
+        name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }} with ${{ matrix.composer-options }}
+        steps:
+            - name: Checkout
+              uses: actions/checkout@master
+            - name: Install PHP
+              uses: shivammathur/setup-php@master
+              with:
+                  php-version: ${{ matrix.php-versions }}
+                  tools: 'composer:v2'
+                  extensions: pcov, mbstring, posix
+            - name: Check Versions
+              run: |
+                  php -v
+                  php -m
+                  composer --version
+            - name: Get composer cache directory
+              id: composercache
+              run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+            - name: Cache dependencies
+              uses: actions/cache@v2
+              with:
+                  path: ${{ steps.composercache.outputs.dir }}
+                  key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
+                  restore-keys: ${{ runner.os }}-composer-
+            - name: Install dependencies <PHP8
+              if: matrix.php-versions != '8.0'
+              run: composer update --prefer-dist --no-progress --no-suggest ${{ matrix.composer-options }}
+            #
+            # Currently php-cs-fixer is nog PHP 8 compatible yet!
+            #
+            - name: Install dependencies PHP8
+              if: matrix.php-versions == '8.0'
+              run: composer update --prefer-dist --no-progress --no-suggest ${{ matrix.composer-options }} --ignore-platform-reqs
+            - name: Set git variables
+              run: |
+                  git config --global user.email "you@example.com"
+                  git config --global user.name "Your Name"
+            - name: Run the tests
+              run: php vendor/bin/grumphp run --no-interaction
+              env:
+                  PHP_CS_FIXER_IGNORE_ENV: ${{ matrix.php-versions == '8.0'}}
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index ed4a3be..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-language: php
-
-cache:
-    directories:
-        - $HOME/.composer/cache
-
-php:
-    - 7.2
-    - 7.3
-    - 7.4
-
-matrix:
-    fast_finish: true
-    include:
-        - php: 7.2
-          env: SYMFONY_VERSION=4.4.*
-        - php: 7.3
-          env: SYMFONY_VERSION=4.4.*
-        - php: 7.4
-          env: SYMFONY_VERSION=4.4.*
-        - php: 7.2
-          env: SYMFONY_VERSION=5.0.*
-        - php: 7.3
-          env: SYMFONY_VERSION=5.0.*
-        - php: 7.4
-          env: SYMFONY_VERSION=5.0.*
-
-before_script:
-    - if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update; fi;
-    - travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-source
-
-script:
-    - ./vendor/bin/grumphp run
diff --git a/composer.json b/composer.json
index eea806a..47097af 100644
--- a/composer.json
+++ b/composer.json
@@ -10,17 +10,18 @@
         }
     ],
     "require": {
-        "php": "^7.2",
+        "php": "^7.3 || ^8.0",
         "phpro/api-problem": "^1.0",
         "symfony/dependency-injection": "^4.4|^5.0",
         "symfony/event-dispatcher": "^4.4|^5.0",
         "symfony/http-kernel": "^4.4|^5.0"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^2.12",
-        "matthiasnoback/symfony-dependency-injection-test": "^3.0|^4.0",
-        "phpro/grumphp": "^0.17.2",
-        "phpunit/phpunit": "^8.5",
+        "friendsofphp/php-cs-fixer": "^2.16.7",
+        "matthiasnoback/symfony-dependency-injection-test": "^4.2",
+        "phpro/grumphp-shim": "^1.2.0",
+        "phpspec/prophecy-phpunit": "^2.0",
+        "phpunit/phpunit": "^9.4",
         "symfony/security-core": "^4.4|^5.0"
     },
     "config": {
diff --git a/grumphp.yml.dist b/grumphp.yml.dist
index af3825b..26e8f1a 100644
--- a/grumphp.yml.dist
+++ b/grumphp.yml.dist
@@ -1,20 +1,14 @@
-parameters:
-    git_dir: .
-    bin_dir: vendor/bin
+grumphp:
     tasks:
       phpcsfixer2:
         config: ".php_cs.dist"
         config_contains_finder: true
-        metadata:
-          priority: 10000
-      phpunit:
-        metadata:
-          priority: 9000
+      phpunit: ~
       clover_coverage:
         clover_file: var/coverage.xml
         level: 100
         metadata:
-          priority: 8000
+          priority: -1
       composer:
         no_check_lock: true
       xmllint:
diff --git a/test/EventListener/JsonApiProblemExceptionListenerTest.php b/test/EventListener/JsonApiProblemExceptionListenerTest.php
index 37c810e..3c68ef0 100644
--- a/test/EventListener/JsonApiProblemExceptionListenerTest.php
+++ b/test/EventListener/JsonApiProblemExceptionListenerTest.php
@@ -11,6 +11,7 @@
 use Phpro\ApiProblemBundle\Transformer\ExceptionTransformerInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
@@ -20,6 +21,8 @@
 /** @covers \Phpro\ApiProblemBundle\EventListener\JsonApiProblemExceptionListener */
 class JsonApiProblemExceptionListenerTest extends TestCase
 {
+    use ProphecyTrait;
+
     /**
      * @var ObjectProphecy|Request
      */
diff --git a/test/Exception/ApiProblemHttpExceptionTest.php b/test/Exception/ApiProblemHttpExceptionTest.php
index 6a9b769..c6ed8fa 100644
--- a/test/Exception/ApiProblemHttpExceptionTest.php
+++ b/test/Exception/ApiProblemHttpExceptionTest.php
@@ -8,11 +8,14 @@
 use Phpro\ApiProblemBundle\Exception\ApiProblemHttpException;
 use Phpro\ApiProblemBundle\Transformer\ApiProblemExceptionTransformer;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 
 class ApiProblemHttpExceptionTest extends TestCase
 {
+    use ProphecyTrait;
+
     /**
      * @var HttpApiProblem|ObjectProphecy
      */
diff --git a/test/Transformer/ApiProblemExceptionTransformerTest.php b/test/Transformer/ApiProblemExceptionTransformerTest.php
index 0629e04..06afad3 100644
--- a/test/Transformer/ApiProblemExceptionTransformerTest.php
+++ b/test/Transformer/ApiProblemExceptionTransformerTest.php
@@ -9,6 +9,7 @@
 use Phpro\ApiProblemBundle\Transformer\ApiProblemExceptionTransformer;
 use Phpro\ApiProblemBundle\Transformer\ExceptionTransformerInterface;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 
 /**
@@ -16,6 +17,8 @@
  */
 class ApiProblemExceptionTransformerTest extends TestCase
 {
+    use ProphecyTrait;
+
     /**
      * @var ApiProblemInterface|ObjectProphecy
      */
diff --git a/test/Transformer/ChainTest.php b/test/Transformer/ChainTest.php
index 6abccbd..aac43fc 100644
--- a/test/Transformer/ChainTest.php
+++ b/test/Transformer/ChainTest.php
@@ -10,6 +10,7 @@
 use Phpro\ApiProblemBundle\Transformer\ExceptionTransformerInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 
 /**
@@ -17,6 +18,8 @@
  */
 class ChainTest extends TestCase
 {
+    use ProphecyTrait;
+
     /** @test */
     public function it_is_an_exception_transformer(): void
     {