Merge branch '2.7' into 2.8

fabpot · fabpot · commit 6f2a31b85149 · 2018-01-29T09:54:45.000+01:00
* 2.7: [HttpFoundation] Use the correct syntax for session gc based on Pdo driver Revert "bug symfony#24987 [Console] Fix global console flag when used in chain (Simperfit)" Revert "bug symfony#25487 [Console] Fix a bug when passing a letter that could be an alias (Simperfit)" Disable CSP header on exception pages only in debug Fixed submitting disabled buttons Fixed Button::setParent() when already submitted Improve assertions SCA: get rid of repetitive calls allow null values for root nodes in YAML configs [VarDumper] Fix docblock Improve phpdoc to make it more explicit
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Application.php b/src/Symfony/Bundle/FrameworkBundle/Console/Application.php
@@ -35,10 +35,11 @@ public function __construct(KernelInterface $kernel)
 
         parent::__construct('Symfony', Kernel::VERSION.' - '.$kernel->getName().'/'.$kernel->getEnvironment().($kernel->isDebug() ? '/debug' : ''));
 
-        $this->getDefinition()->addOption(new InputOption('--shell', '-s', InputOption::VALUE_NONE, 'Launch the shell.'));
-        $this->getDefinition()->addOption(new InputOption('--process-isolation', null, InputOption::VALUE_NONE, 'Launch commands from shell as a separate process.'));
-        $this->getDefinition()->addOption(new InputOption('--env', '-e', InputOption::VALUE_REQUIRED, 'The Environment name.', $kernel->getEnvironment()));
-        $this->getDefinition()->addOption(new InputOption('--no-debug', null, InputOption::VALUE_NONE, 'Switches off debug mode.'));
+        $inputDefinition = $this->getDefinition();
+        $inputDefinition->addOption(new InputOption('--shell', '-s', InputOption::VALUE_NONE, 'Launch the shell.'));
+        $inputDefinition->addOption(new InputOption('--process-isolation', null, InputOption::VALUE_NONE, 'Launch commands from shell as a separate process.'));
+        $inputDefinition->addOption(new InputOption('--env', '-e', InputOption::VALUE_REQUIRED, 'The Environment name.', $kernel->getEnvironment()));
+        $inputDefinition->addOption(new InputOption('--no-debug', null, InputOption::VALUE_NONE, 'Switches off debug mode.'));
     }
 
     /**
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php
@@ -110,9 +110,10 @@ protected function write($content, $decorated = false)
     protected function renderTable(Table $table, $decorated = false)
     {
         if (!$decorated) {
-            $table->getStyle()->setCellRowFormat('%s');
-            $table->getStyle()->setCellRowContentFormat('%s');
-            $table->getStyle()->setCellHeaderFormat('%s');
+            $tableStyle = $table->getStyle();
+            $tableStyle->setCellRowFormat('%s');
+            $tableStyle->setCellRowContentFormat('%s');
+            $tableStyle->setCellHeaderFormat('%s');
         }
 
         $table->render();
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -471,8 +471,9 @@ private function registerTemplatingConfiguration(array $config, $ide, ContainerB
         if (1 === count($engines)) {
             $container->setAlias('templating', (string) reset($engines));
         } else {
+            $templateEngineDefinition = $container->getDefinition('templating.engine.delegating');
             foreach ($engines as $engine) {
-                $container->getDefinition('templating.engine.delegating')->addMethodCall('addEngine', array($engine));
+                $templateEngineDefinition->addMethodCall('addEngine', array($engine));
             }
             $container->setAlias('templating', 'templating.engine.delegating');
         }
diff --git a/src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php b/src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php
@@ -52,8 +52,9 @@ public function __construct(HttpKernelInterface $kernel, $cacheDir = null)
     protected function forward(Request $request, $raw = false, Response $entry = null)
     {
         $this->getKernel()->boot();
-        $this->getKernel()->getContainer()->set('cache', $this);
-        $this->getKernel()->getContainer()->set($this->getSurrogate()->getName(), $this->getSurrogate());
+        $container = $this->getKernel()->getContainer();
+        $container->set('cache', $this);
+        $container->set($this->getSurrogate()->getName(), $this->getSurrogate());
 
         return parent::forward($request, $raw, $entry);
     }
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
@@ -142,6 +142,7 @@
             <tag name="monolog.logger" channel="request" />
             <argument>%twig.exception_listener.controller%</argument>
             <argument type="service" id="logger" on-invalid="null" />
+            <argument>%kernel.debug%</argument>
         </service>
 
         <service id="twig.controller.exception" class="%twig.controller.exception.class%">
diff --git a/src/Symfony/Component/Console/Input/ArgvInput.php b/src/Symfony/Component/Console/Input/ArgvInput.php
@@ -284,16 +284,6 @@ public function hasParameterOption($values)
                 if ($token === $value || 0 === strpos($token, $value.'=')) {
                     return true;
                 }
-
-                if (0 === strpos($token, '-') && 0 !== strpos($token, '--')) {
-                    $noValue = explode('=', $token);
-                    $token = $noValue[0];
-                    $searchableToken = str_replace('-', '', $token);
-                    $searchableValue = str_replace('-', '', $value);
-                    if ('' !== $searchableToken && '' !== $searchableValue && false !== strpos($searchableToken, $searchableValue)) {
-                        return true;
-                    }
-                }
             }
         }
 
diff --git a/src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php b/src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php
@@ -296,12 +296,6 @@ public function testHasParameterOption()
         $input = new ArgvInput(array('cli.php', '-f', 'foo'));
         $this->assertTrue($input->hasParameterOption('-f'), '->hasParameterOption() returns true if the given short option is in the raw input');
 
-        $input = new ArgvInput(array('cli.php', '-fh'));
-        $this->assertTrue($input->hasParameterOption('-fh'), '->hasParameterOption() returns true if the given short option is in the raw input');
-
-        $input = new ArgvInput(array('cli.php', '-e=test'));
-        $this->assertFalse($input->hasParameterOption('-s'), '->hasParameterOption() returns true if the given short option is in the raw input');
-
         $input = new ArgvInput(array('cli.php', '--foo', 'foo'));
         $this->assertTrue($input->hasParameterOption('--foo'), '->hasParameterOption() returns true if the given short option is in the raw input');
 
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -276,12 +276,16 @@ public function addClassResource(\ReflectionClass $class)
      * @throws BadMethodCallException When this ContainerBuilder is frozen
      * @throws \LogicException        if the container is frozen
      */
