Cleaning core file structure

Author: marcelfolaron

CONTRIBUTING.md

@@ -57,7 +57,7 @@ We are using the [PSR-12 coding style](https://www.php-fig.org/psr/psr-12/) for
 As mentioned above we are following PSR-12 naming conventions. Some areas are not covered in the standard and will be covered in this section. For sake of completion we include all naming conventions in this section.
 
 **Classes**
-Pascal Case (Example: `Leantime.Core.FrontController`
+Pascal Case (Example: `leantime.core.controller.frontcontroller`
 
 **Class Methods**
 Camel Case (Example: `$object->getItem()`

app/Command/BackupDbCommand.php

@@ -3,13 +3,12 @@
 namespace Leantime\Command;
 
 use Illuminate\Contracts\Container\BindingResolutionException;
+use Leantime\Core\Configuration\Environment;
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
-use Leantime\Domain\Install\Repositories\Install;
-use Symfony\Component\Console\Attribute\AsCommand;
-use Leantime\Core\Environment;
 
 use function PHPUnit\Framework\directoryExists;
 

app/Command/TestEmailCommand.php

@@ -3,14 +3,14 @@
 namespace Leantime\Command;
 
 use Illuminate\Contracts\Container\BindingResolutionException;
-use Leantime\Core\Environment;
+use Leantime\Core\Configuration\Environment;
+use Leantime\Core\Mailer;
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
-use Leantime\Core\Mailer;
-use Symfony\Component\Console\Attribute\AsCommand;
 
 /**
  * Class TestEmailCommand

app/Command/UpdateLeantime.php

@@ -3,16 +3,14 @@
 namespace Leantime\Command;
 
 use Illuminate\Contracts\Container\BindingResolutionException;
+use Leantime\Core\Configuration\AppSettings;
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
-use Leantime\Domain\Install\Repositories\Install;
-use Symfony\Component\Console\Attribute\AsCommand;
-use Leantime\Core\AppSettings;
-use Leantime\Core\Environment;
-use Symfony\Component\Console\Input\ArrayInput;
 
 /**
  * Class UpdateLeantime

app/Core/Application.php app/Core/Bootstrap/Application.php

@@ -1,22 +1,26 @@
 <?php
 
-namespace Leantime\Core;
+namespace Leantime\Core\Bootstrap;
 
-use Illuminate\Cache\MemcachedConnector;
 use Illuminate\Container\Container;
 use Illuminate\Contracts\Console\Kernel as ConsoleKernelContract;
 use Illuminate\Contracts\Container\Container as IlluminateContainerContract;
-use Illuminate\Support\Arr;
-use Illuminate\Support\ServiceProvider;
 use Illuminate\Contracts\Http\Kernel as HttpKernelContract;
-use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Facade;
-use Leantime\Domain\Auth\Services\Auth as AuthService;
+use Illuminate\Support\ServiceProvider;
+use Leantime\Core\Configuration\Environment;
+use Leantime\Core\Console\CliRequest;
+use Leantime\Core\Console\ConsoleKernel;
+use Leantime\Core\Controller\Frontcontroller;
+use Leantime\Core\Events\EventDispatcher;
+use Leantime\Core\Exceptions\ExceptionHandler;
+use Leantime\Core\Http\ApiRequest;
+use Leantime\Core\Http\HtmxRequest;
+use Leantime\Core\Http\HttpKernel;
+use Leantime\Core\Http\IncomingRequest;
 use Leantime\Domain\Modulemanager\Services\Modulemanager as ModulemanagerService;
-use Leantime\Domain\Oidc\Services\Oidc as OidcService;
-use Leantime\Domain\Setting\Services\Setting as SettingsService;
 use Psr\Container\ContainerInterface as PsrContainerContract;
-use Symfony\Component\ErrorHandler\Debug;
 
 /**
  * Application Class - IoC Container for the application
@@ -94,7 +98,7 @@ public function __construct()
 
         Facade::setFacadeApplication($this);
 
-        Events::discover_listeners();
+        EventDispatcher::discover_listeners();
 
         $this->boot();
     }
@@ -212,7 +216,7 @@ private function registerCoreAliases(): void
 
         $this->alias(\Illuminate\Encryption\Encrypter::class, "encrypter");
 
-        $this->alias(\Leantime\Core\Events::class, 'events');
+        $this->alias(\Leantime\Core\Events\EventDispatcher::class, 'events');
     }
 
     /**

app/Core/Bootloader.php app/Core/Bootstrap/Bootloader.php

@@ -1,26 +1,15 @@
 <?php
 
-namespace Leantime\Core;
+namespace Leantime\Core\Bootstrap;
 
 use GuzzleHttp\Promise\PromiseInterface;
-use Illuminate\Cache\MemcachedConnector;
-use Illuminate\Contracts\Console\Kernel as ConsoleKernelContract;
 use Illuminate\Contracts\Container\BindingResolutionException;
-use Illuminate\Contracts\Container\Container as IlluminateContainerContract;
-use Illuminate\Contracts\Encryption\Encrypter;
-use Illuminate\Contracts\Http\Kernel as HttpKernelContract;
-use Illuminate\Redis\RedisManager;
-use Illuminate\Session\SessionManager;
-use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\Crypt;
-use Illuminate\Support\Facades\Facade;
-use Illuminate\Support\Facades\Log;
-use Leantime\Domain\Auth\Services\Auth as AuthService;
-use Leantime\Domain\Modulemanager\Services\Modulemanager as ModulemanagerService;
-use Leantime\Domain\Oidc\Services\Oidc as OidcService;
-use Leantime\Domain\Setting\Services\Setting as SettingsService;
+use Leantime\Core\Console\CliRequest;
+use Leantime\Core\Console\ConsoleKernel;
+use Leantime\Core\Events\Eventhelpers;
+use Leantime\Core\Http\HttpKernel;
+use Leantime\Core\Http\IncomingRequest;
 use Psr\Container\ContainerInterface as PsrContainerContract;
-use Symfony\Component\ErrorHandler\Debug;
 
 /**
  * Bootloader

app/Core/CliRequest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Leantime\Core;
+namespace Leantime\Core\Configuration;
 
 /**
  * appSettings class - System appSettings

app/Core/AppSettings.php app/Core/Configuration/AppSettings.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Leantime\Core;
+namespace Leantime\Core\Configuration;
 
 /**
  * Default Configuration Class

app/Core/DefaultConfig.php app/Core/Configuration/DefaultConfig.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Leantime\Core;
+namespace Leantime\Core\Configuration;
 
 use ArrayAccess;
 use Dotenv\Dotenv;

app/Core/Environment.php app/Core/Configuration/Environment.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Leantime\Core\Console;
+
+use Leantime\Core\Http\IncomingRequest;
+
+class CliRequest extends IncomingRequest
+{
+    //
+}

app/Core/Console/CliRequest.php

@@ -1,7 +1,8 @@
 <?php
 
-namespace Leantime\Core;
+namespace Leantime\Core\Console;
 
+use;
 use Illuminate\Console\Command as LaravelCommand;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Contracts\Console\Application as ConsoleApplicationContract;
@@ -10,6 +11,7 @@
 use Illuminate\Support\Arr;
 use Illuminate\Support\ProcessUtils;
 use Illuminate\Support\Str;
+use Leantime\Core\Events\Eventhelpers;
 use Leantime\Domain\Plugins\Services\Plugins as PluginsService;
 use Symfony\Component\Console\Application as ConsoleApplication;
 use Symfony\Component\Console\Command\Command as SymfonyCommand;

app/Core/ConsoleKernel.php app/Core/Console/ConsoleKernel.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Leantime\Core;
+namespace Leantime\Core\Contracts;
 
 /**
  * Service Interface - Base interface for all services
@@ -65,5 +65,5 @@ public function get(int $id);
      * @param array|null $searchparams Search parameters
      * @return array|false Returns array on success, false on failure. No results should return empty array
      */
-    public function getAll(array $searchparams = null);
+        public function query(array $searchparams = null);
 }

app/Core/Service.php app/Core/Contracts/Service.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Leantime\Core;
+namespace Leantime\Core\Controller;
 
 use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Support\Fluent;

app/Core/Composer.php app/Core/Controller/Composer.php

@@ -1,9 +1,13 @@
 <?php
 
-namespace Leantime\Core;
+namespace Leantime\Core\Controller;
 
 use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Http\Exceptions\HttpResponseException;
+use Leantime\Core\Events\Eventhelpers;
+use Leantime\Core\Http\IncomingRequest;
+use Leantime\Core\Language;
+use Leantime\Core\Template;
 use Symfony\Component\HttpFoundation\Response;
 
 /**

app/Core/Controller.php app/Core/Controller/Controller.php

@@ -1,9 +1,12 @@
 <?php
 
-namespace Leantime\Core;
+namespace Leantime\Core\Controller;
 
 use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Support\Str;
+use Leantime\Core\Events\Eventhelpers;
+use Leantime\Core\Http\HtmxRequest;
+use Leantime\Core\Http\IncomingRequest;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Response;
 

app/Core/Frontcontroller.php app/Core/Controller/Frontcontroller.php

@@ -1,10 +1,13 @@
 <?php
 
-namespace Leantime\Core;
+namespace Leantime\Core\Controller;
 
 use Error;
 use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Support\Str;
+use Leantime\Core\Events\Eventhelpers;
+use Leantime\Core\Http\IncomingRequest;
+use Leantime\Core\Template;
 use LogicException;
 use Symfony\Component\HttpFoundation\Response;
 

app/Core/HtmxController.php app/Core/Controller/HtmxController.php

@@ -1,7 +1,11 @@
 <?php
 
-namespace Leantime\Core;
+namespace Leantime\Core\Db;
 
+use Leantime\Core\Configuration\Environment;
+use Leantime\Core\Console\CliRequest;
+use Leantime\Core\Events\Eventhelpers;
+use Leantime\Core\Http\IncomingRequest;
 use PDO;
 use PDOException;
 

app/Core/Db.php app/Core/Db/Db.php

@@ -1,8 +1,9 @@
 <?php
 
-namespace Leantime\Core;
+namespace Leantime\Core\Db;
 
 use Illuminate\Contracts\Container\BindingResolutionException;
+use Leantime\Core\Events\Eventhelpers;
 use PDO;
 use PDOStatement;
 use ReflectionClass;

app/Core/Repository.php app/Core/Db/Repository.php

@@ -1,19 +1,21 @@
 <?php
 
-namespace Leantime\Core;
+namespace Leantime\Core\Events;
 
 use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Contracts\Events\Dispatcher;
 use Illuminate\Log\Events\MessageLogged;
 use Illuminate\Support\Facades\Cache;
+use Leantime\Core\Configuration\Environment;
+use Leantime\Core\Controller\Frontcontroller;
 
 /**
- * Events class - Handles all events and filters
+ * EventDispatcher class - Handles all events and filters
  *
  * @package    leantime
  * @subpackage core
  */
-class Events implements Dispatcher
+class EventDispatcher implements Dispatcher
 {
     /**
      * Registry of all events added to a hook
@@ -184,7 +186,7 @@ public static function discover_listeners(): void
 
         if(!config('debug')) {
             $modules = Cache::store('installation')->rememberForever('domainEvents', function () {
-                return Events::getDomainPaths();
+                return EventDispatcher::getDomainPaths();
             });
 
         }else{
@@ -209,7 +211,7 @@ public static function discover_listeners(): void
             }
         }
 
-        Events::add_event_listener('leantime.core.middleware.installed.handle.after_install', function () {
+        EventDispatcher::add_event_listener('leantime.core.middleware.installed.handle.after_install', function () {
             if (! session("isInstalled")) {
                 return;
             }

app/Core/Events.php app/Core/Events/EventDispatcher.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Leantime\Core {
+namespace Leantime\Core\Events {
 
     use Exception;
     use Illuminate\Contracts\Container\BindingResolutionException;
@@ -25,7 +25,7 @@ trait Eventhelpers
          */
         public static function dispatch_event(string $hook, mixed $available_params = [], string|int $function = null): void
         {
-            Events::dispatch_event($hook, $available_params, static::get_event_context($function));
+            EventDispatcher::dispatch_event($hook, $available_params, static::get_event_context($function));
         }
 
         /**
@@ -42,7 +42,7 @@ public static function dispatch_event(string $hook, mixed $available_params = []
          */
         public static function dispatch_filter(string $hook, mixed $payload, mixed $available_params = [], string|int $function = null): mixed
         {
-            return Events::dispatch_filter($hook, $payload, $available_params, static::get_event_context($function));
+            return EventDispatcher::dispatch_filter($hook, $payload, $available_params, static::get_event_context($function));
         }
 
         /**