Merge remote-tracking branch 'upstream/1.7' into 1.7

.php_cs

@@ -1,29 +1,32 @@
 <?php
 
-return Symfony\CS\Config\Config::create()
-    ->setUsingLinter(false)
-    ->setUsingCache(true)
-    ->level(Symfony\CS\FixerInterface::SYMFONY_LEVEL)
-    ->fixers([
-        'concat_with_spaces',
-        '-concat_without_spaces',
-        '-empty_return',
-        '-phpdoc_params',
-        '-phpdoc_separation',
-        '-phpdoc_to_comment',
-        '-spaces_cast',
-        '-blankline_after_open_tag',
+return PhpCsFixer\Config::create()
+    ->setRules([
+        '@Symfony' => true,
+        '@Symfony:risky' => true,
+        'concat_space' => ['spacing' => 'one'],
+        'array_syntax' => false,
+        'simplified_null_return' => false,
+        'phpdoc_align' => false,
+        'phpdoc_separation' => false,
+        'phpdoc_to_comment' => false,
+        'cast_spaces' => false,
+        'blank_line_after_opening_tag' => false,
+        'phpdoc_no_alias_tag' => false,
     ])
-    ->finder(
-        Symfony\CS\Finder\DefaultFinder::create()
+    ->setRiskyAllowed(true)
+    ->setFinder(
+        PhpCsFixer\Finder::create()
             ->in(__DIR__)
             ->exclude([
                 'vendor',
                 'bin/.ci',
                 'bin/.travis',
                 'doc',
                 'app/cache',
+                'var/cache',
                 'ezpublish_legacy',
             ])
+            ->files()->name('*.php')
     )
 ;

app/AppKernel.php

@@ -14,7 +14,7 @@ class AppKernel extends Kernel
     /**
      * Returns an array of bundles to registers.
      *
-     * @return array An array of bundle instances.
+     * @return array an array of bundle instances
      *
      * @api
      */

app/config/env/platformsh.php

@@ -21,5 +21,5 @@
     $container->setParameter('database_path', '');
 }
 
-# Store session into /tmp.
+// Store session into /tmp.
 ini_set('session.save_path', '/tmp/sessions');

app/config/security.yml

@@ -10,6 +10,9 @@ security:
             pattern: ^/(_(profiler|wdt)|css|images|js)/
             security: false
 
+        ## WARNING
+        ## Until https://jira.ez.no/browse/EZP-22192 is implemented,
+        ## enabling basic auth in REST will prevent PlatformUI from working
 #        ezpublish_rest:
 #            pattern: ^/api/ezp/v2
 #            stateless: true