Merge pull request #23 from Daric971/feature_php8

Allow PHP 8
ekino · Aug 13, 2021 · 1290ad6 · 1290ad6
2 parents e842c4c + e6d6b9f
commit 1290ad6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/gitlab-actions.yml b/.github/workflows/gitlab-actions.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: [ '7.2', '7.3', '7.4' ]
+        php: [ '7.2', '7.3', '7.4', '8.0' ]
     steps:
       - uses: actions/checkout@v2
       - name: Setup PHP with tools

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ master
 * Switch to the new security checker
 * Migrate from Travis to GitHub Actions
 * Fix deprecated PHP-CS rules
+* Allow PHP 8.0
 
 v0.2.0
 ------

diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
         }
     ],
     "require": {
-        "php":                                      "^7.2",
+        "php":                                      "^7.2 || ^8.0",
         "phpstan/phpstan":                          "^0.12",
         "sonata-project/datagrid-bundle":           "^3.0",
         "sonata-project/doctrine-orm-admin-bundle": "^3.6"