Merge branch '6.0' into 6.1

* 6.0:
  [VarDumper] fix tests on PHP 8.2
  [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)"

Author: nicolas-grekas

Resource/GlobResource.php

@@ -106,7 +106,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)) {
@@ -167,12 +169,19 @@ function (\SplFileInfo $file, $path) {
             throw new \LogicException(sprintf('Extended glob pattern "%s" cannot be used as the Finder component is not installed.', $this->pattern));
         }
 
-        $regex = Glob::toRegex($this->pattern);
+        if (is_file($prefix = $this->prefix)) {
+            $prefix = \dirname($prefix);
+            $pattern = basename($prefix).$this->pattern;
+        } else {
+            $pattern = $this->pattern;
+        }
+
+        $regex = Glob::toRegex($pattern);
         if ($this->recursive) {
             $regex = substr_replace($regex, '(/|$)', -2, 1);
         }
 
-        $prefixLen = \strlen($this->prefix);
+        $prefixLen = \strlen($prefix);
 
         yield from (new Finder())
             ->followLinks()
@@ -190,7 +199,7 @@ function (\SplFileInfo $file, $path) {
                 }
             })
             ->sortByName()
-            ->in($this->prefix)
+            ->in($prefix)
         ;
     }
 

Tests/Fixtures/some.phar

@@ -205,4 +205,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);
+    }
 }