Merge branch '4.3' into 4.4

nicolas-grekas · nicolas-grekas · commit a2ef397ea3a0 · 2019-08-20T14:49:24.000+02:00
* 4.3:
  cs fix
  cs fix
  [HttpKernel] Remove outdated docblock comment
  Fix handling for session parameters
diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php
@@ -12,7 +12,6 @@
 namespace Symfony\Bridge\ProxyManager\Tests\LazyProxy\PhpDumper;
 
 use PHPUnit\Framework\TestCase;
-use ProxyManager\Version;
 use Symfony\Bridge\ProxyManager\LazyProxy\PhpDumper\ProxyDumper;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\LazyProxy\PhpDumper\DumperInterface;
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php
@@ -174,7 +174,7 @@ abstract protected function describeEventDispatcherListeners(EventDispatcherInte
     /**
      * Describes a callable.
      *
-     * @param callable $callable
+     * @param mixed $callable
      */
     abstract protected function describeCallable($callable, array $options = []);
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -898,7 +898,7 @@ private function registerSessionConfiguration(array $config, ContainerBuilder $c
         // session storage
         $container->setAlias('session.storage', $config['storage_id'])->setPrivate(true);
         $options = ['cache_limiter' => '0'];
-        foreach (['name', 'cookie_lifetime', 'cookie_path', 'cookie_domain', 'cookie_secure', 'cookie_httponly', 'cookie_samesite', 'use_cookies', 'gc_maxlifetime', 'gc_probability', 'gc_divisor'] as $key) {
+        foreach (['name', 'cookie_lifetime', 'cookie_path', 'cookie_domain', 'cookie_secure', 'cookie_httponly', 'cookie_samesite', 'use_cookies', 'gc_maxlifetime', 'gc_probability', 'gc_divisor', 'sid_length', 'sid_bits_per_character'] as $key) {
             if (isset($config[$key])) {
                 $options[$key] = $config[$key];
             }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/full.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/full.php
@@ -37,6 +37,8 @@
         'gc_maxlifetime' => 90000,
         'gc_divisor' => 108,
         'gc_probability' => 1,
+        'sid_length' => 22,
+        'sid_bits_per_character' => 4,
         'save_path' => '/path/to/sessions',
     ],
     'assets' => [
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/full.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/full.xml
@@ -15,7 +15,7 @@
         <framework:ssi enabled="true" />
         <framework:profiler only-exceptions="true" enabled="false" />
         <framework:router resource="%kernel.project_dir%/config/routing.xml" type="xml" />
-        <framework:session gc-maxlifetime="90000" gc-probability="1" gc-divisor="108" storage-id="session.storage.native" handler-id="session.handler.native_file" name="_SYMFONY" cookie-lifetime="86400" cookie-path="/" cookie-domain="example.com" cookie-secure="true" cookie-httponly="false" use-cookies="true" save-path="/path/to/sessions" />
+        <framework:session gc-maxlifetime="90000" gc-probability="1" gc-divisor="108" storage-id="session.storage.native" handler-id="session.handler.native_file" name="_SYMFONY" cookie-lifetime="86400" cookie-path="/" cookie-domain="example.com" cookie-secure="true" cookie-httponly="false" use-cookies="true" save-path="/path/to/sessions" sid-length="22" sid-bits-per-character="4" />
         <framework:request>
             <framework:format name="csv">
                 <framework:mime-type>text/csv</framework:mime-type>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/full.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/full.yml
@@ -29,6 +29,8 @@ framework:
         gc_probability:  1
         gc_divisor:      108
         gc_maxlifetime:  90000
+        sid_length:      22
+        sid_bits_per_character: 4
         save_path:       /path/to/sessions
     assets:
         version: v1
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -532,6 +532,8 @@ public function testSession()
         $this->assertEquals(108, $options['gc_divisor']);
         $this->assertEquals(1, $options['gc_probability']);
         $this->assertEquals(90000, $options['gc_maxlifetime']);
+        $this->assertEquals(22, $options['sid_length']);
+        $this->assertEquals(4, $options['sid_bits_per_character']);
 
         $this->assertEquals('/path/to/sessions', $container->getParameter('session.save_path'));
     }
diff --git a/src/Symfony/Component/CssSelector/XPath/Translator.php b/src/Symfony/Component/CssSelector/XPath/Translator.php
@@ -114,6 +114,9 @@ public function selectorToXPath(SelectorNode $selector, string $prefix = 'descen
         return ($prefix ?: '').$this->nodeToXPath($selector);
     }
 
+    /**
+     * @return $this
+     */
     public function registerExtension(Extension\ExtensionInterface $extension): self
     {
         $this->extensions[$extension->getName()] = $extension;
@@ -139,6 +142,9 @@ public function getExtension(string $name): Extension\ExtensionInterface
         return $this->extensions[$name];
     }
 
+    /**
+     * @return $this
+     */
     public function registerParserShortcut(ParserInterface $shortcut): self
     {
         $this->shortcutParsers[] = $shortcut;
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
@@ -200,9 +200,7 @@ private function addParameters(): string
     /**
      * Dumps callable to YAML format.
      *
-     * @param callable $callable
-     *
-     * @return callable
+     * @param mixed $callable
      */
     private function dumpCallable($callable)
     {
diff --git a/src/Symfony/Component/HttpKernel/Bundle/Bundle.php b/src/Symfony/Component/HttpKernel/Bundle/Bundle.php
@@ -18,8 +18,7 @@
 use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
 
 /**
- * An implementation of BundleInterface that adds a few conventions
- * for DependencyInjection extensions and Console commands.
+ * An implementation of BundleInterface that adds a few conventions for DependencyInjection extensions.
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ abstract protected function describeEventDispatcherListeners(EventDispatcherInte`
`174`	`174`	`/**`
`175`	`175`	`* Describes a callable.`
`176`	`176`	`*`
`177`		`- * @param callable $callable`
	`177`	`+ * @param mixed $callable`
`178`	`178`	`*/`
`179`	`179`	`abstract protected function describeCallable($callable, array $options = []);`
`180`	`180`
Original file line number	Diff line number	Diff line change
`@@ -898,7 +898,7 @@ private function registerSessionConfiguration(array $config, ContainerBuilder $c`
`898`	`898`	`// session storage`
`899`	`899`	`$container->setAlias('session.storage', $config['storage_id'])->setPrivate(true);`
`900`	`900`	`$options = ['cache_limiter' => '0'];`
`901`		`- foreach (['name', 'cookie_lifetime', 'cookie_path', 'cookie_domain', 'cookie_secure', 'cookie_httponly', 'cookie_samesite', 'use_cookies', 'gc_maxlifetime', 'gc_probability', 'gc_divisor'] as $key) {`
	`901`	`+ foreach (['name', 'cookie_lifetime', 'cookie_path', 'cookie_domain', 'cookie_secure', 'cookie_httponly', 'cookie_samesite', 'use_cookies', 'gc_maxlifetime', 'gc_probability', 'gc_divisor', 'sid_length', 'sid_bits_per_character'] as $key) {`
`902`	`902`	`if (isset($config[$key])) {`
`903`	`903`	`$options[$key] = $config[$key];`
`904`	`904`	`}`
Original file line number	Diff line number	Diff line change
`@@ -532,6 +532,8 @@ public function testSession()`
`532`	`532`	`$this->assertEquals(108, $options['gc_divisor']);`
`533`	`533`	`$this->assertEquals(1, $options['gc_probability']);`
`534`	`534`	`$this->assertEquals(90000, $options['gc_maxlifetime']);`
	`535`	`+ $this->assertEquals(22, $options['sid_length']);`
	`536`	`+ $this->assertEquals(4, $options['sid_bits_per_character']);`
`535`	`537`
`536`	`538`	`$this->assertEquals('/path/to/sessions', $container->getParameter('session.save_path'));`
`537`	`539`	`}`
Original file line number	Diff line number	Diff line change
`@@ -114,6 +114,9 @@ public function selectorToXPath(SelectorNode $selector, string $prefix = 'descen`
`114`	`114`	`return ($prefix ?: '').$this->nodeToXPath($selector);`
`115`	`115`	`}`
`116`	`116`
	`117`	`+ /**`
	`118`	`+ * @return $this`
	`119`	`+ */`
`117`	`120`	`public function registerExtension(Extension\ExtensionInterface $extension): self`
`118`	`121`	`{`
`119`	`122`	`$this->extensions[$extension->getName()] = $extension;`
`@@ -139,6 +142,9 @@ public function getExtension(string $name): Extension\ExtensionInterface`
`139`	`142`	`return $this->extensions[$name];`
`140`	`143`	`}`
`141`	`144`
	`145`	`+ /**`
	`146`	`+ * @return $this`
	`147`	`+ */`
`142`	`148`	`public function registerParserShortcut(ParserInterface $shortcut): self`
`143`	`149`	`{`
`144`	`150`	`$this->shortcutParsers[] = $shortcut;`
Original file line number	Diff line number	Diff line change
`@@ -200,9 +200,7 @@ private function addParameters(): string`
`200`	`200`	`/**`
`201`	`201`	`* Dumps callable to YAML format.`
`202`	`202`	`*`
`203`		`- * @param callable $callable`
`204`		`- *`
`205`		`- * @return callable`
	`203`	`+ * @param mixed $callable`
`206`	`204`	`*/`
`207`	`205`	`private function dumpCallable($callable)`
`208`	`206`	`{`
Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,7 @@`
`18`	`18`	`use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;`
`19`	`19`
`20`	`20`	`/**`
`21`		`- * An implementation of BundleInterface that adds a few conventions`
`22`		`- * for DependencyInjection extensions and Console commands.`
	`21`	`+ * An implementation of BundleInterface that adds a few conventions for DependencyInjection extensions.`
`23`	`22`	`*`
`24`	`23`	`* @author Fabien Potencier <[email protected]>`
`25`	`24`	`*/`