From 025aa47ac7778be3011fa22387aac1d8c0161bf5 Mon Sep 17 00:00:00 2001 From: Jacek Foremski Date: Mon, 21 May 2018 10:26:26 +0200 Subject: [PATCH 01/10] [composer] Set proper dependencies for master --- composer.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 74f20004..0d986987 100644 --- a/composer.json +++ b/composer.json @@ -35,15 +35,15 @@ "doctrine/orm": "^2.5", "sensio/distribution-bundle": "^5.0.19", "incenteev/composer-parameter-handler": "~2.1", - "ezsystems/ezpublish-kernel": "~7.1.0@dev", - "ezsystems/repository-forms": "~2.1.0@dev", - "ezsystems/ezplatform-solr-search-engine": "~1.5.0@dev", - "ezsystems/ez-support-tools": "~0.2.0@dev", - "ezsystems/ezplatform-http-cache": "~0.6.0@dev", - "ezsystems/ezplatform-admin-ui": "~1.1.0@dev", - "ezsystems/ezplatform-admin-ui-modules": "~1.1.0@dev", - "ezsystems/ezplatform-admin-ui-assets": "~2.0.0@dev", - "ezsystems/ezplatform-design-engine": "~1.1.0", + "ezsystems/ezpublish-kernel": "^7.1@dev", + "ezsystems/repository-forms": "^2.1@dev", + "ezsystems/ezplatform-solr-search-engine": "^1.5@dev", + "ezsystems/ez-support-tools": "^0.2@dev", + "ezsystems/ezplatform-http-cache": "~0.6@dev", + "ezsystems/ezplatform-admin-ui": "^1.1@dev", + "ezsystems/ezplatform-admin-ui-modules": "^1.1@dev", + "ezsystems/ezplatform-admin-ui-assets": "^2.0@dev", + "ezsystems/ezplatform-design-engine": "^1.1", "knplabs/knp-menu-bundle": "^2.1", "willdurand/js-translation-bundle": "^2.6.4", "friendsofsymfony/jsrouting-bundle": "^1.4", From e162026d31b3b6dec40e0fff525e6a598ff6b253 Mon Sep 17 00:00:00 2001 From: Maciej Kobus Date: Thu, 24 May 2018 19:32:12 +0200 Subject: [PATCH 02/10] EZP-29241: Add ezsystems/ezplatform-cron to meta repositories (#295) --- app/AppKernel.php | 1 + composer.json | 1 + 2 files changed, 2 insertions(+) diff --git a/app/AppKernel.php b/app/AppKernel.php index 967940e7..fa9322d0 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -42,6 +42,7 @@ public function registerBundles() new EzSystems\EzPlatformAdminUiBundle\EzPlatformAdminUiBundle(), new EzSystems\EzPlatformAdminUiModulesBundle\EzPlatformAdminUiModulesBundle(), new EzSystems\EzPlatformAdminUiAssetsBundle\EzPlatformAdminUiAssetsBundle(), + new EzSystems\EzPlatformCronBundle\EzPlatformCronBundle(), // Application new AppBundle\AppBundle(), ]; diff --git a/composer.json b/composer.json index 0d986987..c32c120f 100644 --- a/composer.json +++ b/composer.json @@ -44,6 +44,7 @@ "ezsystems/ezplatform-admin-ui-modules": "^1.1@dev", "ezsystems/ezplatform-admin-ui-assets": "^2.0@dev", "ezsystems/ezplatform-design-engine": "^1.1", + "ezsystems/ezplatform-cron": "^2.0@dev", "knplabs/knp-menu-bundle": "^2.1", "willdurand/js-translation-bundle": "^2.6.4", "friendsofsymfony/jsrouting-bundle": "^1.4", From 5c7b24a205cfeb859028269077e07dc67ed65582 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Serwatka?= Date: Tue, 29 May 2018 09:31:30 +0200 Subject: [PATCH 03/10] [composer] Bump version for Admin UI assets --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index c32c120f..d3419fda 100644 --- a/composer.json +++ b/composer.json @@ -42,7 +42,7 @@ "ezsystems/ezplatform-http-cache": "~0.6@dev", "ezsystems/ezplatform-admin-ui": "^1.1@dev", "ezsystems/ezplatform-admin-ui-modules": "^1.1@dev", - "ezsystems/ezplatform-admin-ui-assets": "^2.0@dev", + "ezsystems/ezplatform-admin-ui-assets": "^3.0@dev", "ezsystems/ezplatform-design-engine": "^1.1", "ezsystems/ezplatform-cron": "^2.0@dev", "knplabs/knp-menu-bundle": "^2.1", From 0e075a3b496395e21f1d739adfc3eed60cfc7e7f Mon Sep 17 00:00:00 2001 From: Andrew Longosz Date: Thu, 14 Jun 2018 13:47:36 +0200 Subject: [PATCH 04/10] EZP-29167: Added default URL alias transformation setting (#297) Changing this setting for meta-repository instead of Kernel makes existing installations behave in a BC way, while new ones use new, SEO-friendly behavior. --- app/config/ezplatform.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/config/ezplatform.yml b/app/config/ezplatform.yml index b55768e0..b39a6796 100644 --- a/app/config/ezplatform.yml +++ b/app/config/ezplatform.yml @@ -55,3 +55,7 @@ ezpublish: default_ttl: '%httpcache_default_ttl%' http_cache: purge_servers: ['%purge_server%'] + + url_alias: + slug_converter: + transformation: 'urlalias_lowercase' From 75c233274d690c54b7036ad28fa4809de4701a63 Mon Sep 17 00:00:00 2001 From: Bertrand Dunogier Date: Thu, 14 Jun 2018 13:57:17 +0200 Subject: [PATCH 05/10] EZP-28890: moved sync script to ezsystems/ezplatform-i18n (#296) --- bin/synchronize-translations.sh | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100755 bin/synchronize-translations.sh diff --git a/bin/synchronize-translations.sh b/bin/synchronize-translations.sh deleted file mode 100755 index d2411b72..00000000 --- a/bin/synchronize-translations.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env sh -# This script should be used to synchronize ezplatform-i18n repository -# Translations must be up-to-date in all packages -echo 'Translation synchronization'; - -echo '# Clean corresponding ezplatform-i18n folder'; -rm ./vendor/ezsystems/ezplatform-i18n/platform-ui-bundle/*.xlf -rm ./vendor/ezsystems/ezplatform-i18n/ezpublish-kernel/*.xlf -rm ./vendor/ezsystems/ezplatform-i18n/repository-forms/*.xlf - -echo '# Mirror the translation files'; -cp ./vendor/ezsystems/platform-ui-bundle/Resources/translations/*.xlf ./vendor/ezsystems/ezplatform-i18n/platform-ui-bundle -cp ./vendor/ezsystems/ezpublish-kernel/eZ/Bundle/EzPublishCoreBundle/Resources/translations/*.xlf ./vendor/ezsystems/ezplatform-i18n/ezpublish-kernel -cp ./vendor/ezsystems/repository-forms/bundle/Resources/translations/*.xlf ./vendor/ezsystems/ezplatform-i18n/repository-forms - -echo '# Rename file to fit to crowdin format'; -rename 's/\.en\./\./g' ./vendor/ezsystems/ezplatform-i18n/platform-ui-bundle/* -rename 's/\.en\./\./g' ./vendor/ezsystems/ezplatform-i18n/ezpublish-kernel/* -rename 's/\.en\./\./g' ./vendor/ezsystems/ezplatform-i18n/repository-forms/* - -echo 'Translation synchronization done !'; From 70d6fb7042c4e68b2d3fedf7db457f0aed620a04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andre=CC=81=20R?= Date: Thu, 14 Jun 2018 14:05:06 +0200 Subject: [PATCH 06/10] Temprary set http cache to 0.6.x while identifying test failure --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d3419fda..55c1ab4f 100644 --- a/composer.json +++ b/composer.json @@ -39,7 +39,7 @@ "ezsystems/repository-forms": "^2.1@dev", "ezsystems/ezplatform-solr-search-engine": "^1.5@dev", "ezsystems/ez-support-tools": "^0.2@dev", - "ezsystems/ezplatform-http-cache": "~0.6@dev", + "ezsystems/ezplatform-http-cache": "~0.6.0@dev", "ezsystems/ezplatform-admin-ui": "^1.1@dev", "ezsystems/ezplatform-admin-ui-modules": "^1.1@dev", "ezsystems/ezplatform-admin-ui-assets": "^3.0@dev", From 43a8e5efe3a9225b14653e2ba5c5f9b183d40fd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Serwatka?= Date: Fri, 15 Jun 2018 10:31:22 +0200 Subject: [PATCH 07/10] [composer] Set dependencies for 2.2 release --- composer.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 55c1ab4f..d9ca0131 100644 --- a/composer.json +++ b/composer.json @@ -35,15 +35,15 @@ "doctrine/orm": "^2.5", "sensio/distribution-bundle": "^5.0.19", "incenteev/composer-parameter-handler": "~2.1", - "ezsystems/ezpublish-kernel": "^7.1@dev", - "ezsystems/repository-forms": "^2.1@dev", + "ezsystems/ezpublish-kernel": "^7.2@dev", + "ezsystems/repository-forms": "^2.2@dev", "ezsystems/ezplatform-solr-search-engine": "^1.5@dev", "ezsystems/ez-support-tools": "^0.2@dev", - "ezsystems/ezplatform-http-cache": "~0.6.0@dev", - "ezsystems/ezplatform-admin-ui": "^1.1@dev", - "ezsystems/ezplatform-admin-ui-modules": "^1.1@dev", + "ezsystems/ezplatform-http-cache": "^0.7@dev", + "ezsystems/ezplatform-admin-ui": "^1.2@dev", + "ezsystems/ezplatform-admin-ui-modules": "^1.2@dev", "ezsystems/ezplatform-admin-ui-assets": "^3.0@dev", - "ezsystems/ezplatform-design-engine": "^1.1", + "ezsystems/ezplatform-design-engine": "^2.0@dev", "ezsystems/ezplatform-cron": "^2.0@dev", "knplabs/knp-menu-bundle": "^2.1", "willdurand/js-translation-bundle": "^2.6.4", From 73a0b5045d74e502ab3a3989cec50a6f75128cf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andre=CC=81=20R?= Date: Sun, 17 Jun 2018 20:42:13 +0200 Subject: [PATCH 08/10] [Docker] Move app Dockerfile into doc/docker like the rest of the files --- .env | 2 +- Dockerfile => doc/docker/Dockerfile-app | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename Dockerfile => doc/docker/Dockerfile-app (100%) diff --git a/.env b/.env index ba392032..48f76e48 100644 --- 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/Dockerfile b/doc/docker/Dockerfile-app similarity index 100% rename from Dockerfile rename to doc/docker/Dockerfile-app From f23bcef546c9c67f67047074f002a8a9abdfd05e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andre=CC=81=20R?= Date: Mon, 18 Jun 2018 09:13:26 +0200 Subject: [PATCH 09/10] [Composer] Update dependencies to avoid composer reaching memory limit --- composer.json | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/composer.json b/composer.json index 4c55c128..e6d94315 100644 --- a/composer.json +++ b/composer.json @@ -25,42 +25,42 @@ }, "require": { "php": "~5.6|~7.0", - "symfony/symfony": "~2.8", - "twig/extensions": "~1.4", - "symfony/assetic-bundle": "~2.8", - "symfony/swiftmailer-bundle": "~2.5", - "symfony/monolog-bundle": "~2.12|~3.0", - "sensio/distribution-bundle": "^3.0.36|^4.0.6|^5.0", - "sensio/generator-bundle": "^2.3|^3.0", - "incenteev/composer-parameter-handler": "~2.1", - "tedivm/stash-bundle": "~0.6", + "symfony/symfony": "~2.8.41", + "twig/extensions": "^1.5.1", + "symfony/assetic-bundle": "^2.8.2", + "symfony/swiftmailer-bundle": "^2.6.6 | ^3.2.2", + "symfony/monolog-bundle": "^2.12.1 | ^3.3.0", + "sensio/distribution-bundle": "^3.0.36 | ^4.0.40 | ^5.0.22", + "sensio/generator-bundle": "^2.5.3 | ^3.1.7", + "incenteev/composer-parameter-handler": "~2.1.3", + "tedivm/stash-bundle": "~0.6.2", "ezsystems/ezpublish-kernel": "^6.13@dev", "ezsystems/repository-forms": "^1.11@dev", "ezsystems/ezplatform-solr-search-engine": "^1.5@dev", "ezsystems/platform-ui-bundle": "^1.13@dev", "ezsystems/ez-support-tools": "~0.2.1@dev", - "ezsystems/ezplatform-http-cache": "~0.6@dev", + "ezsystems/ezplatform-http-cache": "~0.7@dev", "ezplatform-i18n/ezplatform-i18n-ach_ug": "^1.5@dev", "ezsystems/ezplatform-multi-file-upload": "^0.1", - "ezsystems/ezplatform-design-engine": "^1.1", - "egulias/listeners-debug-command-bundle": "~1.9", - "white-october/pagerfanta-bundle": "1.0.*", + "ezsystems/ezplatform-design-engine": "^1.2", + "egulias/listeners-debug-command-bundle": "~1.9.1", + "white-october/pagerfanta-bundle": "~1.0.8", "hautelook/templated-uri-bundle": "~1.0 | ~2.0", - "doctrine/doctrine-bundle": "~1.5", - "sensio/framework-extra-bundle": "~3.0", - "ezsystems/content-on-the-fly-prototype": "~0.1.11", - "willdurand/js-translation-bundle": "^2.6.4", + "doctrine/doctrine-bundle": "~1.6.13 | ^1.9.1", + "sensio/framework-extra-bundle": "^3.0.29", + "ezsystems/content-on-the-fly-prototype": "~0.1.12", + "willdurand/js-translation-bundle": "^2.6.6", "roave/security-advisories": "dev-master" }, "require-dev": { "ezsystems/ezplatform-i18n": "^1.5@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", - "jarnaiz/behat-junit-formatter": "^1.3", - "ezsystems/behatbundle": "^6.5" + "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", + "jarnaiz/behat-junit-formatter": "^1.3.2", + "ezsystems/behatbundle": "^6.5.3" }, "suggest": { "ezsystems/legacy-bridge": "Provides the full legacy backoffice and legacy features" From 6bbb991c7e79f711a4b7db01ebeb12c557622154 Mon Sep 17 00:00:00 2001 From: Andrew Longosz Date: Tue, 19 Jun 2018 11:59:33 +0200 Subject: [PATCH 10/10] EZP-28868: Enabled eZ Platform Standard Design Bundle (#286) * EZP-28868: Enabled eZ Platform Standard Design Bundle * [Behat] Disabled overriding kernel template paths by standard design * Enabled overriding Kernel templates with @ezdesign --- app/AppKernel.php | 1 + app/config/ezplatform.yml | 4 ++++ app/config/ezplatform_behat.yml | 4 ++++ composer.json | 1 + 4 files changed, 10 insertions(+) diff --git a/app/AppKernel.php b/app/AppKernel.php index fa9322d0..03592552 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -39,6 +39,7 @@ public function registerBundles() new EzSystems\RepositoryFormsBundle\EzSystemsRepositoryFormsBundle(), new EzSystems\EzPlatformSolrSearchEngineBundle\EzSystemsEzPlatformSolrSearchEngineBundle(), new EzSystems\EzPlatformDesignEngineBundle\EzPlatformDesignEngineBundle(), + new EzSystems\EzPlatformStandardDesignBundle\EzPlatformStandardDesignBundle(), new EzSystems\EzPlatformAdminUiBundle\EzPlatformAdminUiBundle(), new EzSystems\EzPlatformAdminUiModulesBundle\EzPlatformAdminUiModulesBundle(), new EzSystems\EzPlatformAdminUiAssetsBundle\EzPlatformAdminUiAssetsBundle(), diff --git a/app/config/ezplatform.yml b/app/config/ezplatform.yml index b39a6796..4625ed6b 100644 --- a/app/config/ezplatform.yml +++ b/app/config/ezplatform.yml @@ -59,3 +59,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: true diff --git a/app/config/ezplatform_behat.yml b/app/config/ezplatform_behat.yml index 1fa33883..a5dbef5c 100644 --- 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 index 37aad192..e64e3139 100644 --- a/composer.json +++ b/composer.json @@ -44,6 +44,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/ezplatform-cron": "^2.0@dev", "knplabs/knp-menu-bundle": "^2.2.1", "willdurand/js-translation-bundle": "^2.6.6",