Merge branch 'ezplatform/master' into master

ezecosystem · Jun 19, 2018 · 2b94271 · 2b94271
2 parents 8091ef6 + 6bbb991
commit 2b94271
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 27 deletions.
diff --git a/.env b/.env
@@ -16,7 +16,7 @@ MYSQL_IMAGE=healthcheck/mariadb
 SELENIUM_IMAGE=selenium/standalone-chrome-debug:3.4.0
 REDIS_IMAGE=healthcheck/redis
 
-APP_DOCKER_FILE=Dockerfile
+APP_DOCKER_FILE=doc/docker/Dockerfile-app
 
 DATASET_VARDIR=my-ez-app
 

diff --git a/app/AppKernel.php b/app/AppKernel.php
@@ -40,19 +40,19 @@ public function registerBundles()
             new EzSystems\RepositoryFormsBundle\EzSystemsRepositoryFormsBundle(),
             new EzSystems\EzPlatformSolrSearchEngineBundle\EzSystemsEzPlatformSolrSearchEngineBundle(),
             new EzSystems\EzPlatformDesignEngineBundle\EzPlatformDesignEngineBundle(),
-            // Application
+            new EzSystems\EzPlatformStandardDesignBundle\EzPlatformStandardDesignBundle(),
             new EzSystems\EzPlatformAdminUiBundle\EzPlatformAdminUiBundle(),
             new EzSystems\EzPlatformAdminUiModulesBundle\EzPlatformAdminUiModulesBundle(),
             new EzSystems\EzPlatformAdminUiAssetsBundle\EzPlatformAdminUiAssetsBundle(),
-            // eZ Studio
+            new EzSystems\EzPlatformCronBundle\EzPlatformCronBundle(),
+            // eZ Platform EE
             new EzSystems\EzPlatformPageFieldTypeBundle\EzPlatformPageFieldTypeBundle(),
             new EzSystems\EzPlatformPageBuilderBundle\EzPlatformPageBuilderBundle(),
             new EzSystems\NotificationBundle\EzSystemsNotificationBundle(),
             new EzSystems\DateBasedPublisherBundle\EzSystemsDateBasedPublisherBundle(),
             new EzSystems\FlexWorkflowBundle\EzSystemsFlexWorkflowBundle(),
-            new EzSystems\EzPlatformCronBundle\EzPlatformCronBundle(),
             new EzSystems\EzPlatformEnterpriseEditionInstallerBundle\EzPlatformEnterpriseEditionInstallerBundle(),
-            // AppBundle
+            // Application
             new AppBundle\AppBundle(),
         ];
 

diff --git a/app/config/ezplatform.yml b/app/config/ezplatform.yml
@@ -69,3 +69,7 @@ ezpublish:
     url_alias:
         slug_converter:
             transformation: 'urlalias_lowercase'
+
+ez_platform_standard_design:
+    # makes Kernel default templates (in EzPublishCoreBundle/Resources/views) part of standard Design
+    override_kernel_templates: false
diff --git a/app/config/ezplatform_behat.yml b/app/config/ezplatform_behat.yml
@@ -13,3 +13,7 @@ ezpublish:
 ezdesign:
     phpstorm:
         enabled: false
+
+ez_platform_standard_design:
+    # for pre eZ Design Engine tests use old template naming
+    override_kernel_templates: false
diff --git a/composer.json b/composer.json
@@ -31,14 +31,14 @@
         "php": "^7.1",
         "symfony/symfony": "^3.4.2",
         "twig/twig": "^1.0||^2.0",
-        "twig/extensions": "^1.5.0",
-        "symfony/assetic-bundle": "~2.8",
-        "symfony/swiftmailer-bundle": "^3.0",
-        "symfony/monolog-bundle": "^3.1.0",
-        "doctrine/doctrine-bundle": "^1.6",
+        "twig/extensions": "^1.5.1",
+        "symfony/assetic-bundle": "^2.8.2",
+        "symfony/swiftmailer-bundle": "^3.2.2",
+        "symfony/monolog-bundle": "^3.3.0",
+        "doctrine/doctrine-bundle": "^1.9.1",
         "doctrine/orm": "^2.5",
-        "sensio/distribution-bundle": "^5.0.19",
-        "incenteev/composer-parameter-handler": "~2.1",
+        "sensio/distribution-bundle": "^5.0.22",
+        "incenteev/composer-parameter-handler": "^2.1.3",
         "ezsystems/ezpublish-kernel": "^7.2@dev",
         "ezsystems/repository-forms": "^2.2@dev",
         "ezsystems/ezplatform-solr-search-engine": "^1.5@dev",
@@ -48,6 +48,7 @@
         "ezsystems/ezplatform-admin-ui-modules": "^1.2@dev",
         "ezsystems/ezplatform-admin-ui-assets": "^3.0@dev",
         "ezsystems/ezplatform-design-engine": "^2.0@dev",
+        "ezsystems/ezplatform-standard-design": "^0.1@dev",
         "ezsystems/ezstudio-notifications": "^2.2@dev",
         "ezsystems/date-based-publisher": "^2.2@dev",
         "ezsystems/flex-workflow": "^2.2@dev",
@@ -56,24 +57,24 @@
         "ezsystems/ezplatform-cron": "^2.0@dev",
         "ezsystems/ezplatform-ee-installer": "^2.2@dev",
         "ezsystems/ezplatform-http-cache-fastly": "^1.1@dev",
-        "knplabs/knp-menu-bundle": "^2.1",
-        "willdurand/js-translation-bundle": "^2.6.4",
-        "friendsofsymfony/jsrouting-bundle": "^1.4",
-        "white-october/pagerfanta-bundle": "^1.1",
+        "knplabs/knp-menu-bundle": "^2.2.1",
+        "willdurand/js-translation-bundle": "^2.6.6",
+        "friendsofsymfony/jsrouting-bundle": "^1.6.3",
+        "white-october/pagerfanta-bundle": "^1.2",
         "roave/security-advisories": "dev-master",
-        "leafo/scssphp": "^0.7",
-        "symfony/thanks": "^1.0"
+        "leafo/scssphp": "^0.7.6",
+        "symfony/thanks": "^1.0.7"
     },
     "require-dev": {
-        "behat/behat": "~3.2",
-        "behat/symfony2-extension": "~2.0",
-        "behat/mink-extension": "~2.0",
-        "behat/mink-goutte-driver": "~1.0",
-        "behat/mink-selenium2-driver": "~1.0",
-        "ezsystems/behatbundle": "^6.5",
-        "phpunit/phpunit": "^6.4",
-        "sensio/generator-bundle": "~3.1",
-        "symfony/phpunit-bridge": "~3.2"
+        "behat/behat": "^3.4.3",
+        "behat/symfony2-extension": "^2.1.5",
+        "behat/mink-extension": "^2.3.1",
+        "behat/mink-goutte-driver": "^1.2.1",
+        "behat/mink-selenium2-driver": "^1.3.1",
+        "ezsystems/behatbundle": "^6.5.3",
+        "phpunit/phpunit": "^6.4.4",
+        "sensio/generator-bundle": "^3.1.7",
+        "symfony/phpunit-bridge": "^3.4.11"
     },
     "conflict": {
         "symfony/symfony": "3.4.9",

diff --git a/Dockerfile → doc/docker/Dockerfile-app b/Dockerfile → doc/docker/Dockerfile-app