From ecd56e5bfe67953f155da15d5c444a4d399ab06b Mon Sep 17 00:00:00 2001 From: Josh Richards Date: Thu, 30 May 2024 16:51:30 -0400 Subject: [PATCH] fixup: fixing same code (hopefully - updated composer) Signed-off-by: Josh Richards --- updater.phar | Bin 1173090 -> 1172936 bytes vendor/composer/ClassLoader.php | 96 +++++++++++++++----------------- vendor/composer/LICENSE | 2 + 3 files changed, 47 insertions(+), 51 deletions(-) diff --git a/updater.phar b/updater.phar index 86e6cfbbf07ca4e830f37d4bd1964f32d49206b5..2076a632f39013844dacd4d1178669978e7ed60f 100755 GIT binary patch delta 1088 zcmY*YT}TvB6mD!scXl`DgjsHFHd(N4X>R+Yo144aW*L=f=~`%HW6q|yq|A<$Y(GXt zFHtKOIuAub1U^($2u+1WP(h#%J{U#O4?PryQ4vu{P(d!jG16SRd=TF-*&O;lRLO)@%3Ya2ttI9TXeszMeP6cPAmbSY> zw%#jD`n*I-A)5j(K}rW^XuE0C&%|+W@RT>mP-Iceq%csh6xkFx6h;b;!bD-Fuu#mR z$Q|?s`2(uwHeYHWW9#Oq$~}HEW{xXz=f1s%_VvbML}*xxUk@8O?0>?ugpY9e$_`so zAvV?-S5}`}0dujZ7|QX+2tS`VBS!q{03KT_fg{6>i;r%mSweSIsBhR->J)lpDcX5Z zikk#&Et}qi21V}Oqx8yByCB8|QI^HNV*7fbINB-G+c8N|B-vpXsscLK-Mup`$~1$z zoUWRY&?71x_7cI)YY#5F!{JD4;kOG$o8FBj)kC`B01+b98C}H4y9PGheyanrv9%0% ztwYk%)TLA8bJN=YM}|k1gG*-(aVZu>=7_P7oZjxihsz8(25qpITLQxbnpynAaGX9$ zCr*{Xv&`5r&67aJS}fRK1{Qp~0_rkCt$H2QY%&4-SO!I;V}})Mov;PZ4&|~~cf!o2 zXqhA8!luo)utH7`YKp} zcSB&qn@N_%FK%eUS`Un)!wchj(sL#sg>q0dssNKGxg4yopmHzDVG#X6sKqmDU@88p zfP}8=`%lw~`@>+xLN~ol)q@yX1p|8Ze-_B@eimQ*VIFdov=G&D;e$%Jta&L`lYV%_ zU`rL;$#jv8p#Xf>T#Ti)7lpxu3q#r$n{Ikn7z)(QAsCq+3Qee(=2Xgwc{97DK71U3 zYJKdfmrT|)=i|*Ue4grUf~n6YPwC$F^0qe7=Td{!vvV%n`gWLqG`1hO?^6p57cYKj QZ~nb%G>iVjHR0OuUrK~$&;S4c delta 425 zcmX?c+WpZP_X+cPlFW<~P0f=G%q^3WCayL{<-ZC-;cxa}l(Ux9VPOCR5FOT*-n4`f z!dIHS(N<>jY@2FE$q5b+ArNgBD|a2HL>Z)HvbWtWfozBZ1`w?-`?IOp)V|%+o)L(d zfS4JGS%8=oh}nRc9f&!Am=lP(fS4PId4QM~i20VA+VhuhH`~Uq!!lioQ9yWm*)IM! zIg<^-C8pP@3m8q#3{{?f;5a|)Wd2aj>BrRt0^uT?c|(j?rswGhxJ(bw=hc{|C&00} zGr~!E`&@s4X4cJejg?%}*NgEBOjqz{;h6lPKxq1eI&Svq8;0j8W@_JDx_ouNTUu^u1TC;tR@tzyu5!cPC#b0C8=9y#N3J diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php index a72151c7..7824d8f7 100644 --- a/vendor/composer/ClassLoader.php +++ b/vendor/composer/ClassLoader.php @@ -45,35 +45,34 @@ class ClassLoader /** @var \Closure(string):void */ private static $includeFile; - /** @var ?string */ + /** @var string|null */ private $vendorDir; // PSR-4 /** - * @var array[] - * @psalm-var array> + * @var array> */ private $prefixLengthsPsr4 = array(); /** - * @var array[] - * @psalm-var array> + * @var array> */ private $prefixDirsPsr4 = array(); /** - * @var array[] - * @psalm-var array + * @var list */ private $fallbackDirsPsr4 = array(); // PSR-0 /** - * @var array[] - * @psalm-var array> + * List of PSR-0 prefixes + * + * Structured as array('F (first letter)' => array('Foo\Bar (full prefix)' => array('path', 'path2'))) + * + * @var array>> */ private $prefixesPsr0 = array(); /** - * @var array[] - * @psalm-var array + * @var list */ private $fallbackDirsPsr0 = array(); @@ -81,8 +80,7 @@ class ClassLoader private $useIncludePath = false; /** - * @var string[] - * @psalm-var array + * @var array */ private $classMap = array(); @@ -90,21 +88,20 @@ class ClassLoader private $classMapAuthoritative = false; /** - * @var bool[] - * @psalm-var array + * @var array */ private $missingClasses = array(); - /** @var ?string */ + /** @var string|null */ private $apcuPrefix; /** - * @var self[] + * @var array */ private static $registeredLoaders = array(); /** - * @param ?string $vendorDir + * @param string|null $vendorDir */ public function __construct($vendorDir = null) { @@ -113,7 +110,7 @@ public function __construct($vendorDir = null) } /** - * @return string[] + * @return array> */ public function getPrefixes() { @@ -125,8 +122,7 @@ public function getPrefixes() } /** - * @return array[] - * @psalm-return array> + * @return array> */ public function getPrefixesPsr4() { @@ -134,8 +130,7 @@ public function getPrefixesPsr4() } /** - * @return array[] - * @psalm-return array + * @return list */ public function getFallbackDirs() { @@ -143,8 +138,7 @@ public function getFallbackDirs() } /** - * @return array[] - * @psalm-return array + * @return list */ public function getFallbackDirsPsr4() { @@ -152,8 +146,7 @@ public function getFallbackDirsPsr4() } /** - * @return string[] Array of classname => path - * @psalm-return array + * @return array Array of classname => path */ public function getClassMap() { @@ -161,8 +154,7 @@ public function getClassMap() } /** - * @param string[] $classMap Class to filename map - * @psalm-param array $classMap + * @param array $classMap Class to filename map * * @return void */ @@ -179,24 +171,25 @@ public function addClassMap(array $classMap) * Registers a set of PSR-0 directories for a given prefix, either * appending or prepending to the ones previously set for this prefix. * - * @param string $prefix The prefix - * @param string[]|string $paths The PSR-0 root directories - * @param bool $prepend Whether to prepend the directories + * @param string $prefix The prefix + * @param list|string $paths The PSR-0 root directories + * @param bool $prepend Whether to prepend the directories * * @return void */ public function add($prefix, $paths, $prepend = false) { + $paths = (array) $paths; if (!$prefix) { if ($prepend) { $this->fallbackDirsPsr0 = array_merge( - (array) $paths, + $paths, $this->fallbackDirsPsr0 ); } else { $this->fallbackDirsPsr0 = array_merge( $this->fallbackDirsPsr0, - (array) $paths + $paths ); } @@ -205,19 +198,19 @@ public function add($prefix, $paths, $prepend = false) $first = $prefix[0]; if (!isset($this->prefixesPsr0[$first][$prefix])) { - $this->prefixesPsr0[$first][$prefix] = (array) $paths; + $this->prefixesPsr0[$first][$prefix] = $paths; return; } if ($prepend) { $this->prefixesPsr0[$first][$prefix] = array_merge( - (array) $paths, + $paths, $this->prefixesPsr0[$first][$prefix] ); } else { $this->prefixesPsr0[$first][$prefix] = array_merge( $this->prefixesPsr0[$first][$prefix], - (array) $paths + $paths ); } } @@ -226,9 +219,9 @@ public function add($prefix, $paths, $prepend = false) * Registers a set of PSR-4 directories for a given namespace, either * appending or prepending to the ones previously set for this namespace. * - * @param string $prefix The prefix/namespace, with trailing '\\' - * @param string[]|string $paths The PSR-4 base directories - * @param bool $prepend Whether to prepend the directories + * @param string $prefix The prefix/namespace, with trailing '\\' + * @param list|string $paths The PSR-4 base directories + * @param bool $prepend Whether to prepend the directories * * @throws \InvalidArgumentException * @@ -236,17 +229,18 @@ public function add($prefix, $paths, $prepend = false) */ public function addPsr4($prefix, $paths, $prepend = false) { + $paths = (array) $paths; if (!$prefix) { // Register directories for the root namespace. if ($prepend) { $this->fallbackDirsPsr4 = array_merge( - (array) $paths, + $paths, $this->fallbackDirsPsr4 ); } else { $this->fallbackDirsPsr4 = array_merge( $this->fallbackDirsPsr4, - (array) $paths + $paths ); } } elseif (!isset($this->prefixDirsPsr4[$prefix])) { @@ -256,18 +250,18 @@ public function addPsr4($prefix, $paths, $prepend = false) throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator."); } $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length; - $this->prefixDirsPsr4[$prefix] = (array) $paths; + $this->prefixDirsPsr4[$prefix] = $paths; } elseif ($prepend) { // Prepend directories for an already registered namespace. $this->prefixDirsPsr4[$prefix] = array_merge( - (array) $paths, + $paths, $this->prefixDirsPsr4[$prefix] ); } else { // Append directories for an already registered namespace. $this->prefixDirsPsr4[$prefix] = array_merge( $this->prefixDirsPsr4[$prefix], - (array) $paths + $paths ); } } @@ -276,8 +270,8 @@ public function addPsr4($prefix, $paths, $prepend = false) * Registers a set of PSR-0 directories for a given prefix, * replacing any others previously set for this prefix. * - * @param string $prefix The prefix - * @param string[]|string $paths The PSR-0 base directories + * @param string $prefix The prefix + * @param list|string $paths The PSR-0 base directories * * @return void */ @@ -294,8 +288,8 @@ public function set($prefix, $paths) * Registers a set of PSR-4 directories for a given namespace, * replacing any others previously set for this namespace. * - * @param string $prefix The prefix/namespace, with trailing '\\' - * @param string[]|string $paths The PSR-4 base directories + * @param string $prefix The prefix/namespace, with trailing '\\' + * @param list|string $paths The PSR-4 base directories * * @throws \InvalidArgumentException * @@ -481,9 +475,9 @@ public function findFile($class) } /** - * Returns the currently registered loaders indexed by their corresponding vendor directories. + * Returns the currently registered loaders keyed by their corresponding vendor directories. * - * @return self[] + * @return array */ public static function getRegisteredLoaders() { diff --git a/vendor/composer/LICENSE b/vendor/composer/LICENSE index 62ecfd8d..f27399a0 100644 --- a/vendor/composer/LICENSE +++ b/vendor/composer/LICENSE @@ -1,3 +1,4 @@ + Copyright (c) Nils Adermann, Jordi Boggiano Permission is hereby granted, free of charge, to any person obtaining a copy @@ -17,3 +18,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +