refactor: fix path and classes to comply with psr-4

Fix some paths and classes fileneme to comply with psr-4. Remove classmap from composer.json autoload
bacula-web · Jan 6, 2024 · cface17 · cface17
1 parent 9150ba9
commit cface17
Show file tree

Hide file tree

Showing 37 changed files with 48 additions and 52 deletions.
diff --git a/application/Command/SetupAuthCommand.php b/application/Command/SetupAuthCommand.php
@@ -21,7 +21,7 @@
 
 namespace App\Command;
 
-use App\Tables\UserTable;
+use App\Table\UserTable;
 use Core\Db\DatabaseFactory;
 use PDOException;
 use Symfony\Component\Console\Command\Command;

diff --git a/application/Controller/BackupJobController.php b/application/Controller/BackupJobController.php
@@ -22,7 +22,7 @@
 namespace App\Controller;
 
 use App\Libs\FileConfig;
-use App\Tables\JobTable;
+use App\Table\JobTable;
 use Core\Db\CDBQuery;
 use Core\Exception\AppException;
 use Core\Exception\ConfigFileException;

diff --git a/application/Controller/ClientController.php b/application/Controller/ClientController.php
@@ -29,8 +29,8 @@
 use Core\Utils\DateTimeUtil;
 use Core\Utils\CUtils;
 use Core\Helpers\Sanitizer;
-use App\Tables\JobTable;
-use App\Tables\ClientTable;
+use App\Table\JobTable;
+use App\Table\ClientTable;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use GuzzleHttp\Psr7\Response;
 use Slim\Views\Twig;

diff --git a/application/Controller/DirectorController.php b/application/Controller/DirectorController.php
@@ -25,12 +25,12 @@
 
 use Core\Db\DatabaseFactory;
 use App\Libs\FileConfig;
-use App\Tables\ClientTable;
-use App\Tables\JobTable;
-use App\Tables\CatalogTable;
-use App\Tables\VolumeTable;
-use App\Tables\PoolTable;
-use App\Tables\FileSetTable;
+use App\Table\ClientTable;
+use App\Table\JobTable;
+use App\Table\CatalogTable;
+use App\Table\VolumeTable;
+use App\Table\PoolTable;
+use App\Table\FileSetTable;
 use Core\Exception\ConfigFileException;
 use Core\Utils\CUtils;
 use Odan\Session\PhpSession;

diff --git a/application/Controller/HomeController.php b/application/Controller/HomeController.php
@@ -21,9 +21,9 @@
 namespace App\Controller;
 
 use App\Libs\FileConfig;
-use App\Tables\JobTable;
-use App\Tables\PoolTable;
-use App\Tables\VolumeTable;
+use App\Table\JobTable;
+use App\Table\PoolTable;
+use App\Table\VolumeTable;
 use Odan\Session\SessionInterface;
 use Slim\Views\Twig;
 use Core\Db\CDBQuery;

diff --git a/application/Controller/JobController.php b/application/Controller/JobController.php
@@ -22,17 +22,17 @@
 namespace App\Controller;
 
 use App\Libs\FileConfig;
-use App\Tables\JobFileTable;
-use App\Tables\LogTable;
-use Core\Db\CDBPagination;
+use App\Table\JobFileTable;
+use App\Table\LogTable;
+use Core\Db\DBPagination;
 use Core\Db\CDBQuery;
 use Core\Exception\ConfigFileException;
 use Core\Helpers\Sanitizer;
 use Core\Utils\CUtils;
 use Core\Utils\DateTimeUtil;
-use App\Tables\JobTable;
-use App\Tables\ClientTable;
-use App\Tables\PoolTable;
+use App\Table\JobTable;
+use App\Table\ClientTable;
+use App\Table\PoolTable;
 use Exception;
 use GuzzleHttp\Psr7\Response;
 use Odan\Session\SessionInterface;
@@ -337,7 +337,7 @@ public function index(Request $request, Response $response, $args): Response
             $tplData['result_order_asc_checked'] = '';
         }
 
