Merge pull request #4409 from nanasess/improve/symfony4.4

[WIP] Symfony4.4 対応

app/Plugin/FormExtension/Form/Extension/EntryTypeExtension.php

@@ -47,4 +47,13 @@ public function getExtendedType()
     {
         return EntryType::class;
     }
+
+    /**
+     * Return the class of the type being extended.
+     */
+    public static function getExtendedTypes(): iterable
+    {
+        // return FormType::class to modify (nearly) every field in the system
+        return [EntryType::class];
+    }
 }

app/config/eccube/services.yaml

@@ -180,3 +180,12 @@ services:
     Eccube\Session\Storage\Handler\SameSiteNoneCompatSessionHandler:
         arguments:
             - '@native_file_session_handler'
+
+    Eccube\DependencyInjection\Facade\AnnotationReaderFacade:
+        public: true
+
+    SunCat\MobileDetectBundle\DeviceDetector\MobileDetector:
+        tags:
+          - { name: mobile_detect.mobile_detector.default }
+          - { name: mobile_detect.mobile_detector }
+        public: true

app/config/eccube/services_test.yaml

@@ -42,3 +42,6 @@ services:
     Eccube\Service\PurchaseFlow\Processor\AddPointProcessor:
         autowire: true
         public: true
+    Eccube\Service\Composer\ComposerApiService:
+        autowire: true
+        public: true

composer.json

@@ -46,61 +46,59 @@
         "psr/http-message": "^1.0",
         "psr/log": "^1.0",
         "psr/simple-cache": "^1.0",
-        "sensio/framework-extra-bundle": "^5.1",
-        "sensio/generator-bundle": "^3.1",
+        "sensio/framework-extra-bundle": "^5.5",
         "setasign/fpdi": "^2.2",
         "setasign/fpdi-tcpdf": "^2.2",
         "skorp/detect-incompatible-samesite-useragents": "^1.0",
         "suncat/mobile-detect-bundle": "^1.1",
         "swiftmailer/swiftmailer": "^6.1",
-        "symfony/asset": "^3.4",
-        "symfony/cache": "^3.4",
-        "symfony/class-loader": "^3.4",
-        "symfony/config": "^3.4",
-        "symfony/console": "^3.4",
-        "symfony/css-selector": "^3.4",
-        "symfony/debug": "^3.4",
-        "symfony/debug-bundle": "^3.4",
+        "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": "^3.4",
-        "symfony/doctrine-bridge": "^3.4",
-        "symfony/dom-crawler": "^3.4",
-        "symfony/dotenv": "^3.4",
-        "symfony/event-dispatcher": "^3.4",
-        "symfony/expression-language": "^3.4",
-        "symfony/filesystem": "^3.4",
-        "symfony/finder": "^3.4",
+        "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/flex": "^1.0",
-        "symfony/form": "^3.4",
-        "symfony/framework-bundle": "^3.4",
-        "symfony/http-foundation": "^3.4",
-        "symfony/http-kernel": "^3.4",
-        "symfony/inflector": "^3.4",
-        "symfony/intl": "^3.4",
+        "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/maker-bundle": "^1.0",
-        "symfony/monolog-bridge": "^3.4",
+        "symfony/monolog-bridge": "^4.4",
         "symfony/monolog-bundle": "^3.1",
-        "symfony/options-resolver": "^3.4",
+        "symfony/options-resolver": "^4.4",
         "symfony/orm-pack": "^1.0",
-        "symfony/process": "^3.4",
-        "symfony/property-access": "^3.4",
-        "symfony/proxy-manager-bridge": "^3.4",
-        "symfony/routing": "^3.4",
-        "symfony/security": "^3.4",
-        "symfony/security-bundle": "^3.4",
-        "symfony/serializer": "^3.4",
-        "symfony/stopwatch": "^3.4",
+        "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/swiftmailer-bundle": "^3.1",
-        "symfony/templating": "^3.4",
-        "symfony/translation": "^3.4",
-        "symfony/twig-bridge": "^3.4",
-        "symfony/twig-bundle": "^3.4",
-        "symfony/validator": "^3.4",
-        "symfony/var-dumper": "^3.4",
-        "symfony/web-profiler-bundle": "^3.4",
-        "symfony/web-server-bundle": "^3.4",
-        "symfony/workflow": "^3.4",
-        "symfony/yaml": "^3.4",
+        "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",
         "tecnickcom/tcpdf": "^6.2",
         "twig/extensions": "^1.5",
         "twig/twig": "^2.4",
@@ -116,8 +114,8 @@
         "mikey179/vfsstream": "^1.6",
         "php-coveralls/php-coveralls": "^2.1",
         "phpunit/phpunit": "^6.5",
-        "symfony/browser-kit": "^3.4",
-        "symfony/phpunit-bridge": "^3.4"
+        "symfony/browser-kit": "^4.4",
+        "symfony/phpunit-bridge": "^4.4"
     },
     "autoload": {
         "files": [