Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: symfony/finder
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v6.4.0
Choose a base ref
...
head repository: symfony/finder
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v7.0.0
Choose a head ref
  • 13 commits
  • 4 files changed
  • 4 contributors

Commits on May 23, 2023

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    661a9bd View commit details

Commits on Jul 5, 2023

  1. Copy the full SHA
    77d88df View commit details

Commits on Jul 6, 2023

  1. Merge branch '6.4' into 7.0

    * 6.4:
      [Finder] Fix initial directory is opened twice
      typo fix
      Fix test
      Fix some return types in tests
    nicolas-grekas committed Jul 6, 2023
    Copy the full SHA
    c8c88e6 View commit details

Commits on Jul 12, 2023

  1. Merge branch '6.4' into 7.0

    * 6.4:
      [PhpUnitBridge] Kill the last concurrent process when it stales for more than 60s
      [Intl] fix test
      [Intl] Use VarExporter::export() in PhpBundleWriter
      [Console] The application also catch `\Throwable` exceptions
      FrameworkBundle] Fix tests
      [Mailer] Fix Brevo transport factory registration
      Simplify tests
      [Notifier] Fix Esendex messages serialization
      Use triggering class to generate baseline for deprecation messages from DebugClassLoader
      [Security] Fix false-string handling in RememberMeAuthenticator
      [CssSelector] Tests on Xpath translator will always pass
      [Serializer] Fix Normalizer not utilizing converted name for index variadic param
      [DepdencyInjection] Fix costly logic when checking errored definitions
      Fix merge
      fix children cond
      [DoctrineBridge] Load refreshed user proxy
      [DependencyInjection] Don't ignore attributes on the actual decorator
      [FrameworkBundle] Prevent `cache:clear` to lose files on subsequent runs
    nicolas-grekas committed Jul 12, 2023
    Copy the full SHA
    85d4594 View commit details

Commits on Jul 13, 2023

  1. Merge branch '6.4' into 7.0

    * 6.4:
      Update FileProfilerStorage.php
      [Security] Allow custom scheme to be used as redirection URIs
      [Validator] Do not mock metadata factory on debug command tests
      [HttpKernel][WebProfilerBundle] Fix search feature
      [ErrorHandler] Avoid compile crash while trying to find candidate when a class is not found
      [Security] Make `PersistentToken` immutable and tell `TokenProviderInterface::updateToken()` implementations should accept `DateTimeInterface`
      do not listen to signals if the pcntl extension is missing
      [DependencyInjection] Improve reporting named autowiring aliases
      [DependencyInjection] Make better use of memory and CPU during auto-discovery
      update Intl component to take into account B-variant when converting Alpha3 to Alpha2. fixing issue with Darwin.
      [VarDumper] Fix dumping `ArrayObject` with `DumpDataCollector`
      [VarDumper] Add tests to demonstrate a bug when dumping ArrayObject with full stack fmk
      [DebugBundle][FrameworkBundle] Fix using the framework without the Console component
      [FrameworkBundle] Add missing monolog channel tag to the `messenger:failed:retry` command
      fetch all known ChoiceType values at once
      [RateLimiter] fix incorrect retryAfter of FixedWindow
      Fix Finder phpdoc
      [TwigBundle] Allow omitting the `autoescape_service_method` option when `autoescape_service` is set to an invokable service id
      [PropertyAccess] Auto-cast from/to DateTime/Immutable when appropriate
    nicolas-grekas committed Jul 13, 2023
    Copy the full SHA
    e6fdcb6 View commit details

Commits on Jul 25, 2023

  1. Merge branch '6.4' into 7.0

    * 6.4:
      Use typed properties in tests as much as possible
    nicolas-grekas committed Jul 25, 2023
    Copy the full SHA
    b543ec1 View commit details
  2. Merge branch '6.4' into 7.0

    * 6.4:
      fix typo
      Add types to private and internal properties
      [Workflow] Cleaning code
      [Scheduler] Fix NPE in debug:scheduler command
    nicolas-grekas committed Jul 25, 2023
    Copy the full SHA
    67cd516 View commit details

Commits on Jul 27, 2023

  1. Copy the full SHA
    fa96592 View commit details

Commits on Jul 31, 2023

  1. Merge branch '6.4' into 7.0

    * 6.4:
      Revert "minor #50885 [Finder] Fix children condition in ExcludeDirectoryFilterIterator (mvorisek)"
    fabpot committed Jul 31, 2023
    Copy the full SHA
    16ee262 View commit details

Commits on Sep 27, 2023

  1. Merge branch '6.4' into 7.0

    * 6.4: (32 commits)
      [Validator] Fix registering "is_valid()" for `#[Expression]`
      [Scheduler] Trigger unique messages at runtime
      [Scheduler] Fix CHANGELOG
      [Clock] Add `DatePoint`: an immutable DateTime implementation with stricter error handling and return types
      [Scheduler] Allow modifying the schedule at runtime and recalculate heap
      [Cache] Fix Redis6Proxy
      [Finder] Disable failing test about open_basedir
      Fix merge
      Fix merge
      Minor CS fixes
      Deprecate `Kernel::stripComments()`
      Remove setAccessible reflection call in tests
      [Notifier] Telegram Bridge add escaping for \
      [Component][AssertMapper] add type hint of an argument in asset mapper command
      [Translation] [Phrase] Refacto ReadConfig and WriteConfig into arrays
      [Routing] Fix routing collection defaults when adding a new route to a collection
      [Messenger] Fix cloned TraceableStack not unstacking the stack independently
      [Translation] Add `--as-tree` option  to `translation:pull` command
      [Mime] Allow to add some headers as a strings
      [Translation] Give current locale to locale switcher runWithLocale callback
      ...
    nicolas-grekas committed Sep 27, 2023
    Copy the full SHA
    0d89af5 View commit details

