New upstream version 6.0.0

.github/CONTRIBUTING.md

+# Contributing to `phpunit/php-file-iterator`
+
+## Welcome!
+
+We look forward to your contributions! Here are some examples how you can contribute:
+
+* [Report a bug](https://github.com/sebastianbergmann/php-file-iterator/issues/new)
+* [Send a pull request to fix a bug](https://github.com/sebastianbergmann/php-file-iterator/pulls)
+
+Please do not send pull requests that expand the scope of this project (see below).
+
+
+## Any contributions you make will be under the BSD-3-Clause License
+
+When you submit code changes, your submissions are understood to be under the same [BSD-3-Clause License](https://github.com/sebastianbergmann/php-file-iterator/blob/main/LICENSE) that covers the project. By contributing to this project, you agree that your contributions will be licensed under its BSD-3-Clause License.
+
+
+## Write bug reports with detail, background, and sample code
+
+[This is an example](https://github.com/sebastianbergmann/phpunit/issues/4376) of a bug report I wrote, and I think it's not too bad.
+
+In your bug report, please provide the following:
+
+* A quick summary and/or background
+* Steps to reproduce
+    * Be specific!
+    * Give sample code if you can.
+* What you expected would happen
+* What actually happens
+* Notes (possibly including why you think this might be happening, or stuff you tried that didn't work)
+
+Please post code and output as text ([using proper markup](https://guides.github.com/features/mastering-markdown/)). Do not post screenshots of code or output.
+
+
+## Workflow for Pull Requests
+
+1. Fork the repository.
+2. Create your branch from the oldest branch that is affected by the bug you plan to fix.
+3. Implement your change and add tests for it.
+4. Ensure the test suite passes.
+5. Ensure the code complies with our coding guidelines (see below).
+6. Send that pull request!
+
+Please make sure you have [set up your username and email address](https://git-scm.com/book/en/v2/Getting-Started-First-Time-Git-Setup) for use with Git. Strings such as `silly nick name <root@localhost>` look really stupid in the commit history of a project.
+
+We encourage you to [sign your Git commits with your GPG key](https://docs.github.com/en/github/authenticating-to-github/signing-commits).
+
+
+## Development
+
+This project uses [PHPUnit](https://phpunit.de/) for testing:
+
+```shell
+./vendor/bin/phpunit
+```
+
+This project uses [PHPStan](https://phpstan.org/) for static analysis:
+
+```shell
+./tools/phpstan
+```
+
+This project uses [PHP-CS-Fixer](https://cs.symfony.com/) to enforce coding guidelines:
+
+```shell
+./tools/php-cs-fixer fix
+```
+
+The commands shown above require an autoloader script at `vendor/autoload.php`. This can be generated like so:
+
+```shell
+./tools/composer dump-autoload
+```
+
+Please understand that we will not accept a pull request when its changes violate this project's coding guidelines or break the test suite.

.github/workflows/ci.yml

@@ -7,7 +7,7 @@ on:
 name: "CI"
 
 env:
-  COMPOSER_ROOT_VERSION: "5.0-dev"
+  COMPOSER_ROOT_VERSION: "6.0.x-dev"
 
 permissions:
   contents: read
@@ -61,9 +61,9 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "8.2"
           - "8.3"
           - "8.4"
+          - "8.5"
 
     steps:
       - name: "Checkout"

.phive/phars.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="php-cs-fixer" version="^3.59" installed="3.63.1" location="./tools/php-cs-fixer" copy="true"/>
-  <phar name="composer" version="^2.7" installed="2.7.8" location="./tools/composer" copy="true"/>
-  <phar name="phpstan" version="^1.11" installed="1.11.11" location="./tools/phpstan" copy="true"/>
+  <phar name="php-cs-fixer" version="^3.64" installed="3.68.0" location="./tools/php-cs-fixer" copy="true"/>
+  <phar name="composer" version="^2.8" installed="2.8.4" location="./tools/composer" copy="true"/>
+  <phar name="phpstan" version="^2.0" installed="2.1.1" location="./tools/phpstan" copy="true"/>
 </phive>

.php-cs-fixer.dist.php

@@ -99,7 +99,7 @@ $config->setFinder($finder)
         'explicit_string_variable' => true,
         'fopen_flag_order' => true,
         'full_opening_tag' => true,
-        'fully_qualified_strict_types' => true,
+        'fully_qualified_strict_types' => ['import_symbols' => true],
         'function_declaration' => true,
         'function_to_constant' => true,
         'get_class_to_class_keyword' => true,
@@ -135,7 +135,7 @@ $config->setFinder($finder)
         'modernize_types_casting' => true,
         'multiline_comment_opening_closing' => true,
         'multiline_whitespace_before_semicolons' => true,
-        'native_constant_invocation' => false,
+        'native_constant_invocation' => true,
         'native_function_casing' => false,
         'native_function_invocation' => [
             'include' => [
@@ -158,7 +158,23 @@ $config->setFinder($finder)
         'no_empty_comment' => true,
         'no_empty_phpdoc' => true,
         'no_empty_statement' => true,
-        'no_extra_blank_lines' => true,
+        'no_extra_blank_lines' => [
+            'tokens' => [
+                'attribute',
+                'break',
+                'case',
+                'continue',
+                'curly_brace_block',
+                'default',
+                'extra',
+                'parenthesis_brace_block',
+                'return',
+                'square_brace_block',
+                'switch',
+                'throw',
+                'use',
+            ],
+        ],
         'no_homoglyph_names' => true,
         'no_leading_import_slash' => true,
         'no_leading_namespace_whitespace' => true,
@@ -197,6 +213,7 @@ $config->setFinder($finder)
         'no_whitespace_in_blank_line' => true,
         'non_printable_character' => true,
         'normalize_index_brace' => true,
+        'nullable_type_declaration_for_default_null_value' => true,
         'object_operator_without_whitespace' => true,
         'octal_notation' => true,
         'operator_linebreak' => [
@@ -340,6 +357,8 @@ $config->setFinder($finder)
         'whitespace_after_comma_in_array' => true,
     ]);
 
-$config->setCacheFile(__DIR__ . '/.php-cs-fixer.cache/' . sha1(@trim((string) @shell_exec('git rev-parse --abbrev-ref HEAD'))));
+$config->setCacheFile(__DIR__ . '/.php-cs-fixer.cache/' . json_decode((string) @file_get_contents('composer.json'), true)["extra"]["branch-alias"]["dev-main"] ?? 'unknown');
+
+$config->setParallelConfig(\PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect());
 
 return $config;

ChangeLog.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [6.0.0] - 2025-02-07
+
+### Removed
+
+* This component is no longer supported on PHP 8.2
+
 ## [5.1.0] - 2024-08-27
 
 ### Added
@@ -168,6 +174,7 @@ No changes
 
 * [#23](https://github.com/sebastianbergmann/php-file-iterator/pull/23): Added support for wildcards (glob) in exclude
 
+[6.0.0]: https://github.com/sebastianbergmann/php-file-iterator/compare/5.1...6.0.0
 [5.1.0]: https://github.com/sebastianbergmann/php-file-iterator/compare/5.0.1...5.1.0
 [5.0.1]: https://github.com/sebastianbergmann/php-file-iterator/compare/5.0.0...5.0.1
 [5.0.0]: https://github.com/sebastianbergmann/php-file-iterator/compare/4.1...5.0.0

LICENSE

 BSD 3-Clause License
 
-Copyright (c) 2009-2024, Sebastian Bergmann
+Copyright (c) 2009-2025, Sebastian Bergmann
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

composer.json

@@ -21,17 +21,17 @@
     },
     "config": {
         "platform": {
-            "php": "8.2.0"
+            "php": "8.3.0"
         },
         "optimize-autoloader": true,
         "sort-packages": true
     },
     "prefer-stable": true,
     "require": {
-        "php": ">=8.2"
+        "php": ">=8.3"
     },
     "require-dev": {
-        "phpunit/phpunit": "^11.0"
+        "phpunit/phpunit": "^12.0"
     },
     "autoload": {
         "classmap": [
@@ -40,7 +40,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "5.0-dev"
+            "dev-main": "6.0-dev"
         }
     }
 }

phpstan.neon

 parameters:
-    level: 9
+    level: 10
     paths:
         - src
         - tests

phpunit.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
-         bootstrap="vendor/autoload.php"
          cacheDirectory=".phpunit.cache"
          executionOrder="depends,defects"
          requireCoverageMetadata="true"
          beStrictAboutCoverageMetadata="true"
          beStrictAboutOutputDuringTests="true"
+         displayDetailsOnPhpunitDeprecations="true"
+         failOnPhpunitDeprecation="true"
          failOnRisky="true"
          failOnWarning="true"
          colors="true">

src/Factory.php

@@ -37,6 +37,8 @@ final class Factory
      * @param list<non-empty-string>|string           $suffixes
      * @param list<non-empty-string>|string           $prefixes
      * @param list<non-empty-string>                  $exclude
+     *
+     * @phpstan-ignore missingType.generics
      */
     public function getFileIterator(array|string $paths, array|string $suffixes = '', array|string $prefixes = '', array $exclude = []): AppendIterator
     {
@@ -113,7 +115,7 @@ final class Factory
      *
      * @return list<string>
      */
-    private function globstar(string $pattern)
+    private function globstar(string $pattern): array
     {
         if (stripos($pattern, '**') === false) {
             $files = glob($pattern, GLOB_ONLYDIR);
@@ -125,23 +127,24 @@ final class Factory
             $patterns = [$rootPattern . $restPattern];
             $rootPattern .= '/*';
 
-            while ($dirs = glob($rootPattern, GLOB_ONLYDIR)) {
+            while ($directories = glob($rootPattern, GLOB_ONLYDIR)) {
                 $rootPattern .= '/*';
 
-                foreach ($dirs as $dir) {
-                    $patterns[] = $dir . $restPattern;
+                foreach ($directories as $directory) {
+                    $patterns[] = $directory . $restPattern;
                 }
             }
 
             $files = [];
 
-            foreach ($patterns as $pat) {
-                $files = array_merge($files, $this->globstar($pat));
+            foreach ($patterns as $_pattern) {
+                $files = array_merge($files, $this->globstar($_pattern));
             }
         }
 
         if ($files !== false) {
             $files = array_unique($files);
+
             sort($files);
 
             return $files;

src/Iterator.php

@@ -9,7 +9,6 @@
  */
 namespace SebastianBergmann\FileIterator;
 
-use function assert;
 use function preg_match;
 use function realpath;
 use function str_ends_with;
@@ -25,8 +24,8 @@ use SplFileInfo;
  */
 final class Iterator extends FilterIterator
 {
-    public const PREFIX = 0;
-    public const SUFFIX = 1;
+    public const int PREFIX = 0;
+    public const int SUFFIX = 1;
     private false|string $basePath;
 
     /**
@@ -56,8 +55,6 @@ final class Iterator extends FilterIterator
     {
         $current = $this->getInnerIterator()->current();
 
-        assert($current instanceof SplFileInfo);
-
         $filename = $current->getFilename();
         $realPath = $current->getRealPath();
 

tests/unit/FacadeTest.php

@@ -138,7 +138,6 @@ final class FacadeTest extends TestCase
             ],
             'globstar, filter prefix: no, filter suffix: no, excludes: none' => [
                 [
-
                     $fixtureDirectoryRealpath . '/a/c/d/i/PrefixSuffix.php',
                     $fixtureDirectoryRealpath . '/b/e/g/i/PrefixSuffix.php',
                     $fixtureDirectoryRealpath . '/b/e/i/PrefixSuffix.php',