Merge ezplatform/master into ezplatform-demo/master

ezecosystem · Aug 7, 2018 · e33a2f1 · e33a2f1
2 parents a540e6d + 5d618f2
commit e33a2f1
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 11 deletions.
diff --git a/.env b/.env
@@ -4,6 +4,7 @@ COMPOSE_DIR=.
 
 # You'll need to adjust this for Windows and XDB Linux systems: https://getcomposer.org/doc/03-cli.md#composer-home
 COMPOSER_HOME=~/.composer
+COMPOSER_MEMORY_LIMIT=2G
 DATABASE_USER=ezp
 DATABASE_PASSWORD=SetYourOwnPassword
 DATABASE_NAME=ezp

diff --git a/.travis.yml b/.travis.yml
@@ -22,14 +22,18 @@ env:
     - TEST_CMD="bin/behat -vv --profile=rest --suite=fullXml --tags=~@broken"
     - TEST_CMD="bin/behat -vv --profile=core --tags=~@broken"
     - TEST_CMD="bin/phpunit -v vendor/ezsystems/ezpublish-kernel/eZ/Bundle/EzPublishRestBundle/Tests/Functional" SYMFONY_CMD="ez:behat:create-language 'pol-PL' 'Polish (polski)'"
-    - TEST_CMD="bin/behat -v --profile=repository-forms --tags=~@broken" COMPOSE_FILE="doc/docker/base-dev.yml:doc/docker/redis.yml:doc/docker/selenium.yml"
+    - TEST_CMD="bin/behat -v --profile=repository-forms --tags=~@broken" COMPOSE_FILE="doc/docker/base-dev.yml:doc/docker/selenium.yml"
     - TEST_CMD="bin/behat -v --profile=behat --tags=~@broken"
+    - TEST_CMD="bin/behat --profile=adminui --suite=adminui --no-interaction -vv" COMPOSE_FILE="doc/docker/base-dev.yml:doc/docker/selenium.yml"
+    - TEST_CMD="bin/behat --profile=adminui --suite=adminui --no-interaction -vv --tags=~@EZP-29291-excluded" COMPOSE_FILE="doc/docker/base-dev.yml:doc/docker/varnish.yml:doc/docker/redis.yml:doc/docker/selenium.yml" WEB_HOST="varnish"
 
 # test only master (+ Pull requests)
 branches:
   only:
     - master
     - /^\d.\d+$/
+    # build tags (vX.Y.Z)
+    - /^v\d+.\d+.\d+$/
 
 # Update Docker and Docker Compose
 before_install: ./bin/.travis/trusty/update_docker.sh

diff --git a/app/config/config.yml b/app/config/config.yml
@@ -67,8 +67,8 @@ framework:
     session:
         # https://symfony.com/doc/current/reference/configuration/framework.html#handler-id
         # if handler_id set to null will use default session handler from php.ini
-        handler_id: '%session.handler_id%'
-        save_path: '%session.save_path%'
+        handler_id: '%ezplatform.session.handler_id%'
+        save_path: '%ezplatform.session.save_path%'
         # Note: eZ Platform also allows session name and session cookie configuration to be per SiteAccess, by
         #       default session name will be set to "eZSESSID{siteaccess_hash}" (unique session name per siteaccess)
         #       Further reading on sessions: http://doc.ezplatform.com/en/latest/guide/sessions/

diff --git a/app/config/default_parameters.yml b/app/config/default_parameters.yml
@@ -44,7 +44,7 @@ parameters:
     httpcache_default_ttl: '%env(HTTPCACHE_DEFAULT_TTL)%'
 
     # Session save path as used by symfony session handlers (eg. used for dsn with redis)
-    session.save_path: '%env(SESSION_SAVE_PATH)%'
+    ezplatform.session.save_path: '%env(SESSION_SAVE_PATH)%'
 
     # Recommendation Bundle params
     ez_recommendation.default.yoochoose.customer_id: '%env(RECOMMENDATIONS_CUSTOMER_ID)%'
@@ -95,9 +95,9 @@ parameters:
     # env: HTTPCACHE_PURGE_TYPE
     purge_type: local
 
-    ## Session handler, by default set to file based in order to be able to use %session.save_path%
+    ## Session handler, by default set to file based (instead of ~) in order to be able to use %ezplatform.session.save_path%
     # env: SESSION_HANDLER_ID
-    session.handler_id: session.handler.native_file
+    ezplatform.session.handler_id: session.handler.native_file
 
     # Admin siteaccess group name
     admin_group_name: admin_group

diff --git a/app/config/env/generic.php b/app/config/env/generic.php
@@ -69,5 +69,5 @@
 }
 
 if ($value = getenv('SESSION_HANDLER_ID')) {
-    $container->setParameter('session.handler_id', $value);
+    $container->setParameter('ezplatform.session.handler_id', $value);
 }
diff --git a/app/config/env/platformsh.php b/app/config/env/platformsh.php
@@ -104,16 +104,16 @@
             continue;
         }
 
-        $container->setParameter('session.handler_id', 'ezplatform.core.session.handler.native_redis');
-        $container->setParameter('session.save_path', sprintf('%s:%d', $endpoint['host'], $endpoint['port']));
+        $container->setParameter('ezplatform.session.handler_id', 'ezplatform.core.session.handler.native_redis');
+        $container->setParameter('ezplatform.session.save_path', sprintf('%s:%d', $endpoint['host'], $endpoint['port']));
     }
 } elseif (isset($relationships['rediscache'])) {
     foreach ($relationships['rediscache'] as $endpoint) {
         if ($endpoint['scheme'] !== 'redis') {
             continue;
         }
 
-        $container->setParameter('session.handler_id', 'ezplatform.core.session.handler.native_redis');
-        $container->setParameter('session.save_path', sprintf('%s:%d', $endpoint['host'], $endpoint['port']));
+        $container->setParameter('ezplatform.session.handler_id', 'ezplatform.core.session.handler.native_redis');
+        $container->setParameter('ezplatform.session.save_path', sprintf('%s:%d', $endpoint['host'], $endpoint['port']));
     }
 }
diff --git a/doc/docker/install.yml b/doc/docker/install.yml
@@ -20,6 +20,7 @@ services:
     depends_on:
      - install_db
     environment:
+     - COMPOSER_MEMORY_LIMIT
      - SYMFONY_ENV=${SYMFONY_ENV-prod}
      - SYMFONY_DEBUG
      - SYMFONY_CMD