From b96f9ccbbd9e42b2bfadc5591c858287b76e3f88 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Jun 2026 01:58:55 +0000 Subject: [PATCH 1/3] build(deps-dev): Bump nextcloud/coding-standard Bumps [nextcloud/coding-standard](https://github.com/nextcloud/coding-standard) from 1.4.0 to 1.5.0. - [Release notes](https://github.com/nextcloud/coding-standard/releases) - [Changelog](https://github.com/nextcloud/coding-standard/blob/master/CHANGELOG.md) - [Commits](https://github.com/nextcloud/coding-standard/compare/v1.4.0...v1.5.0) --- updated-dependencies: - dependency-name: nextcloud/coding-standard dependency-version: 1.5.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: Benjamin Gaussorgues --- buildVersionFile.php | 2 -- index.php | 4 --- lib/Updater.php | 4 --- vendor-bin/coding-standard/composer.lock | 40 ++++++++++++------------ vendor/composer/installed.php | 4 +-- 5 files changed, 22 insertions(+), 32 deletions(-) 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 = 'getRecursiveDirectoryIterator($dataLocation, $excludedElements) as $path => $fileInfo) { if ($dataLocation === '') { throw new \Exception('Invalid dataLocation procided'); - } $fileName = explode($dataLocation, $path, 2)[1] ?? null; @@ -1452,7 +1450,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 +1461,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/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(), From 853eed74e96fa20a43c794a7a4803c23f9281881 Mon Sep 17 00:00:00 2001 From: Benjamin Gaussorgues Date: Wed, 17 Jun 2026 12:01:41 +0200 Subject: [PATCH 2/3] chore: rebuilt updater.phar Signed-off-by: Benjamin Gaussorgues --- updater.phar | Bin 977101 -> 977097 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/updater.phar b/updater.phar index 8fb7bc995161a7b0a75554764d9d3719675898e8..acfb1a32d4c3e2cb3fcc6ba7b740f7f66883fb04 100755 GIT binary patch delta 3332 zcmb7Gdr(x@8Na*tvX_0qvh1?J@>p2p{n~|n@sI`N;R6s9UojDot%}4DG-K2nqsD4P zW8oy6Nutrj7)&*wQ#%;6c2qiQBgRMburoy~Q*~@mF>Ru;#-96qs~!K$A9sH9o%6k4 z=MG)SKXW1fz&~ZYa;cr%l(_+|@(jRf@?^l*JKh)$78?gwaqNmLX8PE-^FZdIU>FBAnptHcVx>0%Y&$A0{`SO@gPz~=ya0_Ok< zN~D{VGl4#;EW>kEIbf9vog%79Kwnkm0EVeC*m5-nw_KeK=f6`Y=uBH7AuSRvAGpv< zhSjkU(QjBpy+dnH5T(Wp+)0{rxENt6ET~`fDVe9qf{RYgc)*JqR2!g0x?GFlzM=KP z{V8o8C|JOA+=1iGz2v-h99h#FsN14IA0+&=yE%(Y3d#Y_<`+2bWPL{fc{3;j4*sC! zxQF`vUy~Yb6d4W*1HC^6VNJ4vYk{ead7eM#q>3ER2qim%(}C$+@KnG!T@f%{Th4Kw zV@U#8Qeh@-hCs4ShhcuEn+%K(bsj)hh`-Vyc>YC5Eu6>dv3QI06`=4?2*>p;DXs7; z45qzTc%9fKV!u7oPXwunp)-K{0`u`-ao##oWVUv%TyP7IpUsA50IA@X@3pOaP8@8OQzAzNCsA zG&<<@*Z6Rq4+o(|!nmpvFObIZ|CfDz4Q~<`vNB1dVlkoXttRZ^116X;GHSw5uIM># ziD}IwvMa?(TW_#1t_Uc(HT-$-b2PkOEsdi}#m-He$Ul-2=#}-nQJvYgux*V$L!A-W z^w%S*fZ4O;T0#m9-2p{RLtMEAwPv_?`u|uWWT9iA$6iBH^+%Y6{?ys2V_RG~&EyNIN+kjlH9eLAp5x z^M51;Z1$z4k*>9Yia(0~QgID>ii z;NrzqlIzsl#YY&V>^MyjaEpX#?dQVD0R!IBUBBhE;w4sBsYXZRFnJ;IxFKGOM-R@# z&jTZAR*Y!1)!)QctYvTlZi=}HNbmB~qX`qh^KY0_)!ri=WY}ya4dZY#%x6XwXYa3P z^CcaM)cZ3ZBIf&xJ~XZpOok`oQff@ZBppb^Hu`TOCbK5V3nt7nIqs)d>;DezlPwo? zqOaQjw6x_p> zR2tx20pi zN7DV>li}~441f1zR6-bQ*mi4sH8h1(vjVsE@FLClnAeLd{3Wc(L^bba;(ocEiE6xA zXns=`mgsC2mMkJ0_f98MdpRZYGKsPH)y~ohCfz7bZ;OO6v!^YC3SP~|3g)XhPS~*f z2WUuX`CZLc(Ip{FOz9Vs&@s058abY9Ww%PwVbejhAJ{N=w{4jEJUiy_65Au4lYL)7 zQ$*U0s+CI@s+k$7J1^L=1uQwZp!YH5DMiP&NXw7x%CSItrm+6$S^i_CWU<>I7{$x} z#h}i`{B2+ik5cU$q|s#z3i{X}=)}Qfw6QZ6-_+q;w3Xqg1GU$fE!F8c(qmwySB-*5 z8XO`y>Ii~ph8(y@Qk><$y@$OoZ=JpU3Uk6thMi$#zf%p215V7k=)$*bk_+Fs4i^rJ zo%QJH#?Rc$IWu{^KuI3EB0$jW#)(_xMhodIiZ|Ygu4J)Gj6t;5CIpi2+~ ziF9U}$<%VOJ3Z--n* zw`lnXDtE?$CXe%1p850pw*~P-yl8WJvUA;z-yiDLdFl2Tg|h$Gb$rjuO8>cP75VUv zv45^bwn0YE4Dts0w?FfZPo$_NUN%6d=-JN=1I&}lDgXcg delta 3313 zcmb7Gc~n%_8GkeHF^}0`1{ekymVrSwS!bLL1{pwLTmW(3h=QVo8l`HEQIC~?2J2D_ zH*!yM5;d`EPg0dM>A{FK8tKs}nxajte*}rRq-_L^bs<*M`@V0;seks5dw%D;@7uTg zzUa%l*q7INOU4Ja#E|b~E*73F`xu2ZD*FY zW$D)tog$4q3D5wOs3-uOs3-*7sX!wa6ds^eVj18Ju^jMse*CvM4d{u1^8pV9&I1&b zNY^T71ARhSg7>OYz;YEjMO2f39#Gi;!_^pUsTzY@tIme|57db|(@sc8gM_PBUU-M} ztK%S|H&{efil&=HsWAa}vL+oq46+oucHZnG3pH8rp-nR$@UjNg256Bk)nd4twO;ss zR+|e7mhl|dd3wna@>lH`vgt^mZifPWkZ@}6y7OdGkPSGOyu@+d?}HzcUk7Et#hW|N=trC`*g$q-1c8$|laARj{(g$uw{D&x4n zSyz;kj|_HNeUp#S)!{TWNEl!K`Aei`{0s6Ow|Jvi&&nl@jM<1GEH`2|cN$^V$Xz3b zbUlRQRv0%;BKuM;wEhl@=DL8AJ0q&W-MbMp)zVn1R2-)?ZYAF)C(_P;@CJ2eV}0W$ zf2P_ZvH5RDmIJe!<@L(oR5I+1mg+S&za<ZFh7f zpf(0^VGPuQ9E-t@QpX~_Bo>R(9gA|RxalCbC=P4b9fwnEFjs)#4%PzK?xs7)J+Fxj z#D~zPhb-G~U`fbvGiG%bb8qDGA6@Pdq z;xUc-1l$=b6VUn>2@Aoiu@;PGqs8CW7OZM;BJPd_iAeAB({~dmfY(=%}~O`7e&~fysy@TvIhkn4r!iY^eVvVInJ&yDh@GC zodB-%r{ZQdr{NGcq+#nEPeTJr6UVjuGvS^TP=`WLll-xI5Ud)DEBCFjnBE~j?MQdR z_r`RLwL9J4G#UP;$?!K#h7Tgx#8zG7YoV#6f|b>)5hBHP{=!veqK3CKanB58q6Tjk zTHcz4h3U=0LPcid{%Kh9w7Hb@vdclsKr+dwwfElaN9XTD2Zkz|(}oq5-djWO)TiLT211(^9P_Z7gbygERd_e(&v2WMe{ z2gmKGrx2q3*$v6*MfoB0d=e}3L-zDaCG+It{&+hdbMz=5t<4!f7o=VD*#?^S_cVC+ zB_D!gr5qN~eGX9C^h$LKO#mvv>hqmGtg`#dYd z-BsX&CTwZ;wKn@?UCloEs&%wa7hs^-pNc}4=5zUAcGu7k^2jKd`MsO=fcthU9rI;Sg{4mZiuyN(6%`*<}^i!%0bpFQvF=gje$N*kge)SVM953d-yDWVwC7=Jjc(Lk5csYL|J&(&GY=( z1wUU=tE}P$@%vU;$qN^&Q-q$B8duG@8fT5I#=6wD*j}?Fr`GPY*Sc%7oo=UlaqUuv z!@AVv9#_|qDY)sLG{H=dr3zdAFR@l8#!dh`3U)+x0@+crqhd$Rj)om=*PgVX!9V-j zN4BpyeE<3BsEV&IY+HHe+rJz*IB Date: Wed, 17 Jun 2026 13:14:57 +0200 Subject: [PATCH 3/3] chore: apply coding style on index.php Signed-off-by: Benjamin Gaussorgues --- Makefile | 1 + index.php | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) 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/index.php b/index.php index 112bacdc..54eb2926 100644 --- a/index.php +++ b/index.php @@ -7,7 +7,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - class UpdateException extends \Exception { /** @param list $data */ @@ -22,12 +21,9 @@ public function getData(): array { } } - class LogException extends \Exception { } - - class Updater { /** @var int */ public const LAST_STEP = 12;