Move non-spouts to Selfoss namespace

Simplifies PSR-4 definition.

Author: jtojnar

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

@@ -45,10 +45,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;

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,14 @@
 
 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\ItemOptions;
+use Selfoss\helpers\Authentication;
+use Selfoss\helpers\StringKeyedArray;
+use Selfoss\helpers\View;
+use Selfoss\helpers\ViewHelper;
 
 /**
  * Controller for root
@@ -20,15 +20,15 @@
  */
 class Index {
     private Authentication $authentication;
-    private \daos\Items $itemsDao;
+    private \Selfoss\daos\Items $itemsDao;
     private Router $router;
-    private \daos\Sources $sourcesDao;
+    private \Selfoss\daos\Sources $sourcesDao;
     private Tags $tagsController;
-    private \daos\Tags $tagsDao;
+    private \Selfoss\daos\Tags $tagsDao;
     private View $view;
     private ViewHelper $viewHelper;
 
-    public function __construct(Authentication $authentication, \daos\Items $itemsDao, Router $router, \daos\Sources $sourcesDao, Tags $tagsController, \daos\Tags $tagsDao, View $view, ViewHelper $viewHelper) {
+    public function __construct(Authentication $authentication, \Selfoss\daos\Items $itemsDao, Router $router, \Selfoss\daos\Sources $sourcesDao, Tags $tagsController, \Selfoss\daos\Tags $tagsDao, View $view, ViewHelper $viewHelper) {
         $this->authentication = $authentication;
         $this->itemsDao = $itemsDao;
         $this->router = $router;

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
@@ -21,13 +21,13 @@
  */
 class Items {
     private Authentication $authentication;
-    private \daos\Items $itemsDao;
+    private \Selfoss\daos\Items $itemsDao;
     private Request $request;
     private View $view;
 
     public function __construct(
         Authentication $authentication,
-        \daos\Items $itemsDao,
+        \Selfoss\daos\Items $itemsDao,
         Request $request,
         View $view
     ) {

src/controllers/Items/Stats.php

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