Merge branch '4.3' into 4.4

Tobion · Tobion · commit d97f9ab131ae · 2019-07-02T16:37:50.000+02:00
diff --git a/UPGRADE-4.3.md b/UPGRADE-4.3.md
@@ -234,19 +234,19 @@ Workflow
    ```yaml
    framework:
        workflows:
-           type: workflow
            article:
+               type: workflow
                marking_store:
-                   type: multiple
+                   type: multiple_state
                    arguments: states
    ```
 
    After:
    ```yaml
    framework:
        workflows:
-           type: workflow
            article:
+               type: workflow
                marking_store:
                    type: method
                    property: states
@@ -267,8 +267,8 @@ Workflow
    ```yaml
    framework:
        workflows:
-           type: state_machine
            article:
+               type: state_machine
                marking_store:
                    type: method
                    property: state
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -100,7 +100,6 @@
 use Symfony\Component\Serializer\Encoder\EncoderInterface;
 use Symfony\Component\Serializer\Mapping\ClassDiscriminatorFromClassMetadata;
 use Symfony\Component\Serializer\Normalizer\ConstraintViolationListNormalizer;
-use Symfony\Component\Serializer\Normalizer\DateIntervalNormalizer;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Symfony\Component\Stopwatch\Stopwatch;
@@ -227,7 +226,7 @@ public function load(array $configs, ContainerBuilder $container)
 
         if ($this->isConfigEnabled($container, $config['session'])) {
             if (!\extension_loaded('session')) {
-                throw new \LogicException('PHP extension "session" is required.');
+                throw new LogicException('Session support cannot be enabled as the session extension is not installed. See https://www.php.net/session.installation for instructions.');
             }
 
             $this->sessionConfigEnabled = true;
@@ -1435,10 +1434,6 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
     {
         $loader->load('serializer.xml');
 
-        if (!class_exists(DateIntervalNormalizer::class)) {
-            $container->removeDefinition('serializer.normalizer.dateinterval');
-        }
-
         if (!class_exists(ConstraintViolationListNormalizer::class)) {
             $container->removeDefinition('serializer.normalizer.constraint_violation_list');
         }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -1199,10 +1199,6 @@ public function testDataUriNormalizerRegistered()
 
     public function testDateIntervalNormalizerRegistered()
     {
-        if (!class_exists(DateIntervalNormalizer::class)) {
-            $this->markTestSkipped('The DateIntervalNormalizer has been introduced in the Serializer Component version 3.4.');
-        }
-
         $container = $this->createContainerFromFile('full');
 
         $definition = $container->getDefinition('serializer.normalizer.dateinterval');
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/merge.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/merge.php
@@ -1,6 +1,6 @@
 <?php
 
-$this->load('merge_import.php', $container);
+$this->load('merge_import.php');
 
 $container->loadFromExtension('security', [
     'providers' => [
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/sodium_encoder.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/sodium_encoder.php
@@ -1,6 +1,6 @@
 <?php
 
-$this->load('container1.php', $container);
+$this->load('container1.php');
 
 $container->loadFromExtension('security', [
     'encoders' => [
diff --git a/src/Symfony/Component/Security/Guard/AbstractGuardAuthenticator.php b/src/Symfony/Component/Security/Guard/AbstractGuardAuthenticator.php
@@ -25,8 +25,7 @@ abstract class AbstractGuardAuthenticator implements AuthenticatorInterface
      * Shortcut to create a PostAuthenticationGuardToken for you, if you don't really
      * care about which authenticated token you're using.
      *
-     * @param UserInterface $user
-     * @param string        $providerKey
+     * @param string $providerKey
      *
      * @return PostAuthenticationGuardToken
      */
diff --git a/src/Symfony/Component/Security/Guard/AuthenticatorInterface.php b/src/Symfony/Component/Security/Guard/AuthenticatorInterface.php
@@ -37,8 +37,6 @@ interface AuthenticatorInterface extends AuthenticationEntryPointInterface
      *
      * If this returns false, the authenticator will be skipped.
      *
-     * @param Request $request
-     *
      * @return bool
      */
     public function supports(Request $request);
@@ -60,8 +58,6 @@ public function supports(Request $request);
      *
      *      return ['api_key' => $request->headers->get('X-API-TOKEN')];
      *
-     * @param Request $request
-     *
      * @return mixed Any non-null value
      *
      * @throws \UnexpectedValueException If null is returned

Original file line number	Diff line number	Diff line change
`@@ -1199,10 +1199,6 @@ public function testDataUriNormalizerRegistered()`
`1199`	`1199`
`1200`	`1200`	`public function testDateIntervalNormalizerRegistered()`
`1201`	`1201`	`{`
`1202`		`- if (!class_exists(DateIntervalNormalizer::class)) {`
`1203`		`- $this->markTestSkipped('The DateIntervalNormalizer has been introduced in the Serializer Component version 3.4.');`
`1204`		`- }`
`1205`		`-`
`1206`	`1202`	`$container = $this->createContainerFromFile('full');`
`1207`	`1203`
`1208`	`1204`	`$definition = $container->getDefinition('serializer.normalizer.dateinterval');`
Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,7 @@ abstract class AbstractGuardAuthenticator implements AuthenticatorInterface`
`25`	`25`	`* Shortcut to create a PostAuthenticationGuardToken for you, if you don't really`
`26`	`26`	`* care about which authenticated token you're using.`
`27`	`27`	`*`
`28`		`- * @param UserInterface $user`
`29`		`- * @param string $providerKey`
	`28`	`+ * @param string $providerKey`
`30`	`29`	`*`
`31`	`30`	`* @return PostAuthenticationGuardToken`
`32`	`31`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,6 @@ interface AuthenticatorInterface extends AuthenticationEntryPointInterface`
`37`	`37`	`*`
`38`	`38`	`* If this returns false, the authenticator will be skipped.`
`39`	`39`	`*`
`40`		`- * @param Request $request`
`41`		`- *`
`42`	`40`	`* @return bool`
`43`	`41`	`*/`
`44`	`42`	`public function supports(Request $request);`
`@@ -60,8 +58,6 @@ public function supports(Request $request);`
`60`	`58`	`*`
`61`	`59`	`* return ['api_key' => $request->headers->get('X-API-TOKEN')];`
`62`	`60`	`*`
`63`		`- * @param Request $request`
`64`		`- *`
`65`	`61`	`* @return mixed Any non-null value`
`66`	`62`	`*`
`67`	`63`	`* @throws \UnexpectedValueException If null is returned`