Merge branch '4.4' into 5.4

nicolas-grekas · nicolas-grekas · commit de1a7bf11124 · 2022-05-17T11:47:20.000+02:00
* 4.4: [Mime] Add null check for EmailHeaderSame Add approriate description to CollectionToArrayTransformer::reverseTransform docblock [PropertyInfo] CS fixes [VarDumper] fix test on PHP 8.2 [Config] Fix looking for single files in phars with GlobResource Revert "bug #46327 [HttpKernel] Allow ErrorHandler ^5.0 to be used in HttpKernel 4.4 (mpdude)"
diff --git a/src/Symfony/Bridge/Doctrine/Form/DataTransformer/CollectionToArrayTransformer.php b/src/Symfony/Bridge/Doctrine/Form/DataTransformer/CollectionToArrayTransformer.php
@@ -24,8 +24,6 @@ class CollectionToArrayTransformer implements DataTransformerInterface
     /**
      * Transforms a collection into an array.
      *
-     * @return mixed
-     *
      * @throws TransformationFailedException
      */
     public function transform($collection)
@@ -48,9 +46,7 @@ public function transform($collection)
     }
 
     /**
-     * Transforms choice keys into entities.
-     *
-     * @param mixed $array An array of entities
+     * Transforms an array into a collection.
      *
      * @return Collection
      */
diff --git a/src/Symfony/Component/Config/Resource/GlobResource.php b/src/Symfony/Component/Config/Resource/GlobResource.php
@@ -109,7 +109,9 @@ public function getIterator(): \Traversable
         $prefix = str_replace('\\', '/', $this->prefix);
         $paths = null;
 
