[WIP] Symfony5 対応

.github/workflows/e2e-test.yml

@@ -20,7 +20,7 @@ jobs:
       fail-fast: false
       matrix:
         operating-system: [ ubuntu-18.04 ]
-        php: [ 7.3 ]
+        php: [ 7.3, 8.0 ]
         db: [ pgsql ]
         group: [ admin01, admin02, admin03, front, installer ]
         include:

.github/workflows/plugin-test.yml

@@ -20,7 +20,7 @@ jobs:
       fail-fast: false
       matrix:
         operating-system: [ ubuntu-18.04 ]
-        php: [ 7.3 ]
+        php: [ 7.3, 8.0 ]
         db: [ pgsql, mysql ]
         method:
           - test_install_enable_disable_remove_store

.github/workflows/unit-test.yml

@@ -20,7 +20,7 @@ jobs:
       fail-fast: false
       matrix:
         operating-system: [ ubuntu-18.04 ]
-        php: [ 7.1, 7.2, 7.3, 7.4 ]
+        php: [ 7.3, 7.4, 8.0 ]
         db: [ mysql, pgsql, sqlite3 ]
         include:
           - db: mysql

.gitignore

@@ -54,7 +54,3 @@ composer.phar
 .php_cs
 .php_cs.cache
 ###< friendsofphp/php-cs-fixer ###
-
-###> symfony/web-server-bundle ###
-.web-server-pid
-###< symfony/web-server-bundle ###

app/config/eccube/bundles.php

@@ -1,20 +1,8 @@
 <?php
 
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
- *
- * http://www.ec-cube.co.jp/
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
 return [
     Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true],
     Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true],
-    Doctrine\Bundle\DoctrineCacheBundle\DoctrineCacheBundle::class => ['all' => true],
     Doctrine\Bundle\DoctrineBundle\DoctrineBundle::class => ['all' => true],
     Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle::class => ['all' => true],
     Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['all' => true],
@@ -23,10 +11,9 @@
     Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle::class => ['all' => true],
     Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true],
     Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true, 'test' => true, 'install' => true],
-    Symfony\Bundle\WebServerBundle\WebServerBundle::class => ['dev' => true, 'install' => true],
     Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true, 'install' => true],
-    DAMA\DoctrineTestBundle\DAMADoctrineTestBundle::class => ['test' => true],
     Symfony\Bundle\MakerBundle\MakerBundle::class => ['dev' => true],
-    SunCat\MobileDetectBundle\MobileDetectBundle::class => ['all' => true],
     Knp\Bundle\PaginatorBundle\KnpPaginatorBundle::class => ['all' => true],
+    DAMA\DoctrineTestBundle\DAMADoctrineTestBundle::class => ['test' => true],
+    SunCat\MobileDetectBundle\MobileDetectBundle::class => ['all' => true],
 ];

app/config/eccube/packages/dev/doctrine.yaml

@@ -2,4 +2,4 @@
 # https://symfony.com/doc/master/bundles/DoctrineBundle/configuration.html
 doctrine:
     orm:
-        result_cache_driver: array
+        result_cache_driver: ~

app/config/eccube/packages/doctrine_migrations.yaml

@@ -1,4 +1,4 @@
 doctrine_migrations:
     dir_name: "%kernel.project_dir%/app/DoctrineMigrations"
-    namespace: DoctrineMigrations
-    organize_migrations: false
+#     namespace: DoctrineMigrations
+#     organize_migrations: false

app/config/eccube/packages/eccube.yaml

@@ -3,13 +3,13 @@ parameters:
     env(ECCUBE_ADMIN_ROUTE): 'admin'
     env(ECCUBE_USER_DATA_ROUTE): 'user_data'
     env(ECCUBE_ADMIN_ALLOW_HOSTS): '[]'
-    env(ECCUBE_FORCE_SSL): false
+    env(ECCUBE_FORCE_SSL): null
     env(ECCUBE_TEMPLATE_CODE): 'default'
     env(ECCUBE_AUTH_MAGIC): '<change.me>'
     env(ECCUBE_COOKIE_NAME): 'eccube'
     env(ECCUBE_COOKIE_PATH): '/'
-    env(ECCUBE_COOKIE_LIFETIME): 0
-    env(ECCUBE_GC_MAXLIFETIME): 1440
+    env(ECCUBE_COOKIE_LIFETIME): '0'
+    env(ECCUBE_GC_MAXLIFETIME): '1440'
     env(ECCUBE_PACKAGE_API_URL): 'https://package-api-41beta.ec-cube.net'
     env(ECCUBE_OWNERS_STORE_URL): 'https://www.ec-cube.net'
     env(ECCUBE_MAINTENANCE_FILE_PATH): '%kernel.project_dir%/.maintenance'
