Merge pull request #713 from nextcloud/fix/checkSameCodeBase

Author: Altahrim

.github/workflows/check-same-code-base.yml

@@ -47,6 +47,8 @@ jobs:
         run: |
           composer -V --ansi
           ./vendor/bin/box info -lm flat updater.phar | LC_LOCALE=C sort | grep -Ev "^(Signature Hash|  Version.php |Contents: |    installed.php |Timestamp: )" > updater.old.txt
+          # Makes sure repository is clean so the version isn't generated with "dirty" suffix
+          git restore .
           make updater.phar
           ./vendor/bin/box info -lm flat updater.phar | LC_LOCALE=C sort | grep -Ev "^(Signature Hash|  Version.php |Contents: |    installed.php |Timestamp: )" > updater.txt
           diff --suppress-common-lines -t --tabsize=4 -d -y --color=always updater.txt updater.old.txt

tests/checkSameCodeBase.php

@@ -65,7 +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 = preg_replace('/^use [^\\\\]*;\n/m', '', $fileContent);
 
 	$fileContent = trim($fileContent);