Move non-spouts to Selfoss namespace

NEWS.md

@@ -54,6 +54,7 @@
 - Several `npm run` scripts were renamed for consistency: `analyse:server` → `check:server:phpstan`, `cs:server` → `check:server:cs`, `lint:server` → `check:server:lint`. ([#1494](https://github.com/fossar/selfoss/pull/1494))
 - Front-end code was converted to TypeScript. ([#1457](https://github.com/fossar/selfoss/pull/1457))
 - Last use of [F3 framework](https://fatfreeframework.com) was removed. So long… ([#1298](https://github.com/fossar/selfoss/pull/1298))
+- All non-spout classes were moved to a single PSR-4 namespace: `Selfoss\`. ([#1532](https://github.com/fossar/selfoss/pull/1532))
 
 ### API changes
 

cliupdate.php

@@ -2,14 +2,14 @@
 
 declare(strict_types=1);
 
-use helpers\UpdateVisitor;
 use Psr\Container\ContainerInterface;
+use Selfoss\helpers\UpdateVisitor;
 
 chdir(__DIR__);
 require __DIR__ . '/src/common.php';
 
 /** @var ContainerInterface $container */
-$loader = $container->get(helpers\ContentLoader::class);
+$loader = $container->get(Selfoss\helpers\ContentLoader::class);
 $updateVisitor = new class implements UpdateVisitor {
     public function started(int $count): void {
     }

composer.json

@@ -46,10 +46,8 @@
     ],
     "autoload": {
         "psr-4": {
-            "controllers\\": "src/controllers/",
-            "daos\\": "src/daos/",
-            "helpers\\": "src/helpers/",
             "spouts\\": "src/spouts/",
+            "Selfoss\\": "src/",
             "Tests\\": "tests/"
         }
     },

index.php

@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use Psr\Container\ContainerInterface;
+use Selfoss\controllers;
 
 require __DIR__ . '/src/common.php';
 

src/common.php

@@ -2,9 +2,6 @@
 
 declare(strict_types=1);
 
-use helpers\Configuration;
-use helpers\DatabaseConnection;
-use helpers\WebClient;
 use Monolog\Formatter\LineFormatter;
 use Monolog\Handler\ErrorLogHandler;
 use Monolog\Handler\NullHandler;
@@ -13,6 +10,11 @@
 use Psr\Container\ContainerInterface;
 use Psr\Http\Client\ClientInterface;
 use Psr\SimpleCache\CacheInterface;
+use Selfoss\daos;
+use Selfoss\helpers;
+use Selfoss\helpers\Configuration;
+use Selfoss\helpers\DatabaseConnection;
+use Selfoss\helpers\WebClient;
 use Slince\Di\Container;
 use Symfony\Component\Cache\Adapter\FilesystemAdapter;
 use Symfony\Component\Cache\Psr16Cache;
@@ -97,19 +99,19 @@ function boot_error(string $message): never {
 
 // Choose database implementation based on config
 $container
-    ->register(daos\DatabaseInterface::class, 'daos\\' . $configuration->dbType . '\\Database')
+    ->register(daos\DatabaseInterface::class, 'Selfoss\daos\\' . $configuration->dbType . '\\Database')
     ->setShared(true)
 ;
 $container
-    ->register(daos\ItemsInterface::class, 'daos\\' . $configuration->dbType . '\\Items')
+    ->register(daos\ItemsInterface::class, 'Selfoss\daos\\' . $configuration->dbType . '\\Items')
     ->setShared(true)
 ;
 $container
-    ->register(daos\SourcesInterface::class, 'daos\\' . $configuration->dbType . '\\Sources')
+    ->register(daos\SourcesInterface::class, 'Selfoss\daos\\' . $configuration->dbType . '\\Sources')
     ->setShared(true)
 ;
 $container
-    ->register(daos\TagsInterface::class, 'daos\\' . $configuration->dbType . '\\Tags')
+    ->register(daos\TagsInterface::class, 'Selfoss\daos\\' . $configuration->dbType . '\\Tags')
     ->setShared(true)
 ;
 

src/controllers/About.php

@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace controllers;
+namespace Selfoss\controllers;
 
-use helpers\Authentication;
-use helpers\Configuration;
-use helpers\View;
+use Selfoss\helpers\Authentication;
+use Selfoss\helpers\Configuration;
+use Selfoss\helpers\View;
 
 /**
  * Controller for instance information API

src/controllers/Authentication.php

@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace controllers;
+namespace Selfoss\controllers;
 
-use helpers\Authentication\AuthenticationService;
-use helpers\View;
+use Selfoss\helpers\Authentication\AuthenticationService;
+use Selfoss\helpers\View;
 
 /**
  * Controller for user related tasks

src/controllers/Helpers/HashPassword.php

@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace controllers\Helpers;
+namespace Selfoss\controllers\Helpers;
 
-use helpers\Authentication;
-use helpers\View;
+use Selfoss\helpers\Authentication;
+use Selfoss\helpers\View;
 
 /**
  * Controller for user related tasks

src/controllers/Index.php

@@ -2,14 +2,15 @@
 
 declare(strict_types=1);
 
-namespace controllers;
+namespace Selfoss\controllers;
 
 use Bramus\Router\Router;
-use daos\ItemOptions;
-use helpers\Authentication;
-use helpers\StringKeyedArray;
-use helpers\View;
-use helpers\ViewHelper;
+use Selfoss\daos;
+use Selfoss\daos\ItemOptions;
+use Selfoss\helpers\Authentication;
+use Selfoss\helpers\StringKeyedArray;
+use Selfoss\helpers\View;
+use Selfoss\helpers\ViewHelper;
 
 /**
  * Controller for root
@@ -21,11 +22,11 @@
 final readonly class Index {
     public function __construct(
         private Authentication $authentication,
-        private \daos\Items $itemsDao,
+        private daos\Items $itemsDao,
         private Router $router,
-        private \daos\Sources $sourcesDao,
+        private daos\Sources $sourcesDao,
         private Tags $tagsController,
-        private \daos\Tags $tagsDao,
+        private daos\Tags $tagsDao,
         private View $view,
         private ViewHelper $viewHelper
     ) {

src/controllers/Items.php

@@ -2,15 +2,15 @@
 
 declare(strict_types=1);
 
-namespace controllers;
+namespace Selfoss\controllers;
 
-use daos\ItemOptions;
 use DateTimeInterface;
-use helpers\Authentication;
-use helpers\Misc;
-use helpers\Request;
-use helpers\View;
 use InvalidArgumentException;
+use Selfoss\daos\ItemOptions;
+use Selfoss\helpers\Authentication;
+use Selfoss\helpers\Misc;
+use Selfoss\helpers\Request;
+use Selfoss\helpers\View;
 
 /**
  * Controller for item handling
@@ -22,7 +22,7 @@
 final readonly class Items {
     public function __construct(
         private Authentication $authentication,
-        private \daos\Items $itemsDao,
+        private \Selfoss\daos\Items $itemsDao,
         private Request $request,
         private View $view
     ) {

src/controllers/Items/Stats.php

@@ -2,20 +2,21 @@
 
 declare(strict_types=1);
 
-namespace controllers\Items;
+namespace Selfoss\controllers\Items;
 
-use helpers\Authentication;
-use helpers\View;
+use Selfoss\daos;
+use Selfoss\helpers\Authentication;
+use Selfoss\helpers\View;
 
 /**
  * Controller for viewing item statistics
  */
 final readonly class Stats {
     public function __construct(
         private Authentication $authentication,
-        private \daos\Items $itemsDao,
-        private \daos\Sources $sourcesDao,
-        private \daos\Tags $tagsDao,
+        private daos\Items $itemsDao,
+        private daos\Sources $sourcesDao,
+        private daos\Tags $tagsDao,
         private View $view
     ) {
     }

src/controllers/Items/Sync.php

@@ -2,13 +2,14 @@
 
 declare(strict_types=1);
 
-namespace controllers\Items;
+namespace Selfoss\controllers\Items;
 
-use helpers\Authentication;
-use helpers\Configuration;
-use function helpers\json_response;
-use helpers\View;
-use helpers\ViewHelper;
+use Selfoss\daos;
+use Selfoss\helpers\Authentication;
+use Selfoss\helpers\Configuration;
+use function Selfoss\helpers\json_response;
+use Selfoss\helpers\View;
+use Selfoss\helpers\ViewHelper;
 
 /**
  * Controller for synchronizing item statuses
@@ -17,10 +18,10 @@
     public function __construct(
         private Authentication $authentication,
         private Configuration $configuration,
-        private \daos\Items $itemsDao,
-        private \daos\Sources $sourcesDao,
-        private \controllers\Tags $tagsController,
-        private \daos\Tags $tagsDao,
+        private daos\Items $itemsDao,
+        private daos\Sources $sourcesDao,
+        private \Selfoss\controllers\Tags $tagsController,
+        private daos\Tags $tagsDao,
         private View $view,
         private ViewHelper $viewHelper
     ) {

src/controllers/Opml/Export.php

@@ -2,13 +2,14 @@
 
 declare(strict_types=1);
 
-namespace controllers\Opml;
+namespace Selfoss\controllers\Opml;
 
-use helpers\Authentication;
-use helpers\Configuration;
-use helpers\SpoutLoader;
-use helpers\StringKeyedArray;
 use Monolog\Logger;
+use Selfoss\daos;
+use Selfoss\helpers\Authentication;
+use Selfoss\helpers\Configuration;
+use Selfoss\helpers\SpoutLoader;
+use Selfoss\helpers\StringKeyedArray;
 
 /**
  * OPML loading and exporting controller
@@ -23,9 +24,9 @@ public function __construct(
         private Authentication $authentication,
         private Configuration $configuration,
         private Logger $logger,
-        private \daos\Sources $sourcesDao,
+        private daos\Sources $sourcesDao,
         private SpoutLoader $spoutLoader,
-        private \daos\Tags $tagsDao,
+        private daos\Tags $tagsDao,
         private \XMLWriter $writer
     ) {
     }

src/controllers/Opml/Import.php

@@ -2,11 +2,12 @@
 
 declare(strict_types=1);
 
-namespace controllers\Opml;
+namespace Selfoss\controllers\Opml;
 
-use helpers\Authentication;
-use helpers\View;
 use Monolog\Logger;
+use Selfoss\daos;
+use Selfoss\helpers\Authentication;
+use Selfoss\helpers\View;
 use SimpleXMLElement;
 
 /**
@@ -25,8 +26,8 @@ final class Import {
     public function __construct(
         private readonly Authentication $authentication,
         private readonly Logger $logger,
-        private readonly \daos\Sources $sourcesDao,
-        private readonly \daos\Tags $tagsDao,
+        private readonly daos\Sources $sourcesDao,
+        private readonly daos\Tags $tagsDao,
         private readonly View $view
     ) {
     }

src/controllers/Rss.php

@@ -2,13 +2,14 @@
 
 declare(strict_types=1);
 
-namespace controllers;
+namespace Selfoss\controllers;
 
-use daos\ItemOptions;
 use FeedWriter\RSS2;
-use helpers\Authentication;
-use helpers\Configuration;
-use helpers\View;
+use Selfoss\daos;
+use Selfoss\daos\ItemOptions;
+use Selfoss\helpers\Authentication;
+use Selfoss\helpers\Configuration;
+use Selfoss\helpers\View;
 
 /**
  * Controller for rss access
@@ -22,8 +23,8 @@ public function __construct(
         private Authentication $authentication,
         private Configuration $configuration,
         private RSS2 $feedWriter,
-        private \daos\Items $itemsDao,
-        private \daos\Sources $sourcesDao,
+        private daos\Items $itemsDao,
+        private daos\Sources $sourcesDao,
         private View $view
     ) {
     }

src/controllers/Sources.php

@@ -2,13 +2,14 @@
 
 declare(strict_types=1);
 
-namespace controllers;
+namespace Selfoss\controllers;
 
-use helpers\Authentication;
-use helpers\Misc;
-use helpers\SpoutLoader;
-use helpers\View;
 use InvalidArgumentException;
+use Selfoss\daos;
+use Selfoss\helpers\Authentication;
+use Selfoss\helpers\Misc;
+use Selfoss\helpers\SpoutLoader;
+use Selfoss\helpers\View;
 
 /**
  * Controller for sources handling
@@ -20,9 +21,9 @@
 final readonly class Sources {
     public function __construct(
         private Authentication $authentication,
-        private \daos\Sources $sourcesDao,
+        private daos\Sources $sourcesDao,
         private SpoutLoader $spoutLoader,
-        private \daos\Tags $tagsDao,
+        private daos\Tags $tagsDao,
         private View $view
     ) {
     }