Merge remote-tracking branch 'upstream/2.2'

.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

.platform.app.yaml

@@ -25,6 +25,8 @@ relationships:
     # If you wish to have a separate Redis instance for sessions, uncomment
     # this relationship and the corresponding service in .platform/services.yaml
     #redissession: 'redissession:redis'
+    # If you wish to use solr, uncomment this relationship and the corresponding service in .platform/services.yaml
+    #solr: 'solrsearch:solr'
 
 variables:
     #php:

.platform/services.yaml

@@ -33,3 +33,21 @@ rediscache:
 #redissession:
 #    type: redis-persistent:3.2
 #    disk: 1024
+
+# If you wish to use solr, uncomment this service and the corresponding relationship in .platform.app.yaml.
+# Also, you need to generate the config using:
+# vendor/ezsystems/ezplatform-solr-search-engine/bin/generate-solr-config.sh
+#solrsearch:
+#    type: solr:6.6
+#    disk: 512
+#    configuration:
+#        configsets:
+#            mainconfig: !archive "configsets/solr6"
+#        cores:
+#            collection1:
+#                core_properties: |
+#                    configSet=mainconfig
+#                    schema=schema.xml
+#        endpoints:
+#            collection1:
+#                core: collection1

.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
@@ -56,9 +60,14 @@ after_failure:
   # Will show us what is up, and how long it's been up
   - docker ps -s
 
-# disable mail notifications
 notifications:
-  email: false
+  slack:
+    rooms:
+      - secure: ESkZY5bzNWua0eHc9rBkuE7AZrCNzLeCV1Rtn97h9KIBeuxsiB3heDUAOi3xZkqO4AyKD5AitAM2k7dTdQKvC8WMooHFWFdjlsSepUvjJISy8keY9kiXywUJ1S/YCwMPwT+HAWB4Qk2zyKmlLmZ8IfAK5aBtndXFQFQCqyeW4PE=
+      - secure: NlXxYbeVV7mWDTUgeFK0VrUdXGBF4lPVpMLZ3WXYDTUWfFyM8tiChENo/u/9n7tSz6KIxdWpy0j7h8+EjVUVCGxS+4q+kdzkfm1Vwq3ANhMsGBDcwdm7gYWhdd43aXV9ZaZPVUWv5C3yizzmYXeuNtviFDA5DEvrE5Rdp6sBsRE=
+    on_success: change
+    on_failure: always
+    on_pull_requests: false
 
 # reduce depth (history) of git checkout
 git:

app/config/env/platformsh.php

@@ -117,3 +117,14 @@
         $container->setParameter('ezplatform.session.save_path', sprintf('%s:%d', $endpoint['host'], $endpoint['port']));
     }
 }
+
+if (isset($relationships['solr'])) {
+    foreach ($relationships['solr'] as $endpoint) {
+        if ($endpoint['scheme'] !== 'solr') {
+            continue;
+        }
+
+        $container->setParameter('search_engine', 'solr');
+        $container->setParameter('solr_dsn', sprintf('http://%s:%d/%s', $endpoint['host'], $endpoint['port'], 'solr'));
+    }
+}

doc/apache2/Readme.md

@@ -84,7 +84,7 @@ Example config for Apache 2.4 in prefork mode:
         RewriteRule ^/assets/ - [L]
 
         # Additional Assetic rules for environments different from dev,
-        # remember to run php app/console assetic:dump --env=prod
+        # remember to run php bin/console assetic:dump --env=prod
         RewriteCond %{ENV:SYMFONY_ENV} !^(dev)
         RewriteRule ^/(css|js|fonts?)/.*\.(css|js|otf|eot|ttf|svg|woff) - [L]
 

doc/apache2/vhost.2.2.template

@@ -86,7 +86,7 @@
         RewriteRule ^/assets/ - [L]
 
         # Additional Assetic rules for environments different from dev,
-        # remember to run php app/console assetic:dump --env=prod
+        # remember to run php bin/console assetic:dump --env=prod
         RewriteCond %{ENV:SYMFONY_ENV} !^(dev)
         RewriteRule ^/(css|js|fonts?)/.*\.(css|js|otf|eot|ttf|svg|woff) - [L]
 

doc/apache2/vhost.template

@@ -105,7 +105,7 @@
         RewriteRule ^/assets/ - [L]
 
         # Additional Assetic rules for environments different from dev,
-        # remember to run php app/console assetic:dump --env=prod
+        # remember to run php bin/console assetic:dump --env=prod
         RewriteCond %{ENV:SYMFONY_ENV} !^(dev)
         RewriteRule ^/(css|js|fonts?)/.*\.(css|js|otf|eot|ttf|svg|woff) - [L]
 

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

doc/nginx/Readme.md

@@ -42,7 +42,7 @@ Example config:
         root /var/www/ezinstall/web;
 
         # Additional Assetic rules for environments different from dev,
-        # remember to run php app/console assetic:dump --env=prod
+        # remember to run php bin/console assetic:dump --env=prod
         # and make sure to comment these out in "dev" environment.
         include ez_params.d/ez_prod_rewrite_params;
 

doc/nginx/ez_params.d/ez_prod_rewrite_params

@@ -1,6 +1,6 @@
 
-# Additional Assetic rules for eZ Publish 5.1 / 2013.4 and higher.
-## Don't forget to run php app/console assetic:dump --env=prod
+# Additional Assetic rules
+## Don't forget to run php bin/console assetic:dump --env=prod
 ## and make sure to comment these out in DEV environment.
 rewrite "^/css/(.*)\.css" "/css/$1.css" break;
 rewrite "^/js/(.*)\.js" "/js/$1.js" break;

doc/nginx/vhost.template

@@ -6,8 +6,8 @@ server {
 
     root %BASEDIR%/web;
 
-    # Additional Assetic rules for eZ Publish 5.1 / 2013.4 and higher.
-    ## Don't forget to run php app/console assetic:dump --env=prod
+    # Additional Assetic rules
+    ## Don't forget to run php bin/console assetic:dump --env=prod
     ## and make sure to comment these out in DEV environment.
     #if[SYMFONY_ENV!=dev] include ez_params.d/ez_prod_rewrite_params;