Skip to content

fix(web): fix use warning in web updater #703

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
come-nc merged 1 commit into from
Jan 5, 2026
+2 −3
Merged

fix(web): fix use warning in web updater #703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ index.php: lib/UpdateException.php lib/LogException.php lib/Updater.php index.we
# First put openining php tag and license
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 -v "^namespace" | awk '/^<\?php$$/,/\*\//{next} 1' >> index.php
cat lib/UpdateException.php lib/LogException.php lib/Updater.php index.web.php| grep -Pv "^namespace|^use [^\\\\]+;" | awk '/^<\?php$$/,/\*\//{next} 1' >> index.php

test/vendor:
composer bin tests install
Expand Down
2 changes: 0 additions & 2 deletions index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ class LogException extends \Exception {
}


use Closure;
use CurlHandle;

class Updater {
/** @var int */
Expand Down
1 change: 1 addition & 0 deletions tests/checkSameCodeBase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ function findDiffPos($original, $copy) {
$fileContent = file_get_contents($path);

$fileContent = explode("namespace NC\\Updater;\n", $fileContent, 2)[1];
$fileContent = preg_replace('/use [^\\\\]*;\n/', '', $fileContent);

$fileContent = trim($fileContent);

Expand Down