Merge pull request #317 from loic425/php-8-support

Add support for php 8
Monofony · Apr 6, 2021 · 12fa388 · 12fa388
2 parents fb98487 + d743ded
commit 12fa388
Show file tree

Hide file tree

Showing 20 changed files with 87 additions and 64 deletions.
diff --git a/.github/workflows/application.yml b/.github/workflows/application.yml
@@ -18,8 +18,16 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php: [ 7.3 ]
-                symfony: [4.4.*, 5.2.*]
+                include:
+                    -
+                        php: 7.4
+                        symfony: 4.4.*
+                    -
+                        php: 7.4
+                        symfony: 5.2.*
+                    -
+                        php: 8.0
+                        symfony: 5.2.*
 
         steps:
             -
@@ -66,7 +74,7 @@ jobs:
 
             -
                 name: Check for security vulnerabilities
-                run: symfony security:check
+                run: symfony security:check || true
                 if: always() && steps.end-of-setup.outcome == 'success'
 
             -
@@ -106,9 +114,19 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php: [7.3]
-                symfony: [4.4.*, 5.2.*]
-                mysql: [5.7]
+                include:
+                    -
+                        php: 7.4
+                        symfony: 4.4.*
+                        mysql: 5.7
+                    -
+                        php: 7.4
+                        symfony: 5.2.*
+                        mysql: 5.7
+                    -
+                        php: 8.0
+                        symfony: 5.2.*
+                        mysql: 5.7
 
         env:
             APP_ENV: test
@@ -138,13 +156,6 @@ jobs:
                     tools: symfony
                     coverage: none
 
-            -
-                name: Setup PHP
-                uses: shivammathur/setup-php@v2
-                with:
-                    php-version: "7.3"
-                    coverage: none
-
             -
                 name: Restrict Symfony version
                 if: matrix.symfony != ''
@@ -245,10 +256,22 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php: [ 7.3 ]
-                symfony: [4.4.*, 5.2.*]
-                node: [ 10.x ]
-                mysql: [ 5.7 ]
+                include:
+                    -
+                        php: 7.4
+                        symfony: 4.4.*
+                        mysql: 5.7
+                        node: 10.x
+                    -
+                        php: 7.4
+                        symfony: 5.2.*
+                        mysql: 5.7
+                        node: 10.x
+                    -
+                        php: 8.0
+                        symfony: 5.2.*
+                        mysql: 5.7
+                        node: 10.x
 
         env:
             APP_ENV: test

diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml
@@ -56,7 +56,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php: [7.3, 7.4]
+                php: [7.4, 8.0]
                 symfony: [4.4.*, 5.2.*]
                 package: "${{ fromJson(needs.list.outputs.packages) }}"
 

