Merge pull request #41094 from owncloud/fix/psr-test-namespace-2

chore: set autoload-dev in composer.json
owncloud · Nov 16, 2023 · a060b19 · a060b19
2 parents 27792a5 + 0af9128
commit a060b19
Show file tree

Hide file tree

Showing 19 changed files with 24 additions and 21 deletions.
diff --git a/composer.json b/composer.json
@@ -28,6 +28,11 @@
 
     },
     "autoload-dev" : {
+        "psr-4": {
+            "Test\\": "tests/lib/",
+            "TestHelpers\\": "tests/TestHelpers/",
+            "Tests\\": "tests/"
+        },
         "files": [
             "tests/lib/TestCase.php"
         ]

diff --git a/phpstan.neon b/phpstan.neon
@@ -12,7 +12,6 @@ parameters:
   ignoreErrors:
     - '#Undefined variable: \$OC_[a-zA-Z0-9\\_]+#'
     - '#Undefined variable: \$vendor#'
-    - '#Instantiated class Test\\Util\\User\\Dummy not found.#'
     # errors below are to be addressed by own pull requests - non trivial changes required
     - '#Instantiated class OCA\\Encryption\\Crypto\\Crypt not found.#'
     - '#Instantiated class OCA\\Encryption\\Util not found.#'

diff --git a/tests/Core/Command/Apps/AppsDisableTest.php b/tests/Core/Command/Apps/AppsDisableTest.php
@@ -19,7 +19,7 @@
  *
  */
 
-namespace Tests\Core\Command\Config;
+namespace Tests\Core\Command\Apps;
 
 use OC\Core\Command\App\Disable;
 use Symfony\Component\Console\Tester\CommandTester;

diff --git a/tests/Core/Command/Apps/AppsEnableTest.php b/tests/Core/Command/Apps/AppsEnableTest.php
@@ -19,7 +19,7 @@
  *
  */
 
-namespace Tests\Core\Command\Config;
+namespace Tests\Core\Command\Apps;
 
 use OC\Core\Command\App\Enable;
 use Symfony\Component\Console\Tester\CommandTester;

diff --git a/tests/Core/Command/Apps/AppsGetPathTest.php b/tests/Core/Command/Apps/AppsGetPathTest.php
@@ -19,7 +19,7 @@
  *
  */
 
-namespace Tests\Core\Command\Config;
+namespace Tests\Core\Command\Apps;
 
 use OC\Core\Command\App\GetPath;
 use Symfony\Component\Console\Tester\CommandTester;

diff --git a/tests/Core/Command/Apps/AppsListTest.php b/tests/Core/Command/Apps/AppsListTest.php
@@ -19,7 +19,7 @@
  *
  */
 
-namespace Tests\Core\Command\Config;
+namespace Tests\Core\Command\Apps;
 
 use OC\Core\Command\App\ListApps;
 use Symfony\Component\Console\Tester\CommandTester;

diff --git a/tests/Core/Command/Apps/CheckCodeTest.php b/tests/Core/Command/Apps/CheckCodeTest.php
@@ -19,7 +19,7 @@
  *
  */
 
-namespace Tests\Core\Command\Config;
+namespace Tests\Core\Command\Apps;
 
 use OC\App\InfoParser;
 use OC\Core\Command\App\CheckCode;

diff --git a/tests/Core/Command/Maintenance/RepairTest.php b/tests/Core/Command/Maintenance/RepairTest.php
@@ -19,7 +19,7 @@
  *
  */
 
-namespace Tests\Core\Command\User;
+namespace Tests\Core\Command\Maintenance;
 
 use OC\Core\Command\Maintenance\Repair;
 use Symfony\Component\Console\Application;

diff --git a/tests/Core/Controller/AppRegistryControllerTest.php b/tests/Core/Controller/AppRegistryControllerTest.php
@@ -19,7 +19,7 @@
  *
  */
 
-namespace Core\Controller;
+namespace Tests\Core\Controller;
 
 use OC\Core\Controller\AppRegistryController;
 use OC\Files\Node\File;

diff --git a/tests/Core/Controller/TwoFactorChallengeControllerTest.php b/tests/Core/Controller/TwoFactorChallengeControllerTest.php
@@ -20,7 +20,7 @@
  *
  */
 
-namespace Test\Core\Controller;
+namespace Tests\Core\Controller;
 
 use OC\Authentication\TwoFactorAuth\Manager;
 use OC\Core\Controller\TwoFactorChallengeController;

diff --git a/tests/Core/Middleware/AccountModuleMiddlewareTest.php b/tests/Core/Middleware/AccountModuleMiddlewareTest.php
@@ -19,7 +19,7 @@
  *
  */
 
-namespace Test\Core\Middleware;
+namespace Tests\Core\Middleware;
 
 use OC\Authentication\AccountModule\Manager;
 use OC\Core\Controller\LoginController;

diff --git a/tests/Core/Middleware/TwoFactorMiddlewareTest.php b/tests/Core/Middleware/TwoFactorMiddlewareTest.php
@@ -21,7 +21,7 @@
  *
  */
 
-namespace Test\Core\Middleware;
+namespace Tests\Core\Middleware;
 
 use OC\AppFramework\Http\Request;
 use OC\Authentication\TwoFactorAuth\Manager;

diff --git a/tests/Core/Templates/TemplatesTest.php b/tests/Core/Templates/TemplatesTest.php
@@ -2,7 +2,9 @@
 
 namespace Tests\Core\Templates;
 
-class TemplatesTest extends \Test\TestCase {
+use Test\TestCase;
+
+class TemplatesTest extends TestCase {
 	public function test403() {
 		$template = \OC::$SERVERROOT . '/core/templates/403.php';
 		$expectedHtml = "<ul><li class='error'>Access forbidden<br/><p class='hint'></p></li></ul>";

diff --git a/tests/Settings/Controller/AuthSettingsControllerTest.php b/tests/Settings/Controller/AuthSettingsControllerTest.php
@@ -20,7 +20,7 @@
  *
  */
 
-namespace Test\Settings\Controller;
+namespace Tests\Settings\Controller;
 
 use OC\AppFramework\Http;
 use OC\Authentication\Exceptions\InvalidTokenException;

diff --git a/...ttings/Controller/LegalControllerTest.php → ...ontroller/LegalSettingsControllerTest.php b/...ttings/Controller/LegalControllerTest.php → ...ontroller/LegalSettingsControllerTest.php
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -19,10 +19,6 @@
 // especially with code coverage it will require some more time
 \set_time_limit(0);
 
-\OC::$composerAutoloader->addPsr4('Test\\', OC::$SERVERROOT . '/tests/lib/', true);
-\OC::$composerAutoloader->addPsr4('TestHelpers\\', OC::$SERVERROOT . '/tests/TestHelpers/', true);
-\OC::$composerAutoloader->addPsr4('Tests\\', OC::$SERVERROOT . '/tests/', true);
-
 // load all enabled apps
 \OC_App::loadApps();
 

diff --git a/tests/lib/Settings/ManagerTest.php → tests/lib/Settings/SettingsManagerTest.php b/tests/lib/Settings/ManagerTest.php → tests/lib/Settings/SettingsManagerTest.php
@@ -19,10 +19,11 @@
  *
  */
 
-namespace Test;
+namespace Test\Settings;
 
 use OC\Settings\SettingsManager;
 use OCP\License\ILicenseManager;
+use Test\TestCase;
 
 class SettingsManagerTest extends TestCase {
 	/** @var \OC\Settings\SettingsManager */

diff --git a/tests/lib/Share/Filters/MailNotificationFilterTest.php b/tests/lib/Share/Filters/MailNotificationFilterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Test\Share;
+namespace Test\Share\Filters;
 
 use OC\Share\Filters\MailNotificationFilter;
 use Test\TestCase;

diff --git a/tests/lib/Shutdown/ShutdownManagerTest.php b/tests/lib/Shutdown/ShutdownManagerTest.php
@@ -19,13 +19,13 @@
  *
  */
 
-namespace Tests\Shutdown;
+namespace Test\Shutdown;
 
 use OC\Shutdown\ShutDownManager;
 use Test\TestCase;
 
 class ShutdownManagerTest extends TestCase {
-	public function testOrderedRun() {
+	public function testOrderedRun(): void {
 		/** @var ShutDownManager $manager */
 		$manager = $this->getMockBuilder(ShutDownManager::class)
 			->disableOriginalConstructor()