@@ -24,8 +24,8 @@ parameters:
     eccube.theme: '%env(ECCUBE_TEMPLATE_CODE)%'
     eccube_theme_code: '%eccube.theme%'
     eccube_auth_magic: '%env(ECCUBE_AUTH_MAGIC)%'
-    eccube_auth_type: HMAC
-    eccube_password_hash_algos: SHA256
+    eccube_auth_type: 'HMAC'
+    eccube_password_hash_algos: 'SHA256'
     eccube_theme_app_dir: '%kernel.project_dir%/app/template'
     eccube_theme_src_dir: '%kernel.project_dir%/src/Eccube/Resource/template'
     eccube_theme_user_data_dir: '%eccube_theme_app_dir%/user_data'

app/config/eccube/packages/framework.yaml

@@ -14,6 +14,7 @@ framework:
         cookie_lifetime: '%env(ECCUBE_COOKIE_LIFETIME)%'
         gc_maxlifetime: '%env(ECCUBE_GC_MAXLIFETIME)%'
         cookie_httponly: true
+        cookie_secure: "auto"
 
     # When using the HTTP Cache, ESI allows to render page fragments separately
     # and with different cache configurations for each fragment
@@ -49,4 +50,4 @@ framework:
     # See https://symfony.com/doc/current/reference/configuration/framework.html#ide
     ide: ~
     validation: { enable_annotations: true }
-    templating: { engines: ['twig'] }
+    # templating: { engines: ['twig'] }

app/config/eccube/packages/mobile_detect.yaml

@@ -0,0 +1,12 @@
+# Read the documentation: https://github.com/suncat2000/MobileDetectBundle/blob/v1.0.5/Resources/doc/index.md
+mobile_detect:
+#    redirect:
+#        full:
+#            is_enabled: true
+#            host: http://site.com
+#            action: redirect
+#        mobile:
+#            is_enabled: true
+#            host: http://m.site.com
+#            action: redirect
+#        detect_tablet_as_mobile: true

app/config/eccube/packages/order_state_machine.php

