From efb6c11ad4f6ed34ce3f70e041d59fef7b7dc9c4 Mon Sep 17 00:00:00 2001 From: Marcel Klehr Date: Thu, 4 May 2023 11:37:42 +0200 Subject: [PATCH 1/3] enh(execute): Let user know how to reset when a step has been cancelled in progress Signed-off-by: Marcel Klehr --- index.php | 10 ++++++++-- index.web.php | 5 +++-- lib/UpdateCommand.php | 5 +++-- lib/Updater.php | 5 +++++ updater.phar | Bin 757646 -> 757822 bytes 5 files changed, 19 insertions(+), 6 deletions(-) diff --git a/index.php b/index.php index 0486187f..b092663c 100644 --- a/index.php +++ b/index.php @@ -1105,6 +1105,11 @@ public function currentStep() { return $jsonData; } + public function getUpdateStepFileLocation() { + $updaterDir = $this->getUpdateDirectoryLocation() . '/updater-'.$this->getConfigOption('instanceid'); + return $updaterDir . '/.step'; + } + /** * Rollback the changes if $step has failed * @@ -1345,8 +1350,9 @@ public function isAuthenticated() { if ($stepState === 'start') { die( sprintf( - 'Step %s is currently in process. Please reload this page later.', - $stepNumber + 'Step %s is currently in process. Please reload this page later or remove the following file to start from scratch: %s', + $stepNumber, + $this->updater->getUpdateStepFileLocation() ) ); } diff --git a/index.web.php b/index.web.php index 1e90b32a..47fd53d7 100644 --- a/index.web.php +++ b/index.web.php @@ -157,8 +157,9 @@ public function isAuthenticated() { if ($stepState === 'start') { die( sprintf( - 'Step %s is currently in process. Please reload this page later.', - $stepNumber + 'Step %s is currently in process. Please reload this page later or remove the following file to start from scratch: %s', + $stepNumber, + $this->updater->getUpdateStepFileLocation() ) ); } diff --git a/lib/UpdateCommand.php b/lib/UpdateCommand.php index 9a438cd9..58b42bb4 100644 --- a/lib/UpdateCommand.php +++ b/lib/UpdateCommand.php @@ -139,8 +139,9 @@ protected function execute(InputInterface $input, OutputInterface $output) { if ($stepState === 'start') { $output->writeln( sprintf( - 'Step %s is currently in process. Please call this command later.', - $stepNumber + 'Step %s is currently in process. Please call this command later or remove the following file to start from scratch: %s', + $stepNumber, + $this->updater->getUpdateStepFileLocation() ) ); return -1; diff --git a/lib/Updater.php b/lib/Updater.php index 626b65bf..20f45237 100644 --- a/lib/Updater.php +++ b/lib/Updater.php @@ -1069,6 +1069,11 @@ public function currentStep() { return $jsonData; } + public function getUpdateStepFileLocation() { + $updaterDir = $this->getUpdateDirectoryLocation() . '/updater-'.$this->getConfigOption('instanceid'); + return $updaterDir . '/.step'; + } + /** * Rollback the changes if $step has failed * diff --git a/updater.phar b/updater.phar index 5d60217818be9a40bb0118fa6c12590beefad938..542a9cdde2df4d072a72f7ac56178c316f681a98 100755 GIT binary patch delta 2819 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 MKHH@|#Z|@s0q1v{!2kdN From 77a3b95a11cb618d464c2241250b5e394bc2bcd1 Mon Sep 17 00:00:00 2001 From: Marcel Klehr Date: Thu, 4 May 2023 13:03:22 +0200 Subject: [PATCH 2/3] run cs:fix Signed-off-by: Marcel Klehr --- index.php | 8 +-- lib/UpdateCommand.php | 2 +- lib/Updater.php | 8 +-- updater.phar | Bin 757822 -> 757786 bytes vendor/composer/ClassLoader.php | 96 +++++++++++++++----------------- 5 files changed, 54 insertions(+), 60 deletions(-) diff --git a/index.php b/index.php index b092663c..c76545b6 100644 --- a/index.php +++ b/index.php @@ -1105,10 +1105,10 @@ public function currentStep() { return $jsonData; } - public function getUpdateStepFileLocation() { - $updaterDir = $this->getUpdateDirectoryLocation() . '/updater-'.$this->getConfigOption('instanceid'); - return $updaterDir . '/.step'; - } + public function getUpdateStepFileLocation() { + $updaterDir = $this->getUpdateDirectoryLocation() . '/updater-'.$this->getConfigOption('instanceid'); + return $updaterDir . '/.step'; + } /** * Rollback the changes if $step has failed diff --git a/lib/UpdateCommand.php b/lib/UpdateCommand.php index 58b42bb4..ed52ecd2 100644 --- a/lib/UpdateCommand.php +++ b/lib/UpdateCommand.php @@ -141,7 +141,7 @@ protected function execute(InputInterface $input, OutputInterface $output) { sprintf( 'Step %s is currently in process. Please call this command later or remove the following file to start from scratch: %s', $stepNumber, - $this->updater->getUpdateStepFileLocation() + $this->updater->getUpdateStepFileLocation() ) ); return -1; diff --git a/lib/Updater.php b/lib/Updater.php index 20f45237..67af18ab 100644 --- a/lib/Updater.php +++ b/lib/Updater.php @@ -1069,10 +1069,10 @@ public function currentStep() { return $jsonData; } - public function getUpdateStepFileLocation() { - $updaterDir = $this->getUpdateDirectoryLocation() . '/updater-'.$this->getConfigOption('instanceid'); - return $updaterDir . '/.step'; - } + public function getUpdateStepFileLocation() { + $updaterDir = $this->getUpdateDirectoryLocation() . '/updater-'.$this->getConfigOption('instanceid'); + return $updaterDir . '/.step'; + } /** * Rollback the changes if $step has failed diff --git a/updater.phar b/updater.phar index 542a9cdde2df4d072a72f7ac56178c316f681a98..094c110a025924018fc602d6569e4876d23a0cee 100755 GIT binary patch delta 1553 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 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() { From ef7562ee7d81402faf38a0db491e85c1dd784949 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=B4me=20Chilliet?= Date: Thu, 27 Jul 2023 15:54:09 +0200 Subject: [PATCH 3/3] Update updater.phar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Côme Chilliet --- updater.phar | Bin 757786 -> 757780 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/updater.phar b/updater.phar index 094c110a025924018fc602d6569e4876d23a0cee..2b7ac5bf9b4209ad25cc461e329b348c77d87c8a 100755 GIT binary patch delta 1252 zcmY+DSxi$w6o#kE?cUN-Xeli%rO=i_Z-E;@+^rE2abHl>C`K_x;~tHB+!JvhL&ODn zF)JLpNz^wnE{)5B4+hUaKKU?T&;8Hz%vom6bjYVVeSJe>*R5OVq)ia34)x(H=>JdbPW+bsjGm5xh z*gYE3PiiYjP_$!+8?{4;SB3pmnw-f3R>s)r3s>5OXxIM}8=Z`K0zFzT2fh5d-pN<${S@eseiHG8ehRV3FpId= zfc*OnsKsNPPF!iko|JI{anLxCIMD>}DHC>nG}Vh!7g!m~(GL9P&)p$D_+8IG|1e3n z9gL;<7V|XP*lR|U@-1_TTP#AcphjKX6Lndrc1jiwZxi;1ETj|59#34GjgH*OMlWMm`ZVc^_8!4D_P{h0(C>=S7HX!UW4^G_aL4-bGdvZnJb4A~CMc;FgNu3vQj(VZL z_M-Hd58m}Yc)NUKiG#jbqR4E5H= z(A~qr?vG&_-V$83wI#S-y(PGO(Na{sx)fD(mR1qdLaB^n4m;yG{YE@Yd=*E%1#;NF zjM43)$BJL+74PA52d zm`Wy0zmJ-g`0}c%CS^(WkVwi_XXcvJyZfd8Q>5=q{-+!!r;hVQA)+ze=pkf(uMzMytP`R3TO4&r5 zQoc;os}>SlRId;}7WTM`^fT%OB&5}ghtIm;KuaSw{H0{teEyQOU=vi&v z)W7%F&Ls-Q8rGbB!i#|jFKWX={Hu=kl^{B;TSVinIV9%&wDRIuwMr@Pd9gwi|vD7Y3-E3y8Og;0Q z-*iX#+}}F>R3DPuM3&eM7vLQ~i6#S_4HR83>ts>30EsW(l z+Uxl$m7O=6t^BheO`0RroPOSEM?GWqh@bkicSU4x-ql~H&T$wP{hVEC_`n4HY4mh4^Hg!Ai|WeJzmjwujsp1 z^xcb0miZ9pgb(^%A4*U7;qCFmd&R$)IOkt03f-k*>|gi!Ke^2j;X{5S|Fqmf?$66x zgnQV@*r4k1A#QWcyZr$xxsw6Z_g(;zE(LIcCWu@*g2?g9AhMnn%AycCc=5P$7-5;wbej95d&cyJ(V(~O_Q@oCNT-e1pUf+N51TkKXJv*yY z#Iu4E)vuDRO`zV^1iE`%*wYD2!&if=)?I_^HCcnp7q3OtyK7O!SZ$X0R46YcF^9e+ zPX9g`CEiJ*-U>Nt?P7Gh=&|CrdpQ3U-ym0#>wt`uzLxR+@5vdWEk$V`&ZUmzQVLp1 zS}IylAquA`A$x@&EC2^a4DsvOqS-B=l%!Wx}V(u