-        $pagination = new CDBPagination($request);
+        $pagination = new DBPagination($request);
 
         // Parsing jobs result
         $sqlQuery = CDBQuery::get_Select(array('table' => 'Job',

diff --git a/application/Controller/PoolController.php b/application/Controller/PoolController.php
@@ -22,7 +22,7 @@
 namespace App\Controller;
 
 use Core\Utils\CUtils;
-use App\Tables\PoolTable;
+use App\Table\PoolTable;
 use Exception;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use GuzzleHttp\Psr7\Response;

diff --git a/application/Controller/SettingsController.php b/application/Controller/SettingsController.php
@@ -22,7 +22,7 @@
 namespace App\Controller;
 
 use App\Libs\FileConfig;
-use App\Tables\UserTable;
+use App\Table\UserTable;
 use Slim\Views\Twig;
 use Core\Exception\AppException;
 use Core\Helpers\Sanitizer;

diff --git a/application/Controller/TestController.php b/application/Controller/TestController.php
@@ -20,7 +20,7 @@
 
 namespace App\Controller;
 
-use App\Tables\CatalogTable;
+use App\Table\CatalogTable;
 use Core\Exception\AppException;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use GuzzleHttp\Psr7\Response;

diff --git a/application/Controller/UserController.php b/application/Controller/UserController.php
@@ -21,7 +21,7 @@
 
 namespace App\Controller;
 
-use App\Tables\UserTable;
+use App\Table\UserTable;
 use Core\App\UserAuth;
 use Slim\Views\Twig;
 use Core\Helpers\Sanitizer;

diff --git a/application/Controller/VolumesController.php b/application/Controller/VolumesController.php
@@ -23,11 +23,11 @@
 
 use App\Libs\FileConfig;
 use Core\Db\CDBQuery;
-use Core\Db\CDBPagination;
+use Core\Db\DBPagination;
 use Core\Exception\ConfigFileException;
 use Core\Utils\CUtils;
-use App\Tables\VolumeTable;
-use App\Tables\PoolTable;
+use App\Table\VolumeTable;
+use App\Table\PoolTable;
 use Date_HumanDiff;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use GuzzleHttp\Psr7\Response;
@@ -169,7 +169,7 @@ public function index(Request $request, Response $response): Response
             'Pool.Name AS pool_name'
         ];
 
-        $pagination = new CDBPagination($request);
+        $pagination = new DBPagination($request);
 
         $sqlQuery = CDBQuery::get_Select(array('table' => $this->volumeTable->getTableName(),
                                             'fields' => $fields,

diff --git a/application/libs/FileConfig.php → application/Libs/FileConfig.php b/application/libs/FileConfig.php → application/Libs/FileConfig.php
diff --git a/application/tables/CatalogTable.php → application/Table/CatalogTable.php b/application/tables/CatalogTable.php → application/Table/CatalogTable.php
@@ -19,7 +19,7 @@
  * <https://www.gnu.org/licenses/>.
  */
 
-namespace App\Tables;
+namespace App\Table;
 
 use Core\Db\Table;
 use App\Libs\FileConfig;

diff --git a/application/tables/ClientTable.php → application/Table/ClientTable.php b/application/tables/ClientTable.php → application/Table/ClientTable.php
@@ -17,7 +17,7 @@
  * <https://www.gnu.org/licenses/>.
  */
 
-namespace App\Tables;
+namespace App\Table;
 
 use Core\Db\Table;
 use Core\Db\CDBQuery;

diff --git a/application/tables/FileSetTable.php → application/Table/FileSetTable.php b/application/tables/FileSetTable.php → application/Table/FileSetTable.php
@@ -17,7 +17,7 @@
  * <https://www.gnu.org/licenses/>.
  */
 
-namespace App\Tables;
+namespace App\Table;
 
 use Core\Db\Table;
 

diff --git a/application/tables/JobFileTable.php → application/Table/JobFileTable.php b/application/tables/JobFileTable.php → application/Table/JobFileTable.php
@@ -25,7 +25,7 @@
  * @copyright 2018-2021 Gabriele Orlando
  */
 
-namespace App\Tables;
+namespace App\Table;
 
 use Core\Db\CDBQuery;
 use Core\Db\Database;

diff --git a/application/tables/JobTable.php → application/Table/JobTable.php b/application/tables/JobTable.php → application/Table/JobTable.php
@@ -19,7 +19,7 @@
  * <https://www.gnu.org/licenses/>.
  */
 
-namespace App\Tables;
+namespace App\Table;
 
 use App\Entity\Job;
 use Core\Db\CDBQuery;

diff --git a/application/tables/LogTable.php → application/Table/LogTable.php b/application/tables/LogTable.php → application/Table/LogTable.php
@@ -17,7 +17,7 @@
  * <https://www.gnu.org/licenses/>.
  */
 
-namespace App\Tables;
+namespace App\Table;
 
 use Core\Db\Table;
 

diff --git a/application/tables/PoolTable.php → application/Table/PoolTable.php b/application/tables/PoolTable.php → application/Table/PoolTable.php
@@ -19,7 +19,7 @@
  * <https://www.gnu.org/licenses/>.
  */
 
-namespace App\Tables;
+namespace App\Table;
 
 use Core\Db\Table;
 use Core\Db\CDBQuery;

diff --git a/application/tables/UserTable.php → application/Table/UserTable.php b/application/tables/UserTable.php → application/Table/UserTable.php
@@ -19,7 +19,7 @@
  * <https://www.gnu.org/licenses/>.
  */
 
-namespace App\Tables;
+namespace App\Table;
 
 use App\Entity\User;
 use Core\App\CErrorHandler;

diff --git a/application/tables/VolumeTable.php → application/Table/VolumeTable.php b/application/tables/VolumeTable.php → application/Table/VolumeTable.php
@@ -19,7 +19,7 @@
  * <https://www.gnu.org/licenses/>.
  */
 
-namespace App\Tables;
+namespace App\Table;
 
 use Core\Db\Table;
 use Core\Db\CDBQuery;

diff --git a/application/config/container-bindings.php b/application/config/container-bindings.php
@@ -4,14 +4,14 @@
 
 use App\CsrfErrorHandler;
 use App\Libs\FileConfig;
-use App\Tables\CatalogTable;
-use App\Tables\ClientTable;
-use App\Tables\JobFileTable;
-use App\Tables\JobTable;
-use App\Tables\LogTable;
-use App\Tables\PoolTable;
-use App\Tables\UserTable;
-use App\Tables\VolumeTable;
+use App\Table\CatalogTable;
+use App\Table\ClientTable;
+use App\Table\JobFileTable;
+use App\Table\JobTable;
+use App\Table\LogTable;
+use App\Table\PoolTable;
+use App\Table\UserTable;
+use App\Table\VolumeTable;
 use Core\Db\DatabaseFactory;
 use Odan\Session\PhpSession;
 use Odan\Session\SessionInterface;

diff --git a/composer.json b/composer.json
@@ -62,12 +62,8 @@
       "Core\\": "core/",
       "App\\": "application/"
     },
-    "classmap": [
-      "core",
-      "application"
-    ],
     "files": [
-      "core/helpers/request.php"
+      "core/Helpers/request.php"
     ]
   },
   "scripts": {

diff --git a/core/App/UserAuth.php b/core/App/UserAuth.php
@@ -21,7 +21,7 @@
 
 namespace Core\App;
 
-use App\Tables\UserTable;
+use App\Table\UserTable;
 use Core\Db\DatabaseFactory;
 use Core\Exception\AppException;
 use Core\Exception\DatabaseException;

diff --git a/core/db/cdbquery.class.php → core/Db/CDBQuery.php b/core/db/cdbquery.class.php → core/Db/CDBQuery.php
diff --git a/core/db/cdbpagination.class.php → core/Db/DBPagination.php b/core/db/cdbpagination.class.php → core/Db/DBPagination.php
@@ -32,7 +32,7 @@
 use Psr\Http\Message\ServerRequestInterface;
 use function Core\Helpers\getRequestParams;
 
-class CDBPagination
+class DBPagination
 {
     /**
      * @var int

diff --git a/core/db/Database.php → core/Db/Database.php b/core/db/Database.php → core/Db/Database.php
diff --git a/core/db/DatabaseFactory.php → core/Db/DatabaseFactory.php b/core/db/DatabaseFactory.php → core/Db/DatabaseFactory.php
diff --git a/core/db/Table.php → core/Db/Table.php b/core/db/Table.php → core/Db/Table.php
diff --git a/core/graph/chart.class.php → core/Graph/Chart.php b/core/graph/chart.class.php → core/Graph/Chart.php
diff --git a/core/helpers/sanitizer.php → core/Helpers/Sanitizer.php b/core/helpers/sanitizer.php → core/Helpers/Sanitizer.php
diff --git a/core/helpers/request.php → core/Helpers/request.php b/core/helpers/request.php → core/Helpers/request.php
diff --git a/core/utils/cutils.class.php → core/Utils/CUtils.php b/core/utils/cutils.class.php → core/Utils/CUtils.php
diff --git a/core/utils/datetimeutil.class.php → core/Utils/DateTimeUtil.php b/core/utils/datetimeutil.class.php → core/Utils/DateTimeUtil.php
diff --git a/core/utils/ExceptionRenderer.php → core/Utils/ExceptionRenderer.php b/core/utils/ExceptionRenderer.php → core/Utils/ExceptionRenderer.php
diff --git a/core/utils/file.class.php → core/Utils/File.php b/core/utils/file.class.php → core/Utils/File.php
diff --git a/core/utils/htmlhelper.class.php → core/Utils/HtmlHelper.php b/core/utils/htmlhelper.class.php → core/Utils/HtmlHelper.php