Merge branch '4.4' into 5.0

* 4.4: [Security] PHP Syntax Fix Fix comma use improved Yaml syntax for defining method calls Typo in allow_if condition

Author: javiereguiluz

security.rst

@@ -272,7 +272,7 @@ important section is ``firewalls``:
  'dev' => [
  'pattern' => '^/(_(profiler|wdt)|css|images|js)/',
  'security' => false,
- ),
+ ],
  'main' => [
  'anonymous' => 'lazy',
  ],

security/access_control.rst

@@ -290,7 +290,7 @@ key:
  # the 'role' and 'allow-if' options work like an OR expression, so
  # access is granted if the expression is TRUE or the user has ROLE_ADMIN
  roles: 'ROLE_ADMIN'
- allow_if: "'127.0.0.1' == request.getClientIp() or request.header.has('X-Secure-Access')"
+ allow_if: "'127.0.0.1' == request.getClientIp() or request.headers.has('X-Secure-Access')"
 
  .. code-block:: xml
 
@@ -308,7 +308,7 @@ key:
  access is granted if the expression is TRUE or the user has ROLE_ADMIN -->
  <rule path="^/_internal/secure"
  role="ROLE_ADMIN"
- allow-if="'127.0.0.1' == request.getClientIp() or request.header.has('X-Secure-Access')"/>
+ allow-if="'127.0.0.1' == request.getClientIp() or request.headers.has('X-Secure-Access')"/>
  </config>
  </srv:container>
 
@@ -323,7 +323,7 @@ key:
  // the 'role' and 'allow-if' options work like an OR expression, so
  // access is granted if the expression is TRUE or the user has ROLE_ADMIN
  'roles' => 'ROLE_ADMIN',
- 'allow_if' => '"127.0.0.1" == request.getClientIp() or request.header.has('X-Secure-Access')',
+ 'allow_if' => '"127.0.0.1" == request.getClientIp() or request.headers.has('X-Secure-Access')',
  ],
  ],
  ]);

service_container/calls.rst

@@ -40,9 +40,7 @@ To configure the container to call the ``setLogger`` method, use the ``calls`` k
  App\Service\MessageGenerator:
  # ...
  calls:
- - method: setLogger
- arguments:
- - '@logger'
+ - setLogger: ['@logger']
 
  .. code-block:: xml
 
@@ -117,10 +115,7 @@ The configuration to tell the container it should do so would be like:
  App\Service\MessageGenerator:
  # ...
  calls:
- - method: withLogger
- arguments:
- - '@logger'
- returns_clone: true
+ - withLogger: !returns_clone ['@logger']
 
  .. code-block:: xml
 

workflow.rst

@@ -129,8 +129,8 @@ like this:
  'enabled' => true
  ],
  'marking_store' => [
- 'type' => 'method'
- 'property' => 'currentPlace'
+ 'type' => 'method',
+ 'property' => 'currentPlace',
  ],
  'supports' => [BlogPost::class],
  'initial_marking' => 'draft',