Structure refactorings

Engine/Auth/.meta/.phpstorm.meta.php

@@ -3,7 +3,7 @@
 namespace PHPSTORM_META {
 
     if (function_exists('override')) {
-        override(\Oforge\Engine\Core\Manager\Services\ServiceManager::get(0), map([
+        override(\Oforge\Engine\Core\Managers\Services\ServiceManager::get(0), map([
             'auth'          => \Oforge\Engine\Auth\Services\AuthService::class,
             'backend.login' => \Oforge\Engine\Auth\Services\BackendLoginService::class,
             'password'      => \Oforge\Engine\Auth\Services\PasswordService::class,

Engine/Auth/Controller/SecureController.php → Engine/Auth/Controllers/SecureController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Oforge\Engine\Auth\Controller;
+namespace Oforge\Engine\Auth\Controllers;
 
 use Oforge\Engine\Auth\Models\User\User;
 use Oforge\Engine\Auth\Services\PermissionService;
@@ -10,7 +10,7 @@
 /**
  * Class SecureController
  *
- * @package Oforge\Engine\Auth\Controller
+ * @package Oforge\Engine\Auth\Controllers
  */
 class SecureController extends AbstractController {
     /** @var string $secureControllerUserClass */

Engine/Auth/Middleware/SecureMiddleware.php → Engine/Auth/Middlewares/SecureMiddleware.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Oforge\Engine\Auth\Middleware;
+namespace Oforge\Engine\Auth\Middlewares;
 
-use Oforge\Engine\Auth\Controller\SecureController;
+use Oforge\Engine\Auth\Controllers\SecureController;
 use Oforge\Engine\Auth\Models\User\User;
 use Oforge\Engine\Auth\Services\AuthService;
 use Oforge\Engine\Auth\Services\PermissionService;

Engine/Auth/Services/PermissionService.php

@@ -2,7 +2,7 @@
 
 namespace Oforge\Engine\Auth\Services;
 
-use Oforge\Engine\Auth\Controller\SecureController;
+use Oforge\Engine\Auth\Controllers\SecureController;
 
 /**
  * Class Permissions

Engine/Cache/.meta/.phpstorm.meta.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace PHPSTORM_META {
+
+    if (function_exists('override')) {
+        // override(\Oforge\Engine\Core\Managers\Services\ServiceManager::get(0), map([
+        // ]));
+    }
+
+}

Engine/Cache/.meta/plugin.meta.php

@@ -0,0 +1,8 @@
+<?php
+
+return [
+    'type'      => 'Engine',
+    'name'      => 'Cache',
+    'version'   => '20201009',
+    'updateUrl' => '',
+];

Engine/Cache/Helper/Cache.php → Engine/Cache/Managers/CacheManager.php

@@ -1,11 +1,16 @@
 <?php
 
-namespace Oforge\Engine\Cache\Helper;
+namespace Oforge\Engine\Cache\Managers;
 
 use Oforge\Engine\Cache\Lib\ArrayCache;
 use Oforge\Engine\Cache\Lib\ArrayNestedCache;
 
-class Cache {
+/**
+ * Class CacheManager
+ *
+ * @package Oforge\Engine\Cache\Managers
+ */
+class CacheManager {
 
     /** Prevent Instance */
     private function __construct() {

Engine/Console/.meta/.phpstorm.meta.php

@@ -3,7 +3,7 @@
 namespace PHPSTORM_META {
 
     if (function_exists('override')) {
-        override(\Oforge\Engine\Core\Manager\Services\ServiceManager::get(0), map([
+        override(\Oforge\Engine\Core\Managers\Services\ServiceManager::get(0), map([
             'console' => \Oforge\Engine\Console\Services\ConsoleService::class,
         ]));
     }

Engine/Core/.meta/.phpstorm.meta.php

@@ -3,18 +3,18 @@
 namespace PHPSTORM_META {
 
     if (function_exists('override')) {
-        override(\Oforge\Engine\Core\Manager\Services\ServiceManager::get(0), map([
-            'config'             => \Oforge\Engine\Core\Services\ConfigService::class,
-            'encryption'         => \Oforge\Engine\Core\Services\EncryptionService::class,
-            'endpoint'           => \Oforge\Engine\Core\Services\EndpointService::class,
-            'middleware'         => \Oforge\Engine\Core\Services\MiddlewareService::class,
-            'ping'               => \Oforge\Engine\Core\Services\PingService::class,
-            'plugin.access'      => \Oforge\Engine\Core\Services\PluginAccessService::class,
-            'plugin.state'       => \Oforge\Engine\Core\Services\PluginStateService::class,
-            'redirect'           => \Oforge\Engine\Core\Services\RedirectService::class,
-            'session.management' => \Oforge\Engine\Core\Services\Session\SessionManagementService::class,
-            'store.keyvalue'     => \Oforge\Engine\Core\Services\KeyValueStoreService::class,
-            'token'              => \Oforge\Engine\Core\Services\TokenService::class,
+        override(\Oforge\Engine\Core\Managers\Services\ServiceManager::get(0), map([
+            'config'         => \Oforge\Engine\Core\Services\ConfigService::class,
+            'encryption'     => \Oforge\Engine\Core\Services\EncryptionService::class,
+            'endpoint'       => \Oforge\Engine\Core\Services\EndpointService::class,
+            'middleware'     => \Oforge\Engine\Core\Services\MiddlewareService::class,
+            'ping'           => \Oforge\Engine\Core\Services\PingService::class,
+            'plugin.access'  => \Oforge\Engine\Core\Services\PluginAccessService::class,
+            'plugin.state'   => \Oforge\Engine\Core\Services\PluginStateService::class,
+            'redirect'       => \Oforge\Engine\Core\Services\RedirectService::class,
+            'session'        => \Oforge\Engine\Core\Services\Session\SessionService::class,
+            'store.keyvalue' => \Oforge\Engine\Core\Services\KeyValueStoreService::class,
+            'token'          => \Oforge\Engine\Core\Services\TokenService::class,
         ]));
 
         registerArgumentsSet('oforge_flash_message_types', 'success', 'error', 'warning', 'info');

Engine/Core/Annotation/Cache/Cache.php → Engine/Core/Annotations/Cache/Cache.php

@@ -1,29 +1,20 @@
 <?php
 
-namespace Oforge\Engine\Core\Annotation\Cache;
+namespace Oforge\Engine\Core\Annotations\Cache;
 
 /**
  * Class Cache
  *
  * @Annotation
  * @Target({"METHOD", "CLASS"})
- * @package Oforge\Engine\Core\Annotation\Cache
+ * @package Oforge\Engine\Core\Annotations\Cache
  */
 class Cache {
-    /**
-     * Slot.
-     *
-     * @var string $slot
-     */
+    /** @var string $slot Slot. */
     private $slot;
-    /**
-     * @var string $duration
-     */
+    /** @var string $duration */
     private $duration;
-
-    /**
-     * @var bool $enabled
-     */
+    /** @var bool $enabled */
     private $enabled;
 
     /**

Engine/Core/Annotation/Cache/CacheInvalidation.php → Engine/Core/Annotations/Cache/CacheInvalidation.php

@@ -1,21 +1,16 @@
 <?php
 
-namespace Oforge\Engine\Core\Annotation\Cache;
-
+namespace Oforge\Engine\Core\Annotations\Cache;
 
 /**
  * Class CacheInvalidation
  *
  * @Annotation
  * @Target({"METHOD"})
- * @package Oforge\Engine\Core\Annotation\Cache
+ * @package Oforge\Engine\Core\Annotations\Cache
  */
 class CacheInvalidation {
-    /**
-     * Slot.
-     *
-     * @var string $slot
-     */
+    /** @var string $slot Slot. */
     private $slot;
 
     /**
@@ -24,7 +19,7 @@ class CacheInvalidation {
      * @param array $config
      */
     public function __construct(array $config) {
-        $this->slot       = $config['slot'] ?? 'default';
+        $this->slot = $config['slot'] ?? 'default';
     }
 
     /**

Engine/Core/Annotation/Endpoint/AssetBundlesMode.php → Engine/Core/Annotations/Endpoint/AssetBundleMode.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace Oforge\Engine\Core\Annotation\Endpoint;
+namespace Oforge\Engine\Core\Annotations\Endpoint;
 
 /**
- * Class AssetBundlesMode
+ * Class AssetBundleMode
  *
- * @package Oforge\Engine\Core\Annotation\Endpoint
+ * @package Oforge\Engine\Core\Annotations\Endpoint
  */
-class AssetBundlesMode {
+class AssetBundleMode {
     public const MERGE    = 'merge';
     public const NONE     = 'none';
     public const OVERRIDE = 'override';

Engine/Core/Annotation/Endpoint/EndpointAction.php → Engine/Core/Annotations/Endpoint/EndpointAction.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Oforge\Engine\Core\Annotation\Endpoint;
+namespace Oforge\Engine\Core\Annotations\Endpoint;
 
 use Oforge\Engine\Core\Models\Endpoint\EndpointMethod;
 
@@ -9,7 +9,7 @@
  *
  * @Annotation
  * @Target({"METHOD"})
- * @package Oforge\Engine\Core\Annotation\Endpoint
+ * @package Oforge\Engine\Core\Annotations\Endpoint
  */
 class EndpointAction {
     /**
@@ -37,11 +37,11 @@ class EndpointAction {
      */
     private $assetBundles;
     /**
-     * Mode of how assetsBundles are created for endpoint. AssetBundlesMode::OVERRIDE (default) or AssetBundlesMode::MERGE or AssetBundlesMode::NONE.
+     * Mode of how assetsBundles are created for endpoint. AssetBundleMode::OVERRIDE (default) or AssetBundleMode::MERGE or AssetBundleMode::NONE.
      *
      * @var string|null $assetBundles
      */
-    private $assetBundlesMode = null;
+    private $assetBundleMode = null;
     /**
      * Route order for this action, overrides Endpoint#order.
      *
@@ -59,8 +59,8 @@ class EndpointAction {
      * @param array $config
      */
     public function __construct(array $config) {
-        $this->assetBundles     = $config['assetBundles'] ?? null;
-        $this->assetBundlesMode = $config['assetBundlesMode'] ?? null;
+        $this->assetBundles    = $config['assetBundles'] ?? null;
+        $this->assetBundleMode = $config['AssetBundleMode'] ?? null;
 
         $this->method = $config['method'] ?? EndpointMethod::ANY;
         $this->name   = $config['name'] ?? '';
@@ -100,8 +100,8 @@ public function getAssetBundles() {
     /**
      * @return string|null
      */
-    public function getAssetBundlesMode() : ?string {
-        return $this->assetBundlesMode;
+    public function getAssetBundleMode() : ?string {
+        return $this->assetBundleMode;
     }
 
     /**

Engine/Core/Annotation/Endpoint/EndpointClass.php → Engine/Core/Annotations/Endpoint/EndpointClass.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Oforge\Engine\Core\Annotation\Endpoint;
+namespace Oforge\Engine\Core\Annotations\Endpoint;
 
 use Doctrine\Common\Annotations\AnnotationException;
 
@@ -9,7 +9,7 @@
  *
  * @Annotation
  * @Target({"CLASS"})
- * @package Oforge\Engine\Core\Annotation\Endpoint
+ * @package Oforge\Engine\Core\Annotations\Endpoint
  */
 class EndpointClass {
     /**
@@ -25,11 +25,11 @@ class EndpointClass {
      */
     private $assetBundles;
     /**
-     * Mode of how assetsBundles are created for endpoint. AssetBundlesMode::OVERRIDE (default) or AssetBundlesMode::MERGE or AssetBundlesMode::NONE.
+     * Mode of how assetsBundles are created for endpoint. AssetBundleMode::OVERRIDE (default) or AssetBundleMode::MERGE or AssetBundleMode::NONE.
      *
      * @var string|null $assetBundles
      */
-    private $assetBundlesMode = null;
+    private $assetBundleMode = null;
     /**
      * Optional route name prefix (suffixed by Endpoint#name).
      *
@@ -57,8 +57,8 @@ class EndpointClass {
      * @throws AnnotationException
      */
     public function __construct(array $config) {
-        $this->assetBundles     = $config['assetBundles'] ?? null;
-        $this->assetBundlesMode = $config['assetBundlesMode'] ?? null;
+        $this->assetBundles    = $config['assetBundles'] ?? null;
+        $this->assetBundleMode = $config['AssetBundleMode'] ?? null;
 
         $this->name  = $config['name'] ?? '';
         $this->order = $config['order'] ?? null;
@@ -95,8 +95,8 @@ public function getAssetBundles() {
     /**
      * @return string|null
      */
-    public function getAssetBundlesMode() : ?string {
-        return $this->assetBundlesMode;
+    public function getAssetBundleMode() : ?string {
+        return $this->assetBundleMode;
     }
 
     /**