Commits on Oct 12, 2023

  1. Merge branch '6.4' into 7.0

    * 6.4: (47 commits)
      Sync .github/expected-missing-return-types.diff
      [FrameworkBundle] Add void return-type to ErrorLoggerCompilerPass
      [DoctrineBridge] Fix cross-versions compat
      [HttpKernel] Handle nullable callback of StreamedResponse
      [Mailer] Capitalize sender header for Mailgun
      [FrameworkBundle] Configure `logger` as error logger if the Monolog Bundle is not registered
      DX: PHP CS Fixer - drop explicit nullable_type_declaration_for_default_null_value config, as it's part of ruleset anyway
      DX: PHP CS Fixer - drop explicit no_superfluous_phpdoc_tags config, as it's part of ruleset already
      [DI] Simplify using DI attributes with `ServiceLocator/Iterator`'s
      [FrameworkBundle] Fix registering workflow.registry
      Revert "Add keyword `dev` to leverage composer hint"
      [Validator] Add missing Ukrainian translations #51960
      [Validator] Add missing translations for Indonesian (id)
      [Validator] Add missing translations for Vietnamese (VI)
      Add missing Validator translations - Croatian (hr)
      [HttpFoundation]  Improve PHPDoc of Cache attribute
      [Validator] Add missing Spanish (es) translations #51956
      [Serializer] Add `XmlEncoder::CDATA_WRAPPING` context option
      [Finder] Add early directory prunning filter support
      Add missing dutch translations
      ...
    nicolas-grekas committed Oct 12, 2023
    Copy the full SHA
    eb22b4c View commit details

Commits on Oct 31, 2023

  1. Copy the full SHA
    5f0714c View commit details
  2. Merge branch '6.4' into 7.0

    * 6.4:
      fix typo
      remove the WriteConfig class
      DX: PHP CS Fixer - keep Annotation,NamedArgumentConstructor,Target annotations as single group
      do not install FrameworkBundle 6.4
      [Tests] Add `array` return type for provider methods
      [Tests] Move expectException closer to the place of the expectation to avoid false positives
    xabbuh committed Oct 31, 2023
    Copy the full SHA
    6e5688d View commit details
Showing with 8 additions and 18 deletions.
  1. +2 −5 Finder.php
  2. +3 −7 Iterator/MultiplePcreFilterIterator.php
  3. +1 −4 Tests/Iterator/MultiplePcreFilterIteratorTest.php
  4. +2 −2 composer.json
7 changes: 2 additions & 5 deletions Finder.php
Original file line number Diff line number Diff line change
@@ -397,10 +397,8 @@ public function ignoreVCSIgnored(bool $ignoreVCSIgnored): static
* @see ignoreVCS()
*
* @param string|string[] $pattern VCS patterns to ignore
*
* @return void
*/
public static function addVCSPattern(string|array $pattern)
public static function addVCSPattern(string|array $pattern): void
{
foreach ((array) $pattern as $p) {
self::$vcsPatterns[] = $p;
@@ -588,9 +586,8 @@ public function sortByModifiedTime(): static
*
* @see CustomFilterIterator
*/
public function filter(\Closure $closure /* , bool $prune = false */): static
public function filter(\Closure $closure, bool $prune = false): static
{
$prune = 1 < \func_num_args() ? func_get_arg(1) : false;
$this->filters[] = $closure;

if ($prune) {
10 changes: 3 additions & 7 deletions Iterator/MultiplePcreFilterIterator.php
Original file line number Diff line number Diff line change
@@ -23,8 +23,8 @@
*/
abstract class MultiplePcreFilterIterator extends \FilterIterator
{
protected $matchRegexps = [];
protected $noMatchRegexps = [];
protected array $matchRegexps = [];
protected array $noMatchRegexps = [];

/**
* @param \Iterator<TKey, TValue> $iterator The Iterator to filter
@@ -80,11 +80,7 @@ protected function isAccepted(string $string): bool
*/
protected function isRegex(string $str): bool
{
$availableModifiers = 'imsxuADU';

if (\PHP_VERSION_ID >= 80200) {
$availableModifiers .= 'n';
}
$availableModifiers = 'imsxuADUn';

if (preg_match('/^(.{3,}?)['.$availableModifiers.']*$/', $str, $m)) {
$start = substr($m[1], 0, 1);
5 changes: 1 addition & 4 deletions Tests/Iterator/MultiplePcreFilterIteratorTest.php
Original file line number Diff line number Diff line change
@@ -43,10 +43,7 @@ public static function getIsRegexFixtures()
yield ['<foo>', true, '"<,>" is a valid delimiter pair'];
yield ['*foo.*', false, '"*" is not considered as a valid delimiter'];
yield ['?foo.?', false, '"?" is not considered as a valid delimiter'];

if (\PHP_VERSION_ID >= 80200) {
yield ['/foo/n', true, 'valid regex with the no-capture modifier'];
}
yield ['/foo/n', true, 'valid regex with the no-capture modifier'];
}
}

4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
@@ -16,10 +16,10 @@
}
],
"require": {
"php": ">=8.1"
"php": ">=8.2"
},
"require-dev": {
"symfony/filesystem": "^6.0|^7.0"
"symfony/filesystem": "^6.4|^7.0"
},
"autoload": {
"psr-4": { "Symfony\\Component\\Finder\\": "" },