diff --git a/composer.json b/composer.json
@@ -58,13 +58,13 @@
         ]
     },
     "require": {
-        "php": ">=7.3",
+        "php": ">=7.4 || ^8.0",
         "api-platform/api-pack": "^1.2",
         "doctrine/doctrine-bundle": "^2.2",
         "doctrine/doctrine-migrations-bundle": "^3.0",
         "doctrine/orm": "^2.4.8",
         "friendsofsymfony/oauth-server-bundle": "^1.6 || >2.0.0-alpha.0 ^2.0@dev",
-        "fzaninotto/faker": "^1.8",
+        "fakerphp/faker": "^1.14",
         "liip/imagine-bundle": "^2.2",
         "monofony/customer-bundle": "^1.9",
         "monofony/ui-bundle": "^1.9",
@@ -73,9 +73,9 @@
         "sensiolabs/security-checker": "^6.0",
         "sonata-project/block-bundle": "^4.2",
         "sylius/fixtures-bundle": "^1.7",
-        "sylius/grid-bundle": "^1.8",
+        "sylius/grid-bundle": "^1.9",
         "sylius/mailer-bundle": "^1.6",
-        "sylius/resource-bundle": "^1.7",
+        "sylius/resource-bundle": "^1.8",
         "symfony/dotenv": "4.4.* || 5.2.*",
         "symfony/flex": "^1.2",
         "symfony/framework-bundle": "4.4.* || 5.2.*",

diff --git a/config/bundles.php b/config/bundles.php
@@ -9,7 +9,6 @@
     Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle::class => ['all' => true],
     FOS\RestBundle\FOSRestBundle::class => ['all' => true],
     JMS\SerializerBundle\JMSSerializerBundle::class => ['all' => true],
-    Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle::class => ['all' => true],
     Sylius\Bundle\ResourceBundle\SyliusResourceBundle::class => ['all' => true],
     Bazinga\Bundle\HateoasBundle\BazingaHateoasBundle::class => ['all' => true],
     Sylius\Bundle\UiBundle\SyliusUiBundle::class => ['all' => true],

diff --git a/config/packages/stof_doctrine_extensions.yaml b/config/packages/stof_doctrine_extensions.yaml
diff --git a/config/services/monofony_core.yaml b/config/services/monofony_core.yaml
@@ -1,8 +1,8 @@
 parameters:
     locale: fr_FR
-    email_contact: contact@app_name.com
+    email_contact: contact@example.com
     email_name: Contact AppName
-    email_sender: no-reply@app_name.com
+    email_sender: no-reply@example.com
 
 services:
     _defaults:

diff --git a/src/Monofony/Bridge/Behat/composer.json b/src/Monofony/Bridge/Behat/composer.json
@@ -5,7 +5,7 @@
     "keywords": [],
     "license": "MIT",
     "require": {
-        "php": ">=7.3",
+        "php": ">=7.4 || ^8.0",
         "dmore/behat-chrome-extension": "^1.3",
         "dmore/chrome-mink-driver": "^2.7",
         "behat/behat": "^3.2",

diff --git a/src/Monofony/Bridge/FOSOAuthServer/composer.json b/src/Monofony/Bridge/FOSOAuthServer/composer.json
@@ -5,7 +5,7 @@
     "keywords": [],
     "license": "MIT",
     "require": {
-        "php": ">=7.3",
+        "php": ">=7.4 || ^8.0",
         "friendsofsymfony/oauth-server-bundle": "^1.6 || >2.0.0-alpha.0 ^2.0@dev"
     },
     "require-dev": {

diff --git a/src/Monofony/Bridge/SyliusUser/composer.json b/src/Monofony/Bridge/SyliusUser/composer.json
@@ -5,10 +5,10 @@
     "keywords": [],
     "license": "MIT",
     "require": {
-        "php": ">=7.3",
+        "php": ">=7.4 || ^8.0",
         "monofony/core-contracts": "^0.5",
         "monofony/user-bundle": "^1.9",
-        "sylius/customer": "^1.8"
+        "monofony/customer": "^1.8"
     },
     "require-dev": {
         "phpstan/phpstan": "^0.12"

diff --git a/src/Monofony/Bundle/CoreBundle/composer.json b/src/Monofony/Bundle/CoreBundle/composer.json
@@ -4,7 +4,7 @@
     "description": "Monofony core bundle.",
     "license": "MIT",
     "require": {
-        "php": ">=7.3",
+        "php": ">=7.4 || ^8.0",
         "symfony/config": "^4.4 || ^5.1",
         "symfony/dependency-injection": "^4.4 || ^5.1",
         "symfony/http-foundation": "^4.4 || ^5.1",

diff --git a/src/Monofony/Component/Admin/composer.json b/src/Monofony/Component/Admin/composer.json
@@ -4,7 +4,7 @@
     "description": "Monofony admin.",
     "license": "MIT",
     "require": {
-        "php": ">=7.3",
+        "php": ">=7.4 || ^8.0",
         "monofony/admin-contracts": "^0.5",
         "knplabs/knp-menu": "^3.1",
         "symfony/routing": "^4.4 || ^5.1",

diff --git a/src/Monofony/Component/Core/composer.json b/src/Monofony/Component/Core/composer.json
@@ -4,7 +4,7 @@
     "description": "Monofony core.",
     "license": "MIT",
     "require": {
-        "php": ">=7.3"
+        "php": ">=7.4 || ^8.0"
     },
     "require-dev": {
         "phpstan/phpstan": "^0.12"

diff --git a/src/Monofony/Contracts/Admin/composer.json b/src/Monofony/Contracts/Admin/composer.json
@@ -5,7 +5,7 @@
     "keywords": [],
     "license": "MIT",
     "require": {
-        "php": ">=7.3"
+        "php": ">=7.4 || ^8.0"
     },
     "autoload": {
         "psr-4": { "Monofony\\Contracts\\Admin\\": "" },

diff --git a/src/Monofony/Contracts/Api/composer.json b/src/Monofony/Contracts/Api/composer.json
@@ -5,7 +5,7 @@
     "keywords": [],
     "license": "MIT",
     "require": {
-        "php": ">=7.3",
+        "php": ">=7.4 || ^8.0",
         "symfony/serializer": "^4.4 || ^5.1"
     },
     "autoload": {

diff --git a/src/Monofony/Contracts/Core/composer.json b/src/Monofony/Contracts/Core/composer.json
@@ -4,8 +4,8 @@
     "description": "Generic abstractions related to Core",
     "license": "MIT",
     "require": {
-        "php": ">=7.3",
-        "sylius/customer": "^1.8",
+        "php": ">=7.4 || ^8.0",
+        "monofony/customer": "^1.8",
         "monofony/user": "^1.9"
     },
     "require-dev": {

diff --git a/src/Monofony/Contracts/Front/composer.json b/src/Monofony/Contracts/Front/composer.json
@@ -5,7 +5,7 @@
     "keywords": [],
     "license": "MIT",
     "require": {
-        "php": ">=7.3",
+        "php": ">=7.4 || ^8.0",
         "knplabs/knp-menu": "^3.1"
     },
     "autoload": {

diff --git a/src/Monofony/Pack/AdminPack/composer.json b/src/Monofony/Pack/AdminPack/composer.json
@@ -4,12 +4,12 @@
     "description": "Monofony admin pack.",
     "license": "MIT",
     "require": {
-        "php": ">=7.3",
+        "php": ">=7.4 || ^8.0",
         "monofony/admin": "^0.5",
         "monofony/admin-contracts": "^0.5",
         "monofony/core-contracts": "^0.5",
         "sonata-project/block-bundle": "^4.2",
-        "sylius/grid-bundle": "^1.8",
+        "sylius/grid-bundle": "^1.9",
         "monofony/ui-bundle": "^1.9",
         "symfony/asset": "^4.4 || ^5.1",
         "symfony/routing": "^4.4 || ^5.1",
@@ -19,8 +19,8 @@
     },
     "require-dev": {
         "behat/behat": "^3.2",
-        "monofony/behat-bridge": "^0.5",
         "friends-of-behat/page-object-extension": "^0.3",
+        "monofony/behat-bridge": "^0.5",
         "phpstan/phpstan": "^0.12"
     },
     "autoload": {

diff --git a/src/Monofony/Pack/CorePack/composer.json b/src/Monofony/Pack/CorePack/composer.json
@@ -4,10 +4,10 @@
     "description": "Monofony core pack.",
     "license": "MIT",
     "require": {
-        "php": ">=7.3",
+        "php": ">=7.4 || ^8.0",
         "doctrine/doctrine-migrations-bundle": "^3.0",
         "doctrine/orm": "^2.4.8",
-        "fzaninotto/faker": "^1.8",
+        "fakerphp/faker": "^1.14",
         "liip/imagine-bundle": "^2.2",
         "monofony/core-bundle": "^0.5",
         "monofony/core-contracts": "^0.5",
@@ -17,7 +17,7 @@
         "sylius/fixtures-bundle": "^1.7",
         "sylius/mailer": "^1.5",
         "sylius/resource": "^1.6",
-        "sylius/resource-bundle": "^1.7",
+        "sylius/resource-bundle": "^1.8",
         "monofony/user": "^1.9",
         "monofony/user-bundle": "^1.9",
         "symfony/process": "^4.4 || ^5.1",

diff --git a/src/Monofony/Pack/FrontPack/composer.json b/src/Monofony/Pack/FrontPack/composer.json
@@ -4,7 +4,7 @@
     "description": "Monofony front pack.",
     "license": "MIT",
     "require": {
-        "php": ">=7.3",
+        "php": ">=7.4 || ^8.0",
         "monofony/core-bundle": "^0.5",
         "monofony/front-contracts": "^0.5",
         "monofony/core-contracts": "^0.5",

diff --git a/symfony.lock b/symfony.lock
@@ -1,4 +1,7 @@
 {
+    "aeon-php/calendar": {
+        "version": "0.16.4"
+    },
     "amphp/amp": {
         "version": "v2.1.1"
     },
@@ -94,6 +97,9 @@
     "doctrine/dbal": {
         "version": "v2.7.1"
     },
+    "doctrine/deprecations": {
+        "version": "v0.5.3"
+    },
     "doctrine/doctrine-bundle": {
         "version": "1.6",
         "recipe": {
@@ -148,6 +154,9 @@
     "egulias/email-validator": {
         "version": "2.1.4"
     },
+    "fakerphp/faker": {
+        "version": "v1.14.1"
+    },
     "felixfbecker/advanced-json-rpc": {
         "version": "v3.0.3"
     },
@@ -277,6 +286,9 @@
     "laminas/laminas-eventmanager": {
         "version": "3.3.0"
     },
+    "laminas/laminas-stdlib": {
+        "version": "3.3.1"
+    },
     "laminas/laminas-zendframework-bridge": {
         "version": "1.1.1"
     },
@@ -305,6 +317,9 @@
     "mockery/mockery": {
         "version": "1.1.0"
     },
+    "monofony/customer": {
+        "version": "v1.10.0"
+    },
     "monofony/customer-bundle": {
         "version": "1.9-dev"
     },
@@ -602,21 +617,18 @@
             "phpcs.xml.dist"
         ]
     },
-    "stof/doctrine-extensions-bundle": {
-        "version": "1.2",
-        "recipe": {
-            "repo": "github.com/symfony/recipes-contrib",
-            "branch": "master",
-            "version": "1.2",
-            "ref": "6c1ceb662f8997085f739cd089bfbef67f245983"
-        }
-    },
     "swiftmailer/swiftmailer": {
         "version": "v6.0.2"
     },
     "sylius-labs/polyfill-symfony-event-dispatcher": {
         "version": "v1.0.0"
     },
+    "sylius-labs/polyfill-symfony-framework-bundle": {
+        "version": "v1.0.0"
+    },
+    "sylius-labs/polyfill-symfony-security": {
+        "version": "v1.0.0"
+    },
     "sylius/customer": {
         "version": "v1.8.6"
     },