diff --git a/Makefile b/Makefile index 316bc437..0773d5ed 100644 --- a/Makefile +++ b/Makefile @@ -15,6 +15,7 @@ index.php: lib/UpdateException.php lib/LogException.php lib/Updater.php index.we awk '/^<\?php$$/,/\*\//' index.web.php > index.php # Then concat all files while filtering php tag and license cat lib/UpdateException.php lib/LogException.php lib/Updater.php index.web.php| grep -Pv "^namespace|^use [^\\\\]+;" | awk '/^<\?php$$/,/\*\//{next} 1' >> index.php + composer run -q cs:fix index.php test/vendor: composer bin tests install diff --git a/buildVersionFile.php b/buildVersionFile.php index 8227f2b5..68a2aecc 100644 --- a/buildVersionFile.php +++ b/buildVersionFile.php @@ -7,13 +7,11 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - $currentTag = trim(shell_exec('git describe --tags') ?? ''); exec('git diff-files --quiet', $output, $returnValue); $dirty = $returnValue === 0 ? '' : ' dirty'; - $content = ' $data */ @@ -22,12 +21,9 @@ public function getData(): array { } } - class LogException extends \Exception { } - - class Updater { /** @var int */ public const LAST_STEP = 12; @@ -734,7 +730,6 @@ private function getDownloadURLs(): array { } return array_unique($downloadURLs); - } private function getCurl(string $url): CurlHandle { @@ -1180,7 +1175,6 @@ private function moveWithExclusions(string $dataLocation, array $excludedElement foreach ($this->getRecursiveDirectoryIterator($dataLocation, $excludedElements) as $path => $fileInfo) { if ($dataLocation === '') { throw new \Exception('Invalid dataLocation procided'); - } $fileName = explode($dataLocation, $path, 2)[1] ?? null; @@ -1452,7 +1446,6 @@ public function log(string $message): void { fclose($fh); } - /** * Logs a message with current datetime prepended to updater.log but drops possible LogException */ @@ -1464,7 +1457,6 @@ public function silentLog(string $message): void { } } - /** * Logs current version */ diff --git a/lib/Updater.php b/lib/Updater.php index 96322949..0abd4863 100644 --- a/lib/Updater.php +++ b/lib/Updater.php @@ -718,7 +718,6 @@ private function getDownloadURLs(): array { } return array_unique($downloadURLs); - } private function getCurl(string $url): CurlHandle { @@ -1164,7 +1163,6 @@ private function moveWithExclusions(string $dataLocation, array $excludedElement foreach ($this->getRecursiveDirectoryIterator($dataLocation, $excludedElements) as $path => $fileInfo) { if ($dataLocation === '') { throw new \Exception('Invalid dataLocation procided'); - } $fileName = explode($dataLocation, $path, 2)[1] ?? null; @@ -1436,7 +1434,6 @@ public function log(string $message): void { fclose($fh); } - /** * Logs a message with current datetime prepended to updater.log but drops possible LogException */ @@ -1448,7 +1445,6 @@ public function silentLog(string $message): void { } } - /** * Logs current version */ diff --git a/updater.phar b/updater.phar index 8fb7bc99..acfb1a32 100755 Binary files a/updater.phar and b/updater.phar differ diff --git a/vendor-bin/coding-standard/composer.lock b/vendor-bin/coding-standard/composer.lock index 86656526..f7592f96 100644 --- a/vendor-bin/coding-standard/composer.lock +++ b/vendor-bin/coding-standard/composer.lock @@ -9,16 +9,16 @@ "packages-dev": [ { "name": "kubawerlos/php-cs-fixer-custom-fixers", - "version": "v3.35.1", + "version": "v3.37.2", "source": { "type": "git", "url": "https://github.com/kubawerlos/php-cs-fixer-custom-fixers.git", - "reference": "2a35f80ae24ca77443a7af1599c3a3db1b6bd395" + "reference": "678df979ce743466b42ddb6eea46b3f4c9a7bade" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/kubawerlos/php-cs-fixer-custom-fixers/zipball/2a35f80ae24ca77443a7af1599c3a3db1b6bd395", - "reference": "2a35f80ae24ca77443a7af1599c3a3db1b6bd395", + "url": "https://api.github.com/repos/kubawerlos/php-cs-fixer-custom-fixers/zipball/678df979ce743466b42ddb6eea46b3f4c9a7bade", + "reference": "678df979ce743466b42ddb6eea46b3f4c9a7bade", "shasum": "" }, "require": { @@ -28,7 +28,7 @@ "php": "^7.4 || ^8.0" }, "require-dev": { - "phpunit/phpunit": "^9.6.24 || ^10.5.51 || ^11.5.32" + "phpunit/phpunit": "^9.6.34 || ^10.5.63 || ^11.5.55" }, "type": "library", "autoload": { @@ -49,7 +49,7 @@ "description": "A set of custom fixers for PHP CS Fixer", "support": { "issues": "https://github.com/kubawerlos/php-cs-fixer-custom-fixers/issues", - "source": "https://github.com/kubawerlos/php-cs-fixer-custom-fixers/tree/v3.35.1" + "source": "https://github.com/kubawerlos/php-cs-fixer-custom-fixers/tree/v3.37.2" }, "funding": [ { @@ -57,20 +57,20 @@ "type": "github" } ], - "time": "2025-09-28T18:43:35+00:00" + "time": "2026-05-12T16:22:19+00:00" }, { "name": "nextcloud/coding-standard", - "version": "v1.4.0", + "version": "v1.5.0", "source": { "type": "git", "url": "https://github.com/nextcloud/coding-standard.git", - "reference": "8e06808c1423e9208d63d1bd205b9a38bd400011" + "reference": "80547a93236fbb9c783e05f0f0899043851b0dba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nextcloud/coding-standard/zipball/8e06808c1423e9208d63d1bd205b9a38bd400011", - "reference": "8e06808c1423e9208d63d1bd205b9a38bd400011", + "url": "https://api.github.com/repos/nextcloud/coding-standard/zipball/80547a93236fbb9c783e05f0f0899043851b0dba", + "reference": "80547a93236fbb9c783e05f0f0899043851b0dba", "shasum": "" }, "require": { @@ -100,22 +100,22 @@ ], "support": { "issues": "https://github.com/nextcloud/coding-standard/issues", - "source": "https://github.com/nextcloud/coding-standard/tree/v1.4.0" + "source": "https://github.com/nextcloud/coding-standard/tree/v1.5.0" }, - "time": "2025-06-19T12:27:27+00:00" + "time": "2026-05-19T18:30:09+00:00" }, { "name": "php-cs-fixer/shim", - "version": "v3.89.1", + "version": "v3.95.3", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/shim.git", - "reference": "69182624902af6b2adafb30e2a092f0e6dd89fab" + "reference": "681eea341af451ca7cee6abcebc49fcce59507a3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/shim/zipball/69182624902af6b2adafb30e2a092f0e6dd89fab", - "reference": "69182624902af6b2adafb30e2a092f0e6dd89fab", + "url": "https://api.github.com/repos/PHP-CS-Fixer/shim/zipball/681eea341af451ca7cee6abcebc49fcce59507a3", + "reference": "681eea341af451ca7cee6abcebc49fcce59507a3", "shasum": "" }, "require": { @@ -152,9 +152,9 @@ "description": "A tool to automatically fix PHP code style", "support": { "issues": "https://github.com/PHP-CS-Fixer/shim/issues", - "source": "https://github.com/PHP-CS-Fixer/shim/tree/v3.89.1" + "source": "https://github.com/PHP-CS-Fixer/shim/tree/v3.95.3" }, - "time": "2025-10-24T12:05:38+00:00" + "time": "2026-05-29T20:36:02+00:00" } ], "aliases": [], @@ -167,5 +167,5 @@ "platform-overrides": { "php": "8.2" }, - "plugin-api-version": "2.6.0" + "plugin-api-version": "2.9.0" } diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index e0b86fd6..1ebee59b 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -3,7 +3,7 @@ 'name' => '__root__', 'pretty_version' => 'dev-master', 'version' => 'dev-master', - 'reference' => 'a8a4a7a3a2f3c5ad1b575b9b07979cbf662f894e', + 'reference' => '14ebaeb097a8e7e68221b2e6e46a9d0658e3cb8b', 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -13,7 +13,7 @@ '__root__' => array( 'pretty_version' => 'dev-master', 'version' => 'dev-master', - 'reference' => 'a8a4a7a3a2f3c5ad1b575b9b07979cbf662f894e', + 'reference' => '14ebaeb097a8e7e68221b2e6e46a9d0658e3cb8b', 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(),