diff --git a/.env b/.env index c0d412e8..ac59efd8 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/app/AppKernel.php b/app/AppKernel.php index 8d4df649..fe5f37e9 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -42,11 +42,13 @@ public function registerBundles() new EzSystems\RepositoryFormsBundle\EzSystemsRepositoryFormsBundle(), new EzSystems\EzPlatformSolrSearchEngineBundle\EzSystemsEzPlatformSolrSearchEngineBundle(), new EzSystems\EzPlatformDesignEngineBundle\EzPlatformDesignEngineBundle(), - // Dependencies - new Netgen\TagsBundle\NetgenTagsBundle(), + new EzSystems\EzPlatformStandardDesignBundle\EzPlatformStandardDesignBundle(), new EzSystems\EzPlatformAdminUiBundle\EzPlatformAdminUiBundle(), new EzSystems\EzPlatformAdminUiModulesBundle\EzPlatformAdminUiModulesBundle(), new EzSystems\EzPlatformAdminUiAssetsBundle\EzPlatformAdminUiAssetsBundle(), + new EzSystems\EzPlatformCronBundle\EzPlatformCronBundle(), + // Dependencies + new Netgen\TagsBundle\NetgenTagsBundle(), // Application new AppBundle\AppBundle(), ]; diff --git a/app/config/ezplatform.yml b/app/config/ezplatform.yml index d5fc2f92..5d7e0148 100644 --- a/app/config/ezplatform.yml +++ b/app/config/ezplatform.yml @@ -92,11 +92,19 @@ ezpublish: - nor-NO - eng-GB + url_alias: + slug_converter: + transformation: 'urlalias_lowercase' + ezdesign: design_list: main: [tastefulplanet] admin: [admin, tastefulplanet] +ez_platform_standard_design: + # makes Kernel default templates (in EzPublishCoreBundle/Resources/views) part of standard Design + override_kernel_templates: true + assetic: assets: css_default: 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/bin/synchronize-translations.sh b/bin/synchronize-translations.sh deleted file mode 100755 index 29cbb2e3..00000000 --- a/bin/synchronize-translations.sh +++ /dev/null @@ -1,24 +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 -rm ./vendor/ezsystems/ezplatform-i18n/hybrid-platform-ui/*.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 -cp ./vendor/ezsystems/hybrid-platform-ui/src/bundle/Resources/translations/*.xlf ./vendor/ezsystems/ezplatform-i18n/hybrid-platform-ui - -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/* -rename 's/\.en\./\./g' ./vendor/ezsystems/ezplatform-i18n/hybrid-platform-ui/* - -echo 'Translation synchronization done !'; diff --git a/composer.json b/composer.json index 13a97c6e..5476b5c8 100644 --- a/composer.json +++ b/composer.json @@ -27,47 +27,49 @@ "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", - "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", - "knplabs/knp-menu-bundle": "^2.1", - "willdurand/js-translation-bundle": "^2.6.4", - "friendsofsymfony/jsrouting-bundle": "^1.4", - "white-october/pagerfanta-bundle": "^1.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", + "ezsystems/ez-support-tools": "^0.2@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": "^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", + "friendsofsymfony/jsrouting-bundle": "^1.6.3", + "white-october/pagerfanta-bundle": "^1.2", "roave/security-advisories": "dev-master", - "leafo/scssphp": "^0.7", "novactive/ezseobundle": "^3.0.0@rc", - "symfony/thanks": "^1.0", "sensio/framework-extra-bundle": "^5.1", "oneup/flysystem-bundle": "^3.0", "ezsystems/ezplatform-demo-assets": "^1.0@dev", "kaliop/ezmigrationbundle": "^4.0", - "netgen/tagsbundle": "^3.0" + "netgen/tagsbundle": "^3.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 b/doc/docker/Dockerfile-app similarity index 100% rename from Dockerfile rename to doc/docker/Dockerfile-app