Merge branch '6.1' into 6.2

derrabus · derrabus · commit f3a180b40683 · 2022-11-07T09:07:50.000+01:00
* 6.1:
  fix typo in PULL_REQUEST_TEMPLATE.md
  Allow to disable lock without defining a resource
  [HttpFoundation] Compare cookie with null value as empty string in ResponseCookieValueSame
  Fix deprecation notice when date argument is not nullable and null value is provided
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -4,7 +4,7 @@
 | Bug fix?      | yes/no
 | New feature?  | yes/no <!-- please update src/**/CHANGELOG.md files -->
 | Deprecations? | yes/no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files -->
-| Tickets       | Fix #... <!-- prefix each issue number with "Fix #", no need to create an issue if none exist, explain below instead -->
+| Tickets       | Fix #... <!-- prefix each issue number with "Fix #", no need to create an issue if none exists, explain below instead -->
 | License       | MIT
 | Doc PR        | symfony/symfony-docs#... <!-- required for new features -->
 <!--
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -1270,12 +1270,15 @@ private function addLockSection(ArrayNodeDefinition $rootNode, callable $enableI
                         })
                     ->end()
                     ->addDefaultsIfNotSet()
+                    ->validate()
+                        ->ifTrue(static function (array $config) { return $config['enabled'] && !$config['resources']; })
+                        ->thenInvalid('At least one resource must be defined.')
+                    ->end()
                     ->fixXmlConfig('resource')
                     ->children()
                         ->arrayNode('resources')
                             ->normalizeKeys(false)
                             ->useAttributeAsKey('name')
-                            ->requiresAtLeastOneElement()
                             ->defaultValue(['default' => [class_exists(SemaphoreStore::class) && SemaphoreStore::isSupported() ? 'semaphore' : 'flock']])
                             ->beforeNormalization()
                                 ->ifString()->then(function ($v) { return ['default' => $v]; })
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -427,6 +427,31 @@ public function testItErrorsWhenDefaultBusDoesNotExist()
         ]);
     }
 
+    public function testLockCanBeDisabled()
+    {
+        $processor = new Processor();
+        $configuration = new Configuration(true);
+
+        $config = $processor->processConfiguration($configuration, [
+            ['lock' => ['enabled' => false]],
+        ]);
+
+        $this->assertFalse($config['lock']['enabled']);
+    }
+
+    public function testEnabledLockNeedsResources()
+    {
+        $processor = new Processor();
+        $configuration = new Configuration(true);
+
+        $this->expectException(InvalidConfigurationException::class);
+        $this->expectExceptionMessage('Invalid configuration for path "framework.lock": At least one resource must be defined.');
+
+        $processor->processConfiguration($configuration, [
+            ['lock' => ['enabled' => true]],
+        ]);
+    }
+
     protected static function getBundleDefaultConfig()
     {
         return [
diff --git a/src/Symfony/Component/HttpFoundation/Test/Constraint/ResponseCookieValueSame.php b/src/Symfony/Component/HttpFoundation/Test/Constraint/ResponseCookieValueSame.php
@@ -54,7 +54,7 @@ protected function matches($response): bool
             return false;
         }
 
-        return $this->value === $cookie->getValue();
+        return $this->value === (string) $cookie->getValue();
     }
 
     /**
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Test/Constraint/ResponseCookieValueSameTest.php b/src/Symfony/Component/HttpFoundation/Tests/Test/Constraint/ResponseCookieValueSameTest.php
@@ -41,4 +41,12 @@ public function testConstraint()
 
         $this->fail();
     }
+
+    public function testCookieWithNullValueIsComparedAsEmptyString()
+    {
+        $response = new Response();
+        $response->headers->setCookie(Cookie::create('foo', null, 0, '/path'));
+
+        $this->assertTrue((new ResponseCookieValueSame('foo', '', '/path'))->evaluate($response, '', true));
+    }
 }
diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/DateTimeValueResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/DateTimeValueResolver.php
@@ -60,8 +60,6 @@ public function resolve(Request $request, ArgumentMetadata $argument): array
             $format = $attribute->format;
         }
 
-        $date = false;
-
         if (null !== $format) {
             $date = $class::createFromFormat($format, $value);
 
@@ -73,7 +71,7 @@ public function resolve(Request $request, ArgumentMetadata $argument): array
                 $value = '@'.$value;
             }
             try {
-                $date = new $class($value);
+                $date = new $class($value ?? 'now');
             } catch (\Exception) {
                 $date = false;
             }
diff --git a/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/DateTimeValueResolverTest.php b/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/DateTimeValueResolverTest.php
@@ -119,6 +119,26 @@ public function testNullableWithEmptyAttribute()
         $this->assertNull($results[0]);
     }
 
+    /**
+     * @dataProvider getTimeZones
+     */
+    public function testNow(string $timezone)
+    {
+        date_default_timezone_set($timezone);
+        $resolver = new DateTimeValueResolver();
+
+        $argument = new ArgumentMetadata('dummy', \DateTime::class, false, false, null, false);
+        $request = self::requestWithAttributes(['dummy' => null]);
+
+        /** @var \Generator $results */
+        $results = $resolver->resolve($request, $argument);
+        $results = iterator_to_array($results);
+
+        $this->assertCount(1, $results);
+        $this->assertEquals('0', $results[0]->diff(new \DateTimeImmutable())->format('%s'));
+        $this->assertSame($timezone, $results[0]->getTimezone()->getName(), 'Default timezone');
+    }
+
     public function testPreviouslyConvertedAttribute()
     {
         $resolver = new DateTimeValueResolver();

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ protected function matches($response): bool`
`54`	`54`	`return false;`
`55`	`55`	`}`
`56`	`56`
`57`		`- return $this->value === $cookie->getValue();`
	`57`	`+ return $this->value === (string) $cookie->getValue();`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -41,4 +41,12 @@ public function testConstraint()`
`41`	`41`
`42`	`42`	`$this->fail();`
`43`	`43`	`}`
	`44`	`+`
	`45`	`+ public function testCookieWithNullValueIsComparedAsEmptyString()`
	`46`	`+ {`
	`47`	`+ $response = new Response();`
	`48`	`+ $response->headers->setCookie(Cookie::create('foo', null, 0, '/path'));`
	`49`	`+`
	`50`	`+ $this->assertTrue((new ResponseCookieValueSame('foo', '', '/path'))->evaluate($response, '', true));`
	`51`	`+ }`
`44`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,8 +60,6 @@ public function resolve(Request $request, ArgumentMetadata $argument): array`
`60`	`60`	`$format = $attribute->format;`
`61`	`61`	`}`
`62`	`62`
`63`		`- $date = false;`
`64`		`-`
`65`	`63`	`if (null !== $format) {`
`66`	`64`	`$date = $class::createFromFormat($format, $value);`
`67`	`65`
`@@ -73,7 +71,7 @@ public function resolve(Request $request, ArgumentMetadata $argument): array`
`73`	`71`	`$value = '@'.$value;`
`74`	`72`	`}`
`75`	`73`	`try {`
`76`		`- $date = new $class($value);`
	`74`	`+ $date = new $class($value ?? 'now');`
`77`	`75`	`} catch (\Exception) {`
`78`	`76`	`$date = false;`
`79`	`77`	`}`