Merge pull request #2591 from LibreSign/backport/2590/stable28

[stable28] Organize install files
LibreSign · Mar 26, 2024 · 856f012 · 856f012
2 parents 17279c4 + 41389ed
commit 856f012
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 15 deletions.
diff --git a/lib/Command/Base.php b/lib/Command/Base.php
@@ -25,7 +25,7 @@
 namespace OCA\Libresign\Command;
 
 use OC\Core\Command\Base as CommandBase;
-use OCA\Libresign\Service\InstallService;
+use OCA\Libresign\Service\Install\InstallService;
 use Psr\Log\LoggerInterface;
 
 class Base extends CommandBase {

diff --git a/lib/Command/Configure/Check.php b/lib/Command/Configure/Check.php
@@ -26,7 +26,7 @@
 
 use OC\Core\Command\Base;
 use OCA\Libresign\AppInfo\Application;
-use OCA\Libresign\Service\ConfigureCheckService;
+use OCA\Libresign\Service\Install\ConfigureCheckService;
 use OCP\IConfig;
 use Symfony\Component\Console\Helper\Table;
 use Symfony\Component\Console\Helper\TableCell;

diff --git a/lib/Command/Developer/Reset.php b/lib/Command/Developer/Reset.php
@@ -2,7 +2,9 @@
 
 declare(strict_types=1);
 /**
- * @copyright Copyright (c) 2020 Joas Schilling <[email protected]>
+ * @copyright Copyright (c) 2023 Vitor Mattos <[email protected]>
+ *
+ * @author Vitor Mattos <[email protected]>
  *
  * @license GNU AGPL version 3 or any later version
  *

diff --git a/lib/Controller/AdminController.php b/lib/Controller/AdminController.php
@@ -28,8 +28,8 @@
 use OCA\Libresign\Exception\LibresignException;
 use OCA\Libresign\Handler\CertificateEngine\Handler as CertificateEngineHandler;
 use OCA\Libresign\Helper\ConfigureCheckHelper;
-use OCA\Libresign\Service\ConfigureCheckService;
-use OCA\Libresign\Service\InstallService;
+use OCA\Libresign\Service\Install\ConfigureCheckService;
+use OCA\Libresign\Service\Install\InstallService;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\Attribute\NoCSRFRequired;

diff --git a/lib/Handler/CertificateEngine/CfsslHandler.php b/lib/Handler/CertificateEngine/CfsslHandler.php
@@ -32,7 +32,7 @@
 use OCA\Libresign\Exception\LibresignException;
 use OCA\Libresign\Handler\CfsslServerHandler;
 use OCA\Libresign\Helper\ConfigureCheckHelper;
-use OCA\Libresign\Service\InstallService;
+use OCA\Libresign\Service\Install\InstallService;
 use OCP\AppFramework\Services\IAppConfig;
 use OCP\Files\AppData\IAppDataFactory;
 use OCP\IConfig;

diff --git a/lib/Migration/Version8000Date20230730032402.php b/lib/Migration/Version8000Date20230730032402.php
@@ -26,7 +26,7 @@
 namespace OCA\Libresign\Migration;
 
 use Closure;
-use OCA\Libresign\Service\InstallService;
+use OCA\Libresign\Service\Install\InstallService;
 use OCP\AppFramework\Services\IAppConfig;
 use OCP\Migration\IOutput;
 use OCP\Migration\SimpleMigrationStep;

diff --git a/lib/Service/ConfigureCheckService.php → ...Service/Install/ConfigureCheckService.php b/lib/Service/ConfigureCheckService.php → ...Service/Install/ConfigureCheckService.php
@@ -22,7 +22,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace OCA\Libresign\Service;
+namespace OCA\Libresign\Service\Install;
 
 use ImagickException;
 use OC\SystemConfig;

diff --git a/lib/Service/InstallService.php → lib/Service/Install/InstallService.php b/lib/Service/InstallService.php → lib/Service/Install/InstallService.php
@@ -22,7 +22,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace OCA\Libresign\Service;
+namespace OCA\Libresign\Service\Install;
 
 use InvalidArgumentException;
 use OC;

diff --git a/tests/Unit/Service/InstallServiceTest.php b/tests/Unit/Service/InstallServiceTest.php
@@ -24,7 +24,7 @@
 namespace OCA\Libresign\Tests\Unit\Service;
 
 use OCA\Libresign\Handler\CertificateEngine\Handler as CertificateEngineHandler;
-use OCA\Libresign\Service\InstallService;
+use OCA\Libresign\Service\Install\InstallService;
 use OCP\AppFramework\Services\IAppConfig;
 use OCP\Files\AppData\IAppDataFactory;
 use OCP\Files\IRootFolder;

diff --git a/tests/Unit/TestCase.php b/tests/Unit/TestCase.php
@@ -159,8 +159,8 @@ public function deleteUserIfExists($username): void {
 	}
 
 	private function getBinariesFromCache(): void {
-		/** @var \OCA\Libresign\Service\InstallService */
-		$install = \OC::$server->get(\OCA\Libresign\Service\InstallService::class);
+		/** @var \OCA\Libresign\Service\Install\InstallService */
+		$install = \OC::$server->get(\OCA\Libresign\Service\Install\InstallService::class);
 		$appPath = $install->getFullPath();
 		$cachePath = preg_replace('/\/.*\/appdata_[a-z0-9]*/', \OC::$server->getTempManager()->getTempBaseDir(), $appPath);
 		if (!file_exists($cachePath)) {
@@ -173,8 +173,8 @@ private function getBinariesFromCache(): void {
 	}
 
 	private function backupBinaries(): void {
-		/** @var \OCA\Libresign\Service\InstallService */
-		$install = \OC::$server->get(\OCA\Libresign\Service\InstallService::class);
+		/** @var \OCA\Libresign\Service\Install\InstallService */
+		$install = \OC::$server->get(\OCA\Libresign\Service\Install\InstallService::class);
 		$appPath = $install->getFullPath();
 		if (!is_readable($appPath)) {
 			return;

diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml
@@ -118,7 +118,7 @@
       <code>$config</code>
     </InvalidArgument>
   </file>
-  <file src="lib/Service/InstallService.php">
+  <file src="lib/Service/Install/InstallService.php">
     <UndefinedClass occurrences="1">
       <code>Process</code>
     </UndefinedClass>