Merge branch '2.7' into 2.8

fabpot · fabpot · commit f49cc11021e9 · 2017-07-17T16:02:19.000+02:00
* 2.7:
  [Security] Fix wrong term in UserProviderInterface
  [HttpFoundation] Set meta refresh time to 0 in RedirectResponse content
  [Security] validate empty passwords again
  [DI] Remove irrelevant comment from container
  [TwigBridge] cleaner implementation of the TwigRenderer
diff --git a/src/Symfony/Bridge/Twig/Form/TwigRenderer.php b/src/Symfony/Bridge/Twig/Form/TwigRenderer.php
@@ -19,23 +19,26 @@
  */
 class TwigRenderer extends FormRenderer implements TwigRendererInterface
 {
-    /**
-     * @var TwigRendererEngineInterface
-     */
-    private $engine;
-
     public function __construct(TwigRendererEngineInterface $engine, $csrfTokenManager = null)
     {
         parent::__construct($engine, $csrfTokenManager);
+    }
 
-        $this->engine = $engine;
+    /**
+     * Returns the engine used by this renderer.
+     *
+     * @return TwigRendererEngineInterface The renderer engine
+     */
+    public function getEngine()
+    {
+        return parent::getEngine();
     }
 
     /**
      * {@inheritdoc}
      */
     public function setEnvironment(Environment $environment)
     {
-        $this->engine->setEnvironment($environment);
+        $this->getEngine()->setEnvironment($environment);
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
@@ -30,16 +30,6 @@
  *
  * Parameter and service keys are case insensitive.
  *
- * A service id can contain lowercased letters, digits, underscores, and dots.
- * Underscores are used to separate words, and dots to group services
- * under namespaces:
- *
- * <ul>
- *   <li>request</li>
- *   <li>mysql_session_storage</li>
- *   <li>symfony.mysql_session_storage</li>
- * </ul>
- *
  * A service can also be defined by creating a method named
  * getXXXService(), where XXX is the camelized version of the id:
  *
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php b/src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php
@@ -134,8 +134,8 @@ public function testGetServiceIds()
     public function testSet()
     {
         $sc = new Container();
-        $sc->set('foo', $foo = new \stdClass());
-        $this->assertSame($foo, $sc->get('foo'), '->set() sets a service');
+        $sc->set('._. \\o/', $foo = new \stdClass());
+        $this->assertSame($foo, $sc->get('._. \\o/'), '->set() sets a service');
     }
 
     public function testSetWithNullResetTheService()
diff --git a/src/Symfony/Component/HttpFoundation/RedirectResponse.php b/src/Symfony/Component/HttpFoundation/RedirectResponse.php
@@ -83,7 +83,7 @@ public function setTargetUrl($url)
 <html>
     <head>
         <meta charset="UTF-8" />
-        <meta http-equiv="refresh" content="1;url=%1$s" />
+        <meta http-equiv="refresh" content="0;url=%1$s" />
 
         <title>Redirecting to %1$s</title>
     </head>
diff --git a/src/Symfony/Component/Security/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php b/src/Symfony/Component/Security/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php
@@ -90,6 +90,29 @@ public function testPasswordIsNotValid()
             ->assertRaised();
     }
 
+    /**
+     * @dataProvider emptyPasswordData
+     */
+    public function testEmptyPasswordsAreNotValid($password)
+    {
+        $constraint = new UserPassword(array(
+            'message' => 'myMessage',
+        ));
+
+        $this->validator->validate($password, $constraint);
+
+        $this->buildViolation('myMessage')
+            ->assertRaised();
+    }
+
+    public function emptyPasswordData()
+    {
+        return array(
+            array(null),
+            array(''),
+        );
+    }
+
     /**
      * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
      */
diff --git a/src/Symfony/Component/Security/Core/User/UserProviderInterface.php b/src/Symfony/Component/Security/Core/User/UserProviderInterface.php
@@ -48,7 +48,7 @@ interface UserProviderInterface
     public function loadUserByUsername($username);
 
     /**
-     * Refreshes the user for the account interface.
+     * Refreshes the user.
      *
      * It is up to the implementation to decide if the user data should be
      * totally reloaded (e.g. from the database), or if the UserInterface
@@ -59,7 +59,7 @@ public function loadUserByUsername($username);
      *
      * @return UserInterface
      *
-     * @throws UnsupportedUserException if the account is not supported
+     * @throws UnsupportedUserException if the user is not supported
      */
     public function refreshUser(UserInterface $user);
 
diff --git a/src/Symfony/Component/Security/Core/Validator/Constraints/UserPasswordValidator.php b/src/Symfony/Component/Security/Core/Validator/Constraints/UserPasswordValidator.php
@@ -40,6 +40,8 @@ public function validate($password, Constraint $constraint)
         }
 
         if (null === $password || '' === $password) {
+            $this->context->addViolation($constraint->message);
+
             return;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -19,23 +19,26 @@`
`19`	`19`	`*/`
`20`	`20`	`class TwigRenderer extends FormRenderer implements TwigRendererInterface`
`21`	`21`	`{`
`22`		`- /**`
`23`		`- * @var TwigRendererEngineInterface`
`24`		`- */`
`25`		`- private $engine;`
`26`		`-`
`27`	`22`	`public function __construct(TwigRendererEngineInterface $engine, $csrfTokenManager = null)`
`28`	`23`	`{`
`29`	`24`	`parent::__construct($engine, $csrfTokenManager);`
	`25`	`+ }`
`30`	`26`
`31`		`- $this->engine = $engine;`
	`27`	`+ /**`
	`28`	`+ * Returns the engine used by this renderer.`
	`29`	`+ *`
	`30`	`+ * @return TwigRendererEngineInterface The renderer engine`
	`31`	`+ */`
	`32`	`+ public function getEngine()`
	`33`	`+ {`
	`34`	`+ return parent::getEngine();`
`32`	`35`	`}`
`33`	`36`
`34`	`37`	`/**`
`35`	`38`	`* {@inheritdoc}`
`36`	`39`	`*/`
`37`	`40`	`public function setEnvironment(Environment $environment)`
`38`	`41`	`{`
`39`		`- $this->engine->setEnvironment($environment);`
	`42`	`+ $this->getEngine()->setEnvironment($environment);`
`40`	`43`	`}`
`41`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,16 +30,6 @@`
`30`	`30`	`*`
`31`	`31`	`* Parameter and service keys are case insensitive.`
`32`	`32`	`*`
`33`		`- * A service id can contain lowercased letters, digits, underscores, and dots.`
`34`		`- * Underscores are used to separate words, and dots to group services`
`35`		`- * under namespaces:`
`36`		`- *`
`37`		`- * <ul>`
`38`		`- * <li>request</li>`
`39`		`- * <li>mysql_session_storage</li>`
`40`		`- * <li>symfony.mysql_session_storage</li>`
`41`		`- * </ul>`
`42`		`- *`
`43`	`33`	`* A service can also be defined by creating a method named`
`44`	`34`	`* getXXXService(), where XXX is the camelized version of the id:`
`45`	`35`	`*`
Original file line number	Diff line number	Diff line change
`@@ -134,8 +134,8 @@ public function testGetServiceIds()`
`134`	`134`	`public function testSet()`
`135`	`135`	`{`
`136`	`136`	`$sc = new Container();`
`137`		`- $sc->set('foo', $foo = new \stdClass());`
`138`		`- $this->assertSame($foo, $sc->get('foo'), '->set() sets a service');`
	`137`	`+ $sc->set('._. \\o/', $foo = new \stdClass());`
	`138`	`+ $this->assertSame($foo, $sc->get('._. \\o/'), '->set() sets a service');`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`public function testSetWithNullResetTheService()`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ interface UserProviderInterface`
`48`	`48`	`public function loadUserByUsername($username);`
`49`	`49`
`50`	`50`	`/**`
`51`		`- * Refreshes the user for the account interface.`
	`51`	`+ * Refreshes the user.`
`52`	`52`	`*`
`53`	`53`	`* It is up to the implementation to decide if the user data should be`
`54`	`54`	`* totally reloaded (e.g. from the database), or if the UserInterface`
`@@ -59,7 +59,7 @@ public function loadUserByUsername($username);`
`59`	`59`	`*`
`60`	`60`	`* @return UserInterface`
`61`	`61`	`*`
`62`		`- * @throws UnsupportedUserException if the account is not supported`
	`62`	`+ * @throws UnsupportedUserException if the user is not supported`
`63`	`63`	`*/`
`64`	`64`	`public function refreshUser(UserInterface $user);`
`65`	`65`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,8 @@ public function validate($password, Constraint $constraint)`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`if (null === $password \|\| '' === $password) {`
	`43`	`+ $this->context->addViolation($constraint->message);`
	`44`	`+`
`43`	`45`	`return;`
`44`	`46`	`}`
`45`	`47`