@@ -19,13 +19,13 @@
         'order' => [
             'type' => 'state_machine',
             'marking_store' => [
-                'type' => 'single_state',
-                'arguments' => 'status',
+                'type' => 'method',
+                'property' => 'status',
             ],
             'supports' => [
                 OrderStateMachineContext::class,
             ],
-            'initial_place' => (string) Status::NEW,
+            'initial_marking' => (string) Status::NEW,
             'places' => [
                 (string) Status::NEW,
                 (string) Status::CANCEL,

app/config/eccube/packages/test/dama_doctrine_test_bundle.yaml

@@ -0,0 +1,4 @@
+dama_doctrine_test:
+    enable_static_connection: true
+    enable_static_meta_data_cache: true
+    enable_static_query_cache: true

app/config/eccube/packages/test/doctrine.yaml

@@ -2,4 +2,4 @@
 # https://symfony.com/doc/master/bundles/DoctrineBundle/configuration.html
 doctrine:
     orm:
-        result_cache_driver: array
+        result_cache_driver: ~

app/config/eccube/routes.yaml

@@ -1,8 +1,8 @@
 controllers:
-    resource: ../../src/Eccube/Controller/
+    resource: ../../../src/Eccube/Controller/
     type: annotation
 customize_controllers:
-    resource: ../../app/Customize/Controller/
+    resource: ../../../app/Customize/Controller/
     type: annotation
 
 #    prefix: /{_locale}

app/config/eccube/routes/dev/twig.yaml

@@ -1,3 +1,3 @@
 _errors:
-    resource: '@TwigBundle/Resources/config/routing/errors.xml'
-    prefix:   /_error
+    resource: '@FrameworkBundle/Resources/config/routing/errors.xml'
+    prefix: /_error

app/config/eccube/routes/install/twig.yaml

@@ -1,3 +1,3 @@
 _errors:
-    resource: '@TwigBundle/Resources/config/routing/errors.xml'
-    prefix:   /_error
+    resource: '@FrameworkBundle/Resources/config/routing/errors.xml'
+    prefix: /_error

app/config/eccube/services.yaml

@@ -179,7 +179,9 @@ services:
 
     Symfony\Component\HttpFoundation\ParameterBag:
 
+    # APP_ENV=prod時にtwigテンプレート内のroutingでシステムエラーになるのを抑止.
     Eccube\Twig\Extension\IgnoreRoutingNotFoundExtension:
+        decorates: 'twig.extension.routing'
         # Symfony\Bridge\Twig\Extension\RoutingExtensionの後に登録するため,
         # autoconfigureはfalseにし, CompilerPassで追加する.
         autoconfigure: false

bin/phpunit

@@ -9,7 +9,7 @@ if (false === getenv('SYMFONY_PHPUNIT_REMOVE')) {
     putenv('SYMFONY_PHPUNIT_REMOVE=symfony/yaml');
 }
 if (false === getenv('SYMFONY_PHPUNIT_VERSION')) {
-    putenv('SYMFONY_PHPUNIT_VERSION=6.5');
+    putenv('SYMFONY_PHPUNIT_VERSION=8.5');
 }
 if (false === getenv('SYMFONY_PHPUNIT_DIR')) {
     putenv('SYMFONY_PHPUNIT_DIR='.__DIR__.'/.phpunit');

composer.json

@@ -4,43 +4,41 @@
     "type": "project",
     "homepage": "https://www.ec-cube.net/",
     "license": [
-       "GPL-2.0-only",
-       "proprietary"
+        "GPL-2.0-only",
+        "proprietary"
     ],
     "support": {
         "issues": "https://github.com/EC-CUBE/ec-cube/issues"
     },
     "minimum-stability": "stable",
     "require": {
-        "php": "^7.1.3",
+        "php": "^7.3",
         "ext-intl": "*",
         "ext-mbstring": "*",
         "composer/ca-bundle": "^1.1",
         "composer/composer": "^2.0",
         "doctrine/annotations": "^1.6",
         "doctrine/cache": "^1.7",
         "doctrine/collections": "^1.5",
-        "doctrine/common": "^2.9",
+        "doctrine/common": "^3.0",
         "doctrine/data-fixtures": "^1.3",
-        "doctrine/dbal": "^2.9",
-        "doctrine/doctrine-bundle": "^1.9",
-        "doctrine/doctrine-cache-bundle": "^1.3",
+        "doctrine/dbal": "^2.12",
+        "doctrine/doctrine-bundle": "^2.2",
         "doctrine/doctrine-fixtures-bundle": "^3.0",
-        "doctrine/doctrine-migrations-bundle": "^1.3",
+        "doctrine/doctrine-migrations-bundle": "^2.2",
         "doctrine/inflector": "^1.3",
         "doctrine/instantiator": "^1.1",
         "doctrine/lexer": "^1.0",
-        "doctrine/migrations": "^1.8",
-        "doctrine/orm": "^2.6",
+        "doctrine/migrations": "^2.2",
+        "doctrine/orm": "^2.8",
         "easycorp/easy-log-handler": "^1.0",
         "ec-cube/plugin-installer": "^2.0@dev",
         "egulias/email-validator": "^2.1",
         "friendsofphp/php-cs-fixer": "^2.16",
         "guzzlehttp/guzzle": "^6.3",
-        "knplabs/knp-paginator-bundle": "^2.7",
+        "knplabs/knp-paginator-bundle": "^5.2",
         "mobiledetect/mobiledetectlib": "^2.8",
         "monolog/monolog": "^1.23",
-        "nesbot/carbon": "^1.22",
         "pimple/pimple": "^1.1",
         "psr/cache": "^1.0",
         "psr/container": "^1.0",
@@ -51,55 +49,51 @@
         "setasign/fpdi": "^2.2",
         "setasign/fpdi-tcpdf": "^2.2",
         "skorp/detect-incompatible-samesite-useragents": "^1.0",
-        "suncat/mobile-detect-bundle": "^1.1",
+        "suncat/mobile-detect-bundle": "dev-master",
         "swiftmailer/swiftmailer": "^6.1",
-        "symfony/asset": "^4.4",
-        "symfony/cache": "^4.4",
-        "symfony/config": "^4.4",
-        "symfony/console": "^4.4",
-        "symfony/css-selector": "^4.4",
-        "symfony/debug": "^4.4",
-        "symfony/debug-bundle": "^4.4",
-        "symfony/debug-pack": "^1.0",
-        "symfony/dependency-injection": "^4.4",
-        "symfony/doctrine-bridge": "^4.4",
-        "symfony/dom-crawler": "^4.4",
-        "symfony/dotenv": "^4.4",
-        "symfony/event-dispatcher": "^4.4",
-        "symfony/expression-language": "^4.4",
-        "symfony/filesystem": "^4.4",
-        "symfony/finder": "^4.4",
+        "symfony/asset": "^5.0",
+        "symfony/cache": "^5.0",
+        "symfony/config": "^5.0",
+        "symfony/console": "^5.0",
+        "symfony/css-selector": "^5.0",
+        "symfony/debug-bundle": "^5.0",
+        "symfony/dependency-injection": "^5.0",
+        "symfony/doctrine-bridge": "^5.0",
+        "symfony/dom-crawler": "^5.0",
+        "symfony/dotenv": "^5.0",
+        "symfony/event-dispatcher": "^5.0",
+        "symfony/expression-language": "^5.0",
+        "symfony/filesystem": "^5.0",
+        "symfony/finder": "^5.0",
         "symfony/flex": "^1.0",
-        "symfony/form": "^4.4",
-        "symfony/framework-bundle": "^4.4",
-        "symfony/http-foundation": "^4.4",
-        "symfony/http-kernel": "^4.4",
-        "symfony/inflector": "^4.4",
-        "symfony/intl": "^4.4",
+        "symfony/form": "^5.0",
+        "symfony/framework-bundle": "^5.0",
+        "symfony/http-foundation": "^5.0",
+        "symfony/http-kernel": "^5.0",
+        "symfony/inflector": "^5.0",
+        "symfony/intl": "^5.0",
         "symfony/maker-bundle": "^1.0",
-        "symfony/monolog-bridge": "^4.4",
+        "symfony/monolog-bridge": "^5.0",
         "symfony/monolog-bundle": "^3.1",
-        "symfony/options-resolver": "^4.4",
+        "symfony/options-resolver": "^5.0",
         "symfony/orm-pack": "^1.0",
-        "symfony/process": "^4.4",
-        "symfony/property-access": "^4.4",
-        "symfony/proxy-manager-bridge": "^4.4",
-        "symfony/routing": "^4.4",
-        "symfony/security": "^4.4",
-        "symfony/security-bundle": "^4.4",
-        "symfony/serializer": "^4.4",
-        "symfony/stopwatch": "^4.4",
+        "symfony/process": "^5.0",
+        "symfony/property-access": "^5.0",
+        "symfony/proxy-manager-bridge": "^5.0",
+        "symfony/routing": "^5.0",
+        "symfony/security-bundle": "^5.0",
+        "symfony/serializer": "^5.0",
+        "symfony/stopwatch": "^5.0",
         "symfony/swiftmailer-bundle": "^3.1",
-        "symfony/templating": "^4.4",
-        "symfony/translation": "^4.4",
-        "symfony/twig-bridge": "^4.4",
-        "symfony/twig-bundle": "^4.4",
-        "symfony/validator": "^4.4",
-        "symfony/var-dumper": "^4.4",
-        "symfony/web-profiler-bundle": "^4.4",
-        "symfony/web-server-bundle": "^4.4",
-        "symfony/workflow": "^4.4",
-        "symfony/yaml": "^4.4",
+        "symfony/templating": "^5.0",
+        "symfony/translation": "^5.0",
+        "symfony/twig-bridge": "^5.0",
+        "symfony/twig-bundle": "^5.0",
+        "symfony/validator": "^5.0",
+        "symfony/var-dumper": "^5.0",
+        "symfony/web-profiler-bundle": "^5.0",
+        "symfony/workflow": "^5.0",
+        "symfony/yaml": "^5.0",
         "tecnickcom/tcpdf": "^6.2",
         "twig/extensions": "^1.5",
         "twig/twig": "^2.4",
@@ -108,14 +102,14 @@
     "require-dev": {
         "bheller/images-generator": "^1.0",
         "captbaritone/mailcatcher-codeception-module": "^1.2",
-        "codeception/codeception": "~2.4.5",
-        "dama/doctrine-test-bundle": "^5.0",
+        "codeception/codeception": "^4.1",
+        "dama/doctrine-test-bundle": "dev-master",
         "fzaninotto/faker": "^1.7",
-        "mikey179/vfsstream": "^1.6",
+        "mikey179/vfsstream": "2.0.x-dev",
         "php-coveralls/php-coveralls": "^2.1",
-        "phpunit/phpunit": "^6.5",
-        "symfony/browser-kit": "^4.4",
-        "symfony/phpunit-bridge": "^4.4"
+        "phpunit/phpunit": "^8.5",
+        "symfony/browser-kit": "^5.0",
+        "symfony/phpunit-bridge": "^5.0"
     },
     "autoload": {
         "files": [
@@ -175,7 +169,7 @@
     "extra": {
         "symfony": {
             "id": "01C0Q71D54BCVSB8ZWR3VECDRD",
-            "allow-contrib": false
+            "allow-contrib": true
         },
         "symfony-web-dir": ".",
         "bin-dir": "bin",
@@ -185,7 +179,7 @@
     },
     "config": {
         "platform": {
-            "php": "7.1.3"
+            "php": "7.3.0"
         },
         "preferred-install": {
             "*": "dist"