Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	.platform.app.yaml

.php_cs

@@ -12,7 +12,12 @@ return PhpCsFixer\Config::create()
         'phpdoc_to_comment' => false,
         'cast_spaces' => false,
         'blank_line_after_opening_tag' => false,
+        'single_blank_line_before_namespace' => false,
+        'phpdoc_annotation_without_dot' => false,
         'phpdoc_no_alias_tag' => false,
+        'space_after_semicolon' => false,
+        'yoda_style' => false,
+        'no_break_comment' => false,
     ])
     ->setRiskyAllowed(true)
     ->setFinder(

.platform.app.yaml

@@ -8,7 +8,7 @@
 name: app
 
 # The type of the application to build.
-type: php:7.0
+type: php:7.1
 build:
     # "none" means we're running composer manually, see build hook
     flavor: "none"
@@ -59,7 +59,11 @@ hooks:
         if [ -z "$SYMFONY_ENV" ]; then
             export SYMFONY_ENV=prod
         fi
-        app/console --env=$SYMFONY_ENV assetic:dump
+        if [ "$SYMFONY_ENV" = "dev" ] ; then
+            composer install --prefer-dist --no-progress --no-interaction --optimize-autoloader
+        else
+            composer install --no-dev --prefer-dist --no-progress --no-interaction --optimize-autoloader
+        fi
     deploy: |
         set -e
         . ./.env

app/AppCache.php

@@ -1,11 +1,5 @@
 <?php
-/**
- * File containing the AppCache class.
- *
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
- * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
- */
+
 use EzSystems\PlatformHttpCacheBundle\AppCache as PlatformHttpCacheBundleAppCache;
 
 /**

app/AppKernel.php

@@ -1,12 +1,6 @@
 <?php
-/**
- * File containing the AppKernel class.
- *
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
- * @license For full copyright and license information view LICENSE file distributed with this source code.
- * @version //autogentag//
- */
-use eZ\Bundle\EzPublishCoreBundle\Kernel;
+
+use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Config\Loader\LoaderInterface;
 
 class AppKernel extends Kernel

app/config/config.yml

@@ -121,7 +121,8 @@ fos_http_cache:
                 headers:
                     overwrite: true
                     cache_control:
-                        max_age: 10
+                        max_age: 5
+                        s_maxage: 20
             # Example of performance tuning, force TTL on 404 pages to avoid crawlers / ... taking to much load
             # Should not be set to high, as cached 404's can cause issues for future routes, url aliases, wildcards, ..
             -
@@ -131,4 +132,5 @@ fos_http_cache:
                     overwrite: true
                     cache_control:
                         public: true
-                        max_age: 30
+                        max_age: 0
+                        s_maxage: 20

doc/docker/selenium.yml

@@ -14,7 +14,7 @@ services:
     networks:
      - backend
     # Because of: https://github.com/elgalu/docker-selenium/issues/20
-    shm_size: 128m
+    shm_size: 256m
 
   app:
     depends_on:

web/app_dev.php

@@ -6,7 +6,7 @@
 // Feel free to remove this, extend it, or make something more sophisticated at your own risk.
 if (isset($_SERVER['HTTP_CLIENT_IP'])
     || isset($_SERVER['HTTP_X_FORWARDED_FOR'])
-    || !(in_array(@$_SERVER['REMOTE_ADDR'], ['127.0.0.1', 'fe80::1', '::1']) || php_sapi_name() === 'cli-server')
+    || !(in_array(@$_SERVER['REMOTE_ADDR'], ['127.0.0.1', 'fe80::1', '::1']) || PHP_SAPI === 'cli-server')
 ) {
     header('HTTP/1.0 403 Forbidden');
     exit('You are not allowed to access this file. Check ' . basename(__FILE__) . ' for more information.');