Merge branch 'master' into ft/user-login-feature

puleeno · Apr 13, 2024 · 267079c · 267079c
2 parents facd2b6 + 74472b7
commit 267079c
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 29 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,18 +1,18 @@
 [submodule "extensions/react"]
 	path = extensions/react
-	url = https://github.com/quagga/react-extension.git
+	url = https://github.com/quagga-ext/react-extension.git
 [submodule "extensions/layout"]
 	path = extensions/layout
-	url = https://github.com/quagga/layout-extension.git
+	url = https://github.com/quagga-ext/layout-extension.git
 [submodule "extensions/dashboard"]
 	path = extensions/dashboard
-	url = https://github.com/quagga/dashboard-extension.git
+	url = https://github.com/quagga-ext/dashboard-extension.git
 [submodule "extensions/text-editor"]
 	path = extensions/text-editor
-	url = https://github.com/quagga/text-editor-extension.git
+	url = https://github.com/quagga-ext/text-editor-extension.git
 [submodule "extensions/file-manager"]
 	path = extensions/file-manager
-	url = https://github.com/quagga/file-manager-extension.git
+	url = https://github.com/quagga-ext/file-manager-extension.git
 [submodule "extensions/seo"]
 	path = extensions/seo
-	url = https://github.com/quagga/seo-extension.git
+	url = https://github.com/quagga-ext/seo-extension.git
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers;
 
-use Quagga\Quagga\Constracts\BackendControllerConstract;
-use Quagga\Quagga\Constracts\ControllerConstract;
+use Quagga\Contracts\BackendControllerConstract;
+use Quagga\Contracts\ControllerConstract;
 use Psr\Http\Message\ResponseInterface;
 use ReflectionClass;
 

diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
@@ -2,15 +2,15 @@
 
 namespace App\Http;
 
-use Quagga\Quagga\Constracts\ApplicationConstract;
+use Quagga\Contracts\ApplicationConstract;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Slim\App;
 
 class Kernel
 {
     /**
-     * @var \Quagga\Quagga\Constracts\ApplicationConstract
+     * @var \Quagga\Contracts\ApplicationConstract
      */
     private $app;
 

diff --git a/app/Http/Middleware/AssetsMiddleware.php b/app/Http/Middleware/AssetsMiddleware.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Middleware;
 
-use Quagga\Quagga\Constracts\MiddlewareConstract;
+use Quagga\Contracts\MiddlewareConstract;
 use Quagga\Quagga\AssetManager;
 use Quagga\Quagga\Helper;
 use Quagga\Quagga\HookManager;

diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Middleware;
 
-use Quagga\Quagga\Constracts\AuthenticateMiddlewareConstract;
+use Quagga\Contracts\AuthenticateMiddlewareConstract;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Server\MiddlewareInterface;

diff --git a/app/Traits/AssetBaseTrait.php b/app/Traits/AssetBaseTrait.php
@@ -2,7 +2,7 @@
 
 namespace App\Traits;
 
-use Quagga\Quagga\Constracts\Assets\AssetOptionsConstract;
+use Quagga\Contracts\Assets\AssetOptionsConstract;
 use Quagga\Quagga\Assets\AssetOptions;
 use Quagga\Quagga\Helper;
 
@@ -18,7 +18,7 @@ public function getOptions(): ?AssetOptionsConstract
     public function getOption($name, $defaultValue = null, $classObject = null)
     {
         /**
-         * @var \Quagga\Quagga\Constracts\Assets\AssetOptionsConstract
+         * @var \Quagga\Contracts\Assets\AssetOptionsConstract
          */
         $options = $this->getOptions() ?? new AssetOptions();
         $value   = $options->$name ?? $defaultValue;

diff --git a/app/bootstrap.php b/app/bootstrap.php
@@ -3,7 +3,7 @@
 namespace Quagga;
 
 use App\Common\Option;
-use Quagga\Quagga\Constracts\AssetTypeEnum;
+use Quagga\Contracts\AssetTypeEnum;
 use Quagga\Quagga\AssetManager;
 use Quagga\Quagga\Assets\AssetStylesheetOptions;
 use Quagga\Quagga\Assets\AssetUrl;

diff --git a/composer.json b/composer.json
@@ -29,33 +29,21 @@
         }
     ],
     "require": {
-        "php": "^7.4 || ^8.0",
-        "ext-json": "*",
         "davedevelopment/phpmig": "^1.7",
-        "quagga/framework": "dev-master",
         "laravel/serializable-closure": "^1.3",
-        "marcj/topsort": "^2.0",
-        "monolog/monolog": "^2.x-dev",
-        "opis/orm": "^1.0",
-        "php-di/php-di": "^7.0",
-        "phpseclib/phpseclib": "^3.0",
         "polarising/bcrypt": "^1.0",
+        "quagga/framework": "dev-master",
+        "quagga/twig-view": "^3.3",
         "ramsey/uuid": "^4.2.3",
-        "slim/console": "^0.1.0",
-        "slim/psr7": "^1.6",
-        "slim/slim": "^4.13",
-        "slim/twig-view": "^3.3",
         "spatie/schema-org": "^3.9",
         "tebazil/db-seeder": "^1.0",
-        "tightenco/collect": "^8.83.27",
         "twig/twig": "^3.8",
         "vlucas/phpdotenv": "^5.6"
     },
     "require-dev": {
         "jangregor/phpstan-prophecy": "^1.0.0",
         "phpspec/prophecy-phpunit": "^2.2",
         "phpstan/extension-installer": "^1.3.1",
-        "phpstan/phpstan": "1.10.66",
         "phpunit/phpunit": "^9.6.17",
         "squizlabs/php_codesniffer": "^3.9"
     },