-    public function loadFromExtension($extension, array $values = array())
+    public function loadFromExtension($extension, array $values = null)
     {
         if ($this->isFrozen()) {
             throw new BadMethodCallException('Cannot load from an extension on a frozen container.');
         }
 
+        if (func_num_args() < 2) {
+            $values = array();
+        }
+
         $namespace = $this->getExtension($extension)->getAlias();
 
         $this->extensionConfigs[$namespace][] = $values;
diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -459,7 +459,7 @@ private function loadFromExtensions(array $content)
                 continue;
             }
 
-            if (!is_array($values)) {
+            if (!is_array($values) && null !== $values) {
                 $values = array();
             }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/ProjectExtension.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/ProjectExtension.php
@@ -8,7 +8,14 @@ class ProjectExtension implements ExtensionInterface
 {
     public function load(array $configs, ContainerBuilder $configuration)
     {
-        $config = call_user_func_array('array_merge', $configs);
+        $configuration->setParameter('project.configs', $configs);
+        $configs = array_filter($configs);
+
+        if ($configs) {
+            $config = call_user_func_array('array_merge', $configs);
+        } else {
+            $config = array();
+        }
 
         $configuration->setDefinition('project.service.bar', new Definition('FooClass'));
         $configuration->setParameter('project.parameter.bar', isset($config['foo']) ? $config['foo'] : 'foobar');
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/null_config.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/null_config.yml
@@ -0,0 +1 @@
+project: ~
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
@@ -209,6 +209,17 @@ public function testExtensions()
         }
     }
 
+    public function testExtensionWithNullConfig()
+    {
+        $container = new ContainerBuilder();
+        $container->registerExtension(new \ProjectExtension());
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('null_config.yml');
+        $container->compile();
+
+        $this->assertSame(array(null), $container->getParameter('project.configs'));
+    }
+
     public function testSupports()
     {
         $loader = new YamlFileLoader(new ContainerBuilder(), new FileLocator());
diff --git a/src/Symfony/Component/Finder/Tests/FinderTest.php b/src/Symfony/Component/Finder/Tests/FinderTest.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Finder\Tests;
 
 use Symfony\Component\Finder\Adapter\AdapterInterface;
-use Symfony\Component\Finder\Adapter\GnuFindAdapter;
 use Symfony\Component\Finder\Adapter\PhpAdapter;
 use Symfony\Component\Finder\Finder;
 
@@ -620,15 +619,15 @@ public function testAdapterSelection()
     {
         // test that by default, PhpAdapter is selected
         $adapters = Finder::create()->getAdapters();
-        $this->assertTrue($adapters[0] instanceof PhpAdapter);
+        $this->assertInstanceOf('Symfony\Component\Finder\Adapter\PhpAdapter', $adapters[0]);
 
         // test another adapter selection
         $adapters = Finder::create()->setAdapter('gnu_find')->getAdapters();
-        $this->assertTrue($adapters[0] instanceof GnuFindAdapter);
+        $this->assertInstanceOf('Symfony\Component\Finder\Adapter\GnuFindAdapter', $adapters[0]);
 
         // test that useBestAdapter method removes selection
         $adapters = Finder::create()->useBestAdapter()->getAdapters();
-        $this->assertFalse($adapters[0] instanceof PhpAdapter);
+        $this->assertNotInstanceOf('Symfony\Component\Finder\Adapter\PhpAdapter', $adapters[0]);
     }
 
     public function getTestPathData()
diff --git a/src/Symfony/Component/Form/Button.php b/src/Symfony/Component/Form/Button.php
@@ -106,6 +106,10 @@ public function offsetUnset($offset)
      */
     public function setParent(FormInterface $parent = null)
     {
+        if ($this->submitted) {
+            throw new AlreadySubmittedException('You cannot set the parent of a submitted button');
+        }
+
         $this->parent = $parent;
     }
 
diff --git a/src/Symfony/Component/Form/SubmitButton.php b/src/Symfony/Component/Form/SubmitButton.php
@@ -43,6 +43,12 @@ public function isClicked()
      */
     public function submit($submittedData, $clearMissing = true)
     {
+        if ($this->getConfig()->getDisabled()) {
+            $this->clicked = false;
+
+            return $this;
+        }
+
         parent::submit($submittedData, $clearMissing);
 
         $this->clicked = null !== $submittedData;
diff --git a/src/Symfony/Component/Form/Tests/ButtonTest.php b/src/Symfony/Component/Form/Tests/ButtonTest.php
@@ -30,18 +30,34 @@ protected function setUp()
         $this->factory = $this->getMockBuilder('Symfony\Component\Form\FormFactoryInterface')->getMock();
     }
 
+    /**
+     * @expectedException \Symfony\Component\Form\Exception\AlreadySubmittedException
+     */
+    public function testSetParentOnSubmittedButton()
+    {
+        $button = $this->getButtonBuilder('button')
+            ->getForm()
+        ;
+
+        $button->submit('');
+
+        $button->setParent($this->getFormBuilder('form')->getForm());
+    }
+
     /**
      * @dataProvider getDisabledStates
      */
     public function testDisabledIfParentIsDisabled($parentDisabled, $buttonDisabled, $result)
     {
         $form = $this->getFormBuilder('form')
             ->setDisabled($parentDisabled)
-            ->getForm();
+            ->getForm()
+        ;
 
         $button = $this->getButtonBuilder('button')
             ->setDisabled($buttonDisabled)
-            ->getForm();
+            ->getForm()
+        ;
 
         $button->setParent($form);
 
diff --git a/src/Symfony/Component/Form/Tests/CompoundFormTest.php b/src/Symfony/Component/Form/Tests/CompoundFormTest.php
@@ -1066,6 +1066,28 @@ public function testClickedButtonFromParentForm()
         $this->assertSame($button, $this->form->getClickedButton());
     }
 
+    public function testDisabledButtonIsNotSubmitted()
+    {
+        $button = new SubmitButtonBuilder('submit');
+        $submit = $button
+            ->setDisabled(true)
+            ->getForm();
+
+        $form = $this->createForm()
+            ->add($this->getBuilder('text')->getForm())
+            ->add($submit)
+        ;
+
+        $form->submit(array(
+            'text' => '',
+            'submit' => '',
+        ));
+
+        $this->assertTrue($submit->isDisabled());
+        $this->assertFalse($submit->isClicked());
+        $this->assertFalse($submit->isSubmitted());
+    }
+
     protected function createForm()
     {
         return $this->getBuilder()
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
@@ -375,7 +375,11 @@ public function close()
             $this->gcCalled = false;
 
             // delete the session records that have expired
-            $sql = "DELETE FROM $this->table WHERE $this->lifetimeCol < :time - $this->timeCol";
+            if ('mysql' === $this->driver) {
+                $sql = "DELETE FROM $this->table WHERE $this->lifetimeCol + $this->timeCol < :time";
+            } else {
+                $sql = "DELETE FROM $this->table WHERE $this->lifetimeCol < :time - $this->timeCol";
+            }
 
             $stmt = $this->pdo->prepare($sql);
             $stmt->bindValue(':time', time(), \PDO::PARAM_INT);
diff --git a/src/Symfony/Component/HttpKernel/EventListener/AddRequestFormatsListener.php b/src/Symfony/Component/HttpKernel/EventListener/AddRequestFormatsListener.php
@@ -34,8 +34,9 @@ public function __construct(array $formats)
      */
     public function onKernelRequest(GetResponseEvent $event)
     {
+        $request = $event->getRequest();
         foreach ($this->formats as $format => $mimeTypes) {
-            $event->getRequest()->setFormat($format, $mimeTypes);
+            $request->setFormat($format, $mimeTypes);
         }
     }
 
diff --git a/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php b/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php
@@ -32,11 +32,13 @@ class ExceptionListener implements EventSubscriberInterface
 {
     protected $controller;
     protected $logger;
+    protected $debug;
 
-    public function __construct($controller, LoggerInterface $logger = null)
+    public function __construct($controller, LoggerInterface $logger = null, $debug = false)
     {
         $this->controller = $controller;
         $this->logger = $logger;
+        $this->debug = $debug;
     }
 
     public function onKernelException(GetResponseForExceptionEvent $event)
@@ -71,7 +73,7 @@ public function onKernelException(GetResponseForExceptionEvent $event)
 
         $event->setResponse($response);
 
-        if ($eventDispatcher instanceof EventDispatcherInterface) {
+        if ($this->debug && $eventDispatcher instanceof EventDispatcherInterface) {
             $cspRemovalListener = function (FilterResponseEvent $event) use (&$cspRemovalListener, $eventDispatcher) {
                 $event->getResponse()->headers->remove('Content-Security-Policy');
                 $eventDispatcher->removeListener(KernelEvents::RESPONSE, $cspRemovalListener);
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/ExceptionListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/ExceptionListenerTest.php
@@ -134,7 +134,7 @@ public function testCSPHeaderIsRemoved()
             return new Response($request->getRequestFormat());
         }));
 
-        $listener = new ExceptionListener('foo', $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock());
+        $listener = new ExceptionListener('foo', $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock(), true);
 
         $dispatcher->addSubscriber($listener);
 
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
@@ -1000,7 +1000,7 @@ public function getEnv()
     /**
      * Sets the environment variables.
      *
-     * An environment variable value should be a string.
+     * Each environment variable value should be a string.
      * If it is an array, the variable is ignored.
      *
      * That happens in PHP when 'argv' is registered into
diff --git a/src/Symfony/Component/Validator/ExecutionContext.php b/src/Symfony/Component/Validator/ExecutionContext.php
@@ -197,8 +197,9 @@ public function validate($value, $subPath = '', $groups = null, $traverse = fals
     {
         $propertyPath = $this->getPropertyPath($subPath);
 
+        $visitor = $this->globalContext->getVisitor();
         foreach ($this->resolveGroups($groups) as $group) {
-            $this->globalContext->getVisitor()->validate($value, $group, $propertyPath, $traverse, $deep);
+            $visitor->validate($value, $group, $propertyPath, $traverse, $deep);
         }
     }
 
diff --git a/src/Symfony/Component/VarDumper/Dumper/AbstractDumper.php b/src/Symfony/Component/VarDumper/Dumper/AbstractDumper.php
@@ -93,9 +93,9 @@ public function setCharset($charset)
     /**
      * Sets the indentation pad string.
      *
-     * @param string $pad A string the will be prepended to dumped lines, repeated by nesting level
+     * @param string $pad A string that will be prepended to dumped lines, repeated by nesting level
      *
-     * @return string The indent pad
+     * @return string The previous indent pad
      */
     public function setIndentPad($pad)
     {

Original file line number	Diff line number	Diff line change
`@@ -110,9 +110,10 @@ protected function write($content, $decorated = false)`
`110`	`110`	`protected function renderTable(Table $table, $decorated = false)`
`111`	`111`	`{`
`112`	`112`	`if (!$decorated) {`
`113`		`- $table->getStyle()->setCellRowFormat('%s');`
`114`		`- $table->getStyle()->setCellRowContentFormat('%s');`
`115`		`- $table->getStyle()->setCellHeaderFormat('%s');`
	`113`	`+ $tableStyle = $table->getStyle();`
	`114`	`+ $tableStyle->setCellRowFormat('%s');`
	`115`	`+ $tableStyle->setCellRowContentFormat('%s');`
	`116`	`+ $tableStyle->setCellHeaderFormat('%s');`
`116`	`117`	`}`
`117`	`118`
`118`	`119`	`$table->render();`
Original file line number	Diff line number	Diff line change
`@@ -471,8 +471,9 @@ private function registerTemplatingConfiguration(array $config, $ide, ContainerB`
`471`	`471`	`if (1 === count($engines)) {`
`472`	`472`	`$container->setAlias('templating', (string) reset($engines));`
`473`	`473`	`} else {`
	`474`	`+ $templateEngineDefinition = $container->getDefinition('templating.engine.delegating');`
`474`	`475`	`foreach ($engines as $engine) {`
`475`		`- $container->getDefinition('templating.engine.delegating')->addMethodCall('addEngine', array($engine));`
	`476`	`+ $templateEngineDefinition->addMethodCall('addEngine', array($engine));`
`476`	`477`	`}`
`477`	`478`	`$container->setAlias('templating', 'templating.engine.delegating');`
`478`	`479`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,8 +52,9 @@ public function __construct(HttpKernelInterface $kernel, $cacheDir = null)`
`52`	`52`	`protected function forward(Request $request, $raw = false, Response $entry = null)`
`53`	`53`	`{`
`54`	`54`	`$this->getKernel()->boot();`
`55`		`- $this->getKernel()->getContainer()->set('cache', $this);`
`56`		`- $this->getKernel()->getContainer()->set($this->getSurrogate()->getName(), $this->getSurrogate());`
	`55`	`+ $container = $this->getKernel()->getContainer();`
	`56`	`+ $container->set('cache', $this);`
	`57`	`+ $container->set($this->getSurrogate()->getName(), $this->getSurrogate());`
`57`	`58`
`58`	`59`	`return parent::forward($request, $raw, $entry);`
`59`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -284,16 +284,6 @@ public function hasParameterOption($values)`
`284`	`284`	`if ($token === $value \|\| 0 === strpos($token, $value.'=')) {`
`285`	`285`	`return true;`
`286`	`286`	`}`
`287`		`-`
`288`		`- if (0 === strpos($token, '-') && 0 !== strpos($token, '--')) {`
`289`		`- $noValue = explode('=', $token);`
`290`		`- $token = $noValue[0];`
`291`		`- $searchableToken = str_replace('-', '', $token);`
`292`		`- $searchableValue = str_replace('-', '', $value);`
`293`		`- if ('' !== $searchableToken && '' !== $searchableValue && false !== strpos($searchableToken, $searchableValue)) {`
`294`		`- return true;`
`295`		`- }`
`296`		`- }`
`297`	`287`	`}`
`298`	`288`	`}`
`299`	`289`
Original file line number	Diff line number	Diff line change
`@@ -459,7 +459,7 @@ private function loadFromExtensions(array $content)`
`459`	`459`	`continue;`
`460`	`460`	`}`
`461`	`461`
`462`		`- if (!is_array($values)) {`
	`462`	`+ if (!is_array($values) && null !== $values) {`
`463`	`463`	`$values = array();`
`464`	`464`	`}`
`465`	`465`