Merge remote-tracking branch 'upstream/experimental/sf' into fix-data…

…collector

app/config/eccube/bundles.php

@@ -10,11 +10,11 @@
     Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true],
     Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle::class => ['all' => true],
     Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true],
-    WhiteOctober\PagerfantaBundle\WhiteOctoberPagerfantaBundle::class => ['all' => true],
     Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true, 'test' => true],
     Symfony\Bundle\WebServerBundle\WebServerBundle::class => ['dev' => true],
     Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => 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],
 ];

app/config/eccube/packages/framework.yaml

@@ -8,6 +8,12 @@ framework:
     session:
         handler_id: session.handler.native_file
         save_path: '%kernel.project_dir%/var/sessions/%kernel.environment%'
+        name: '%env(ECCUBE_COOKIE_NAME)%'
+        cookie_path: /
+        cookie_secure: !php/object env(ECCUBE_FORCE_SSL)
+        gc_maxlifetime: '%env(ECCUBE_COOKIE_LIFETIME)%'
+        cookie_httponly: true
+
     # When using the HTTP Cache, ESI allows to render page fragments separately
     # and with different cache configurations for each fragment
     # https://symfony.com/doc/current/book/http_cache.html#edge-side-includes

app/config/eccube/services.yaml

@@ -1,7 +1,7 @@
 # Put parameters here that don't need to change on each machine where the app is deployed
 # https://symfony.com/doc/current/best_practices/configuration.html#application-related-configuration
 parameters:
-    locale: 'en'
+    locale: 'ja'
     # This parameter defines the codes of the locales (languages) enabled in the application
     app_locales: en|fr|de|es|cs|nl|ru|uk|ro|pt_BR|pl|it|ja|id|ca|sl|hr|zh_CN
     base_currency_code: 'JPY'
@@ -39,7 +39,7 @@ services:
         resource: '../../../src/Eccube/*'
         # you can exclude directories or files
         # but if a service is unused, it's removed anyway
-        exclude: '../../../src/Eccube/{Annotation,Application,Common,ControllerProvider,DI,Entity,Exception,Log,Plugin,Routing,ServiceProvider,Util,Resource}'
+        exclude: '../../../src/Eccube/{Annotation,Application,Common,ControllerProvider,DI,Entity,Exception,Log,Plugin,Routing,ServiceProvider,Util,Resource,Doctrine/ORM/tools/}'
 
     Eccube\Service\TaxRuleService:
         lazy: true

composer.json

@@ -30,6 +30,7 @@
         "egulias/email-validator": "^2.1",
         "guzzlehttp/guzzle": "^6.2",
         "hirak/prestissimo": "^0.3.7",
+        "knplabs/knp-paginator-bundle": "^2.7",
         "mobiledetect/mobiledetectlib": "^2.8",
         "nesbot/carbon": "^1.22",
         "pimple/pimple": "^1.1",
@@ -76,8 +77,7 @@
         "symfony/validator": "^3.4",
         "symfony/var-dumper": "^3.4",
         "symfony/web-profiler-bundle": "^3.4",
-        "symfony/yaml": "^3.4",
-        "white-october/pagerfanta-bundle": "^1.1"
+        "symfony/yaml": "^3.4"
     },
     "require-dev": {
         "dama/doctrine-test-bundle": "^4.0",