From 82870dce4bf932bd6f9a8ffc0c19f00c9591a5b9 Mon Sep 17 00:00:00 2001
From: Brian Weaver <weaver.299@osu.edu>
Date: Thu, 4 Mar 2021 11:15:37 -0500
Subject: [PATCH] Update symfony/finder
---
composer.lock | 15 +++++++-----
vendor/composer/InstalledVersions.php | 10 ++++----
vendor/composer/installed.json | 17 ++++++++------
vendor/composer/installed.php | 10 ++++----
.../finder/Comparator/DateComparator.php | 2 +-
.../finder/Comparator/NumberComparator.php | 2 +-
vendor/symfony/finder/Finder.php | 23 +++++++++++--------
.../Iterator/FileTypeFilterIterator.php | 4 ++--
.../finder/Iterator/SortableIterator.php | 14 +++++------
vendor/symfony/finder/LICENSE | 2 +-
vendor/symfony/finder/composer.json | 2 +-
11 files changed, 56 insertions(+), 45 deletions(-)
diff --git a/composer.lock b/composer.lock
index 55c0610b13..f2a7ee0f4d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -13589,16 +13589,16 @@
},
{
"name": "symfony/finder",
- "version": "v4.4.17",
+ "version": "v4.4.19",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "9f1d1d883b79a91ef320c0c6e803494e042ef36e"
+ "reference": "25d79cfccfc12e84e7a63a248c3f0720fdd92db6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/9f1d1d883b79a91ef320c0c6e803494e042ef36e",
- "reference": "9f1d1d883b79a91ef320c0c6e803494e042ef36e",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/25d79cfccfc12e84e7a63a248c3f0720fdd92db6",
+ "reference": "25d79cfccfc12e84e7a63a248c3f0720fdd92db6",
"shasum": ""
},
"require": {
@@ -13627,8 +13627,11 @@
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony Finder Component",
+ "description": "Finds files and directories via an intuitive fluent interface",
"homepage": "https://symfony.com",
+ "support": {
+ "source": "https://github.com/symfony/finder/tree/v4.4.19"
+ },
"funding": [
{
"url": "https://symfony.com/sponsor",
@@ -13643,7 +13646,7 @@
"type": "tidelift"
}
],
- "time": "2020-11-17T19:45:34+00:00"
+ "time": "2021-01-27T09:09:26+00:00"
},
{
"name": "symfony/http-foundation",
diff --git a/vendor/composer/InstalledVersions.php b/vendor/composer/InstalledVersions.php
index 4fad960d5c..eec78f5f11 100644
--- a/vendor/composer/InstalledVersions.php
+++ b/vendor/composer/InstalledVersions.php
@@ -19,7 +19,7 @@ class InstalledVersions
'aliases' =>
array (
),
- 'reference' => 'bc97448d30579f8782c495ea4d1603e20c03cabb',
+ 'reference' => '74792cb8883f86c37e13f5ffccd4a9b988729db6',
'name' => 'osu-asc-webservices/d8-upstream',
),
'versions' =>
@@ -2384,7 +2384,7 @@ class InstalledVersions
'aliases' =>
array (
),
- 'reference' => 'bc97448d30579f8782c495ea4d1603e20c03cabb',
+ 'reference' => '74792cb8883f86c37e13f5ffccd4a9b988729db6',
),
'pantheon-systems/quicksilver-pushback' =>
array (
@@ -2953,12 +2953,12 @@ class InstalledVersions
),
'symfony/finder' =>
array (
- 'pretty_version' => 'v4.4.17',
- 'version' => '4.4.17.0',
+ 'pretty_version' => 'v4.4.19',
+ 'version' => '4.4.19.0',
'aliases' =>
array (
),
- 'reference' => '9f1d1d883b79a91ef320c0c6e803494e042ef36e',
+ 'reference' => '25d79cfccfc12e84e7a63a248c3f0720fdd92db6',
),
'symfony/http-foundation' =>
array (
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index a84327695d..6e067fda74 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -14220,23 +14220,23 @@
},
{
"name": "symfony/finder",
- "version": "v4.4.17",
- "version_normalized": "4.4.17.0",
+ "version": "v4.4.19",
+ "version_normalized": "4.4.19.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "9f1d1d883b79a91ef320c0c6e803494e042ef36e"
+ "reference": "25d79cfccfc12e84e7a63a248c3f0720fdd92db6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/9f1d1d883b79a91ef320c0c6e803494e042ef36e",
- "reference": "9f1d1d883b79a91ef320c0c6e803494e042ef36e",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/25d79cfccfc12e84e7a63a248c3f0720fdd92db6",
+ "reference": "25d79cfccfc12e84e7a63a248c3f0720fdd92db6",
"shasum": ""
},
"require": {
"php": ">=7.1.3"
},
- "time": "2020-11-17T19:45:34+00:00",
+ "time": "2021-01-27T09:09:26+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -14261,8 +14261,11 @@
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony Finder Component",
+ "description": "Finds files and directories via an intuitive fluent interface",
"homepage": "https://symfony.com",
+ "support": {
+ "source": "https://github.com/symfony/finder/tree/v4.4.19"
+ },
"funding": [
{
"url": "https://symfony.com/sponsor",
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
index d8405c1eb3..6f80b02e26 100644
--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -6,7 +6,7 @@
'aliases' =>
array (
),
- 'reference' => 'bc97448d30579f8782c495ea4d1603e20c03cabb',
+ 'reference' => '74792cb8883f86c37e13f5ffccd4a9b988729db6',
'name' => 'osu-asc-webservices/d8-upstream',
),
'versions' =>
@@ -2371,7 +2371,7 @@
'aliases' =>
array (
),
- 'reference' => 'bc97448d30579f8782c495ea4d1603e20c03cabb',
+ 'reference' => '74792cb8883f86c37e13f5ffccd4a9b988729db6',
),
'pantheon-systems/quicksilver-pushback' =>
array (
@@ -2940,12 +2940,12 @@
),
'symfony/finder' =>
array (
- 'pretty_version' => 'v4.4.17',
- 'version' => '4.4.17.0',
+ 'pretty_version' => 'v4.4.19',
+ 'version' => '4.4.19.0',
'aliases' =>
array (
),
- 'reference' => '9f1d1d883b79a91ef320c0c6e803494e042ef36e',
+ 'reference' => '25d79cfccfc12e84e7a63a248c3f0720fdd92db6',
),
'symfony/http-foundation' =>
array (
diff --git a/vendor/symfony/finder/Comparator/DateComparator.php b/vendor/symfony/finder/Comparator/DateComparator.php
index d17c77a9d3..ae22c6cbec 100644
--- a/vendor/symfony/finder/Comparator/DateComparator.php
+++ b/vendor/symfony/finder/Comparator/DateComparator.php
@@ -36,7 +36,7 @@ public function __construct(string $test)
throw new \InvalidArgumentException(sprintf('"%s" is not a valid date.', $matches[2]));
}
- $operator = isset($matches[1]) ? $matches[1] : '==';
+ $operator = $matches[1] ?? '==';
if ('since' === $operator || 'after' === $operator) {
$operator = '>';
}
diff --git a/vendor/symfony/finder/Comparator/NumberComparator.php b/vendor/symfony/finder/Comparator/NumberComparator.php
index 80667c9ddd..78e1bd3b34 100644
--- a/vendor/symfony/finder/Comparator/NumberComparator.php
+++ b/vendor/symfony/finder/Comparator/NumberComparator.php
@@ -74,6 +74,6 @@ public function __construct(?string $test)
}
$this->setTarget($target);
- $this->setOperator(isset($matches[1]) ? $matches[1] : '==');
+ $this->setOperator($matches[1] ?? '==');
}
}
diff --git a/vendor/symfony/finder/Finder.php b/vendor/symfony/finder/Finder.php
index cf91436214..4cf723bf33 100644
--- a/vendor/symfony/finder/Finder.php
+++ b/vendor/symfony/finder/Finder.php
@@ -38,9 +38,9 @@
*/
class Finder implements \IteratorAggregate, \Countable
{
- const IGNORE_VCS_FILES = 1;
- const IGNORE_DOT_FILES = 2;
- const IGNORE_VCS_IGNORED_FILES = 4;
+ public const IGNORE_VCS_FILES = 1;
+ public const IGNORE_DOT_FILES = 2;
+ public const IGNORE_VCS_IGNORED_FILES = 4;
private $mode = 0;
private $names = [];
@@ -624,7 +624,13 @@ public function getIterator()
}
if (1 === \count($this->dirs) && 0 === \count($this->iterators)) {
- return $this->searchInDirectory($this->dirs[0]);
+ $iterator = $this->searchInDirectory($this->dirs[0]);
+
+ if ($this->sort || $this->reverseSorting) {
+ $iterator = (new Iterator\SortableIterator($iterator, $this->sort, $this->reverseSorting))->getIterator();
+ }
+
+ return $iterator;
}
$iterator = new \AppendIterator();
@@ -636,6 +642,10 @@ public function getIterator()
$iterator->append($it);
}
+ if ($this->sort || $this->reverseSorting) {
+ $iterator = (new Iterator\SortableIterator($iterator, $this->sort, $this->reverseSorting))->getIterator();
+ }
+
return $iterator;
}
@@ -782,11 +792,6 @@ private function searchInDirectory(string $dir): \Iterator
$iterator = new Iterator\PathFilterIterator($iterator, $this->paths, $notPaths);
}
- if ($this->sort || $this->reverseSorting) {
- $iteratorAggregate = new Iterator\SortableIterator($iterator, $this->sort, $this->reverseSorting);
- $iterator = $iteratorAggregate->getIterator();
- }
-
return $iterator;
}
diff --git a/vendor/symfony/finder/Iterator/FileTypeFilterIterator.php b/vendor/symfony/finder/Iterator/FileTypeFilterIterator.php
index a4c4eec72e..0ea2c50880 100644
--- a/vendor/symfony/finder/Iterator/FileTypeFilterIterator.php
+++ b/vendor/symfony/finder/Iterator/FileTypeFilterIterator.php
@@ -18,8 +18,8 @@
*/
class FileTypeFilterIterator extends \FilterIterator
{
- const ONLY_FILES = 1;
- const ONLY_DIRECTORIES = 2;
+ public const ONLY_FILES = 1;
+ public const ONLY_DIRECTORIES = 2;
private $mode;
diff --git a/vendor/symfony/finder/Iterator/SortableIterator.php b/vendor/symfony/finder/Iterator/SortableIterator.php
index 8f0090c746..dd9ae4ae41 100644
--- a/vendor/symfony/finder/Iterator/SortableIterator.php
+++ b/vendor/symfony/finder/Iterator/SortableIterator.php
@@ -18,13 +18,13 @@
*/
class SortableIterator implements \IteratorAggregate
{
- const SORT_BY_NONE = 0;
- const SORT_BY_NAME = 1;
- const SORT_BY_TYPE = 2;
- const SORT_BY_ACCESSED_TIME = 3;
- const SORT_BY_CHANGED_TIME = 4;
- const SORT_BY_MODIFIED_TIME = 5;
- const SORT_BY_NAME_NATURAL = 6;
+ public const SORT_BY_NONE = 0;
+ public const SORT_BY_NAME = 1;
+ public const SORT_BY_TYPE = 2;
+ public const SORT_BY_ACCESSED_TIME = 3;
+ public const SORT_BY_CHANGED_TIME = 4;
+ public const SORT_BY_MODIFIED_TIME = 5;
+ public const SORT_BY_NAME_NATURAL = 6;
private $iterator;
private $sort;
diff --git a/vendor/symfony/finder/LICENSE b/vendor/symfony/finder/LICENSE
index 9e936ec044..9ff2d0d630 100644
--- a/vendor/symfony/finder/LICENSE
+++ b/vendor/symfony/finder/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2020 Fabien Potencier
+Copyright (c) 2004-2021 Fabien Potencier
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/vendor/symfony/finder/composer.json b/vendor/symfony/finder/composer.json
index 7a696aa7fe..c86ad2cda0 100644
--- a/vendor/symfony/finder/composer.json
+++ b/vendor/symfony/finder/composer.json
@@ -1,7 +1,7 @@
{
"name": "symfony/finder",
"type": "library",
- "description": "Symfony Finder Component",
+ "description": "Finds files and directories via an intuitive fluent interface",
"keywords": [],
"homepage": "https://symfony.com",
"license": "MIT",
--
GitLab