-        if (!str_starts_with($this->prefix, 'phar://') && !str_contains($this->pattern, '/**/')) {
+        if ('' === $this->pattern && is_file($prefix)) {
+            $paths = [$this->prefix];
+        } elseif (!str_starts_with($this->prefix, 'phar://') && !str_contains($this->pattern, '/**/')) {
             if ($this->globBrace || !str_contains($this->pattern, '{')) {
                 $paths = glob($this->prefix.$this->pattern, \GLOB_NOSORT | $this->globBrace);
             } elseif (!str_contains($this->pattern, '\\') || !preg_match('/\\\\[,{}]/', $this->pattern)) {
@@ -170,14 +172,21 @@ function (\SplFileInfo $file, $path) {
             throw new \LogicException(sprintf('Extended glob pattern "%s" cannot be used as the Finder component is not installed.', $this->pattern));
         }
 
+        if (is_file($prefix = $this->prefix)) {
+            $prefix = \dirname($prefix);
+            $pattern = basename($prefix).$this->pattern;
+        } else {
+            $pattern = $this->pattern;
+        }
+
         $finder = new Finder();
-        $regex = Glob::toRegex($this->pattern);
+        $regex = Glob::toRegex($pattern);
         if ($this->recursive) {
             $regex = substr_replace($regex, '(/|$)', -2, 1);
         }
 
-        $prefixLen = \strlen($this->prefix);
-        foreach ($finder->followLinks()->sortByName()->in($this->prefix) as $path => $info) {
+        $prefixLen = \strlen($prefix);
+        foreach ($finder->followLinks()->sortByName()->in($prefix) as $path => $info) {
             $normalizedPath = str_replace('\\', '/', $path);
             if (!preg_match($regex, substr($normalizedPath, $prefixLen)) || !$info->isFile()) {
                 continue;
diff --git a/src/Symfony/Component/Config/Tests/Fixtures/some.phar b/src/Symfony/Component/Config/Tests/Fixtures/some.phar
diff --git a/src/Symfony/Component/Config/Tests/Resource/GlobResourceTest.php b/src/Symfony/Component/Config/Tests/Resource/GlobResourceTest.php
@@ -208,4 +208,29 @@ public function testSerializeUnserialize()
 
         $this->assertEquals($p->getValue($resource), $p->getValue($newResource));
     }
+
+    public function testPhar()
+    {
+        $s = \DIRECTORY_SEPARATOR;
+        $cwd = getcwd();
+        chdir(\dirname(__DIR__).'/Fixtures');
+        try {
+            $resource = new GlobResource('phar://some.phar', '*', true);
+            $files = array_keys(iterator_to_array($resource));
+            $this->assertSame(["phar://some.phar{$s}ProjectWithXsdExtensionInPhar.php", "phar://some.phar{$s}schema{$s}project-1.0.xsd"], $files);
+
+            $resource = new GlobResource("phar://some.phar{$s}ProjectWithXsdExtensionInPhar.php", '', true);
+            $files = array_keys(iterator_to_array($resource));
+            $this->assertSame(["phar://some.phar{$s}ProjectWithXsdExtensionInPhar.php"], $files);
+        } finally {
+            chdir($cwd);
+        }
+    }
+
+    public function testFilePrefix()
+    {
+        $resource = new GlobResource(__FILE__, '/**/', true);
+        $files = array_keys(iterator_to_array($resource));
+        $this->assertSame([], $files);
+    }
 }
diff --git a/src/Symfony/Component/Mime/Test/Constraint/EmailHeaderSame.php b/src/Symfony/Component/Mime/Test/Constraint/EmailHeaderSame.php
@@ -55,12 +55,14 @@ protected function matches($message): bool
      */
     protected function failureDescription($message): string
     {
-        return sprintf('the Email %s (value is %s)', $this->toString(), $this->getHeaderValue($message));
+        return sprintf('the Email %s (value is %s)', $this->toString(), $this->getHeaderValue($message) ?? 'null');
     }
 
-    private function getHeaderValue($message): string
+    private function getHeaderValue($message): ?string
     {
-        $header = $message->getHeaders()->get($this->headerName);
+        if (null === $header = $message->getHeaders()->get($this->headerName)) {
+            return null;
+        }
 
         return $header instanceof UnstructuredHeader ? $header->getValue() : $header->getBodyAsString();
     }
diff --git a/src/Symfony/Component/Mime/Tests/EmailTest.php b/src/Symfony/Component/Mime/Tests/EmailTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Mime\Tests;
 
+use PHPUnit\Framework\ExpectationFailedException;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Mime\Address;
 use Symfony\Component\Mime\Email;
@@ -19,6 +20,7 @@
 use Symfony\Component\Mime\Part\Multipart\MixedPart;
 use Symfony\Component\Mime\Part\Multipart\RelatedPart;
 use Symfony\Component\Mime\Part\TextPart;
+use Symfony\Component\Mime\Test\Constraint\EmailHeaderSame;
 use Symfony\Component\PropertyInfo\Extractor\PhpDocExtractor;
 use Symfony\Component\Serializer\Encoder\JsonEncoder;
 use Symfony\Component\Serializer\Normalizer\ArrayDenormalizer;
@@ -458,4 +460,14 @@ public function testSymfonySerialize()
         $this->assertEquals($expected->getHeaders(), $n->getHeaders());
         $this->assertEquals($expected->getBody(), $n->getBody());
     }
+
+    public function testMissingHeaderDoesNotThrowError()
+    {
+        $this->expectException(ExpectationFailedException::class);
+        $this->expectExceptionMessage('Failed asserting that the Email has header "foo" with value "bar" (value is null).');
+
+        $e = new Email();
+        $emailHeaderSame = new EmailHeaderSame('foo', 'bar');
+        $emailHeaderSame->evaluate($e);
+    }
 }
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/ConstructorDummy.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/ConstructorDummy.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\PropertyInfo\Tests\Fixtures;
 
 /**
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/DockBlockFallback.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/DockBlockFallback.php
@@ -1,7 +1,5 @@
 <?php
 
-namespace Symfony\Component\PropertyInfo\Tests\Fixtures;
-
 /*
  * This file is part of the Symfony package.
  *
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Extractor/DummyNamespace.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Extractor/DummyNamespace.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace A {
     class Property {
 
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/NoProperties.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/NoProperties.php
@@ -1,7 +1,5 @@
 <?php
 
-namespace Symfony\Component\PropertyInfo\Tests\Fixtures;
-
 /*
  * This file is part of the Symfony package.
  *
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php80Dummy.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php80Dummy.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\PropertyInfo\Tests\Fixtures;
 
 class Php80Dummy
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php81Dummy.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php81Dummy.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\PropertyInfo\Tests\Fixtures;
 
 class Php81Dummy
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/PseudoTypeDummy.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/PseudoTypeDummy.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\PropertyInfo\Tests\Fixtures;
 
 class PseudoTypeDummy

Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,6 @@ class CollectionToArrayTransformer implements DataTransformerInterface`
`24`	`24`	`/**`
`25`	`25`	`* Transforms a collection into an array.`
`26`	`26`	`*`
`27`		`- * @return mixed`
`28`		`- *`
`29`	`27`	`* @throws TransformationFailedException`
`30`	`28`	`*/`
`31`	`29`	`public function transform($collection)`
`@@ -48,9 +46,7 @@ public function transform($collection)`
`48`	`46`	`}`
`49`	`47`
`50`	`48`	`/**`
`51`		`- * Transforms choice keys into entities.`
`52`		`- *`
`53`		`- * @param mixed $array An array of entities`
	`49`	`+ * Transforms an array into a collection.`
`54`	`50`	`*`
`55`	`51`	`* @return Collection`
`56`	`52`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -55,12 +55,14 @@ protected function matches($message): bool`
`55`	`55`	`*/`
`56`	`56`	`protected function failureDescription($message): string`
`57`	`57`	`{`
`58`		`- return sprintf('the Email %s (value is %s)', $this->toString(), $this->getHeaderValue($message));`
	`58`	`+ return sprintf('the Email %s (value is %s)', $this->toString(), $this->getHeaderValue($message) ?? 'null');`
`59`	`59`	`}`
`60`	`60`
`61`		`- private function getHeaderValue($message): string`
	`61`	`+ private function getHeaderValue($message): ?string`
`62`	`62`	`{`
`63`		`- $header = $message->getHeaders()->get($this->headerName);`
	`63`	`+ if (null === $header = $message->getHeaders()->get($this->headerName)) {`
	`64`	`+ return null;`
	`65`	`+ }`
`64`	`66`
`65`	`67`	`return $header instanceof UnstructuredHeader ? $header->getValue() : $header->getBodyAsString();`
`66`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,5 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace Symfony\Component\PropertyInfo\Tests\Fixtures;`
`4`		`-`
`5`	`3`	`/*`
`6`	`4`	`* This file is part of the Symfony package.`
`7`	`5`	`*`