Merge ezplatform/2.3 into master

ezpublishlegacy · Oct 26, 2018 · f3b100e · f3b100e
2 parents 89c0e7c + db0c094
commit f3b100e
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -53,6 +53,7 @@ before_script:
 # Behat will use behat.yml which is a copy of behat.yml.dist with hostnames update by doc/docker/selenium.yml
 script: docker-compose exec --user www-data app sh -c "php $TEST_CMD"
 
+
 after_failure:
   # Will show us the last bit of the log of container's main processes
   # (not counting shell process above running php and behat)

diff --git a/app/config/cache_pool/cache.memcached.yml b/app/config/cache_pool/cache.memcached.yml
@@ -1,4 +1,7 @@
 # Reusable service for memcache cache for use in generic.php and plaformsh.php on demand
+#
+# For further reading on setup with eZ Platform and Memcached:
+# https://doc.ezplatform.com/en/latest/guide/persistence_cache/#memcached
 services:
     cache.memcached:
         parent: cache.adapter.memcached

diff --git a/app/config/cache_pool/cache.redis.yml b/app/config/cache_pool/cache.redis.yml
@@ -1,4 +1,7 @@
 # Reusable service for redis cache for use in generic.php and plaformsh.php on demand
+#
+# For further reading on setup with eZ Platform and Redis:
+# https://doc.ezplatform.com/en/latest/guide/persistence_cache/#redis
 services:
     cache.redis:
         parent: cache.adapter.redis

diff --git a/app/config/config.yml b/app/config/config.yml
@@ -139,13 +139,13 @@ jms_translation:
             dirs:
                 - '%kernel.root_dir%/../vendor/ezsystems/ezplatform-admin-ui/src'
             output_dir: '%kernel.root_dir%/../vendor/ezsystems/ezplatform-admin-ui/src/bundle/Resources/translations/'
-            excluded_dirs: [Behat, Tests]
+            excluded_dirs: [Behat, Tests, node_modules]
             output_format: "xliff"
         admin_modules:
             dirs:
                 - '%kernel.root_dir%/../vendor/ezsystems/ezplatform-admin-ui-modules/src'
             output_dir: '%kernel.root_dir%/../vendor/ezsystems/ezplatform-admin-ui-modules/Resources/translations/'
-            excluded_dirs: [Behat, Tests]
+            excluded_dirs: [Behat, Tests, node_modules]
             output_format: "xliff"
 
 ez_platform_automated_translation:

diff --git a/behat.yml.dist b/behat.yml.dist
@@ -26,6 +26,13 @@ default:
 
         EzSystems\PlatformBehatBundle\ServiceContainer\EzBehatExtension: ~
 
+        Bex\Behat\ScreenshotExtension:
+            active_image_drivers: cloudinary
+            image_drivers:
+                cloudinary:
+                    cloud_name: ezplatformtravis
+                    preset: ezplatform
+
     suites: ~
 
 imports:

diff --git a/bin/.travis/runcommand.sh b/bin/.travis/runcommand.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "" ]; then
+    echo "Argument 1 variable for command arguments is empty, please pass arguments"
+    exit 1
+fi
+
+# Execute test command, need to use sh to get right exit code (docker/compose/issues/3379)
+CMD=\"$@\"
+docker-compose exec -T --user www-data app bash -c \""$CMD"\"
diff --git a/composer.json b/composer.json
@@ -35,14 +35,14 @@
         "doctrine/orm": "^2.5",
         "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/ezpublish-kernel": "^7.3@dev",
+        "ezsystems/repository-forms": "^2.3@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-http-cache": "^0.8@dev",
+        "ezsystems/ezplatform-admin-ui": "^1.3@dev",
+        "ezsystems/ezplatform-admin-ui-modules": "^1.3@dev",
+        "ezsystems/ezplatform-admin-ui-assets": "^3.1@dev",
         "ezsystems/ezplatform-design-engine": "^2.0@dev",
         "ezsystems/ezplatform-standard-design": "^0.1@dev",
         "ezsystems/ezplatform-cron": "^2.0@dev",
@@ -72,13 +72,15 @@
         "behat/mink-extension": "^2.3.1",
         "behat/mink-goutte-driver": "^1.2.1",
         "behat/mink-selenium2-driver": "^1.3.1",
+        "bex/behat-screenshot": "^1.2",
         "ezsystems/behatbundle": "^6.5.3",
+        "ezsystems/behat-screenshot-image-driver-cloudinary": "^1.0",
         "phpunit/phpunit": "^6.4.4",
         "sensio/generator-bundle": "^3.1.7",
         "symfony/phpunit-bridge": "^3.4.11"
     },
     "conflict": {
-        "symfony/symfony": "3.4.9||3.4.12",
+        "symfony/symfony": "3.4.9||3.4.12||3.4.16",
         "doctrine/dbal": "2.7.0"
     },
     "scripts": {

diff --git a/doc/docker/base-dev.yml b/doc/docker/base-dev.yml
@@ -10,6 +10,7 @@ services:
     depends_on:
      - db
     environment:
+     - COMPOSER_MEMORY_LIMIT
      - SYMFONY_ENV=${SYMFONY_ENV-dev}
      - SYMFONY_DEBUG
      - SYMFONY_HTTP_CACHE

diff --git a/doc/docker/base-prod.yml b/doc/docker/base-prod.yml
@@ -11,6 +11,7 @@ services:
     depends_on:
      - db
     environment:
+     - COMPOSER_MEMORY_LIMIT
      - SYMFONY_ENV=${SYMFONY_ENV-prod}
      - SYMFONY_DEBUG
      - SYMFONY_HTTP_CACHE