wrong

diff --git a/src/Classes/Connector.php b/src/Classes/Connector.php
index fc86b1de33e19a1e599cc54bf3773771ffc6f06d..fb57b26293631d50f08993b89b7845e5a477e69e 100644 (file)
--- a/src/Classes/Connector.php
+++ b/src/Classes/Connector.php
@@ -1,70 +1,71 @@
 <?php
-
-/**
- * Uguu
- *
- * @copyright Copyright (c) 2022 Go Johansson (nokonoko) <neku@pomf.se>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-namespace Pomf\Uguu\Classes;
-
-use Exception;
-use PDO;
-
-class Connector extends Database
-{
-    public PDO $DB;
-    public array $CONFIG;
-    
     /**
-     * Reads the config.json file and populates the CONFIG property with the settings
+     * Uguu
      *
-     * @throws \Exception
-     */
-    public function __construct()
-    {
-        if (!file_exists(__DIR__ . '../config.json')) {
-            throw new Exception('Cant read settings file.', 500);
-        }
-        try {
-            $this->CONFIG = json_decode(
-                file_get_contents(__DIR__ . '../config.json'),
-                true
-            );
-            $this->assemble();
-        } catch (Exception) {
-            throw new Exception('Cant populate settings.', 500);
-        }
-    }
-    
-    /**
-     * > Tries to connect to the database
+     * @copyright Copyright (c) 2022 Go Johansson (nokonoko) <neku@pomf.se>
+     *
+     * This program is free software: you can redistribute it and/or modify
+     * it under the terms of the GNU General Public License as published by
+     * the Free Software Foundation, either version 3 of the License, or
+     * (at your option) any later version.
      *
-     * @throws \Exception
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU General Public License
+     * along with this program.  If not, see <https://www.gnu.org/licenses/>.
      */
-    public function assemble()
+    
+    namespace Pomf\Uguu;
+    
+    use Exception;
+    use PDO;
+    
+    class Connector extends Database
     {
-        try {
-            $this->DB = new PDO(
-                $this->CONFIG['DB_MODE'] . ':' . $this->CONFIG['DB_PATH'],
-                $this->CONFIG['DB_USER'],
-                $this->CONFIG['DB_PASS']
-            );
-        } catch (Exception) {
-            throw new Exception('Cant connect to DB.', 500);
+        public PDO $DB;
+        public array $CONFIG;
+        
+        /**
+         * Reads the config.json file and populates the CONFIG property with the settings
+         *
+         * @throws \Exception
+         */
+        public function __construct()
+        {
+            if (!file_exists(__DIR__ . '../config.json')) {
+                throw new Exception('Cant read settings file.', 500);
+            }
+            try {
+                $this->CONFIG = json_decode(
+                   file_get_contents(__DIR__ . '../config.json'),
+                   true,
+                );
+                $this->assemble();
+            }
+            catch (Exception) {
+                throw new Exception('Cant populate settings.', 500);
+            }
+        }
+        
+        /**
+         * > Tries to connect to the database
+         *
+         * @throws \Exception
+         */
+        public function assemble()
+        {
+            try {
+                $this->DB = new PDO(
+                   $this->CONFIG['DB_MODE'] . ':' . $this->CONFIG['DB_PATH'],
+                   $this->CONFIG['DB_USER'],
+                   $this->CONFIG['DB_PASS']
+                );
+            }
+            catch (Exception) {
+                throw new Exception('Cant connect to DB.', 500);
+            }
         }
     }
-}

diff --git a/src/Classes/CuteGrills.php b/src/Classes/CuteGrills.php
index af10590f9323e76260dc05803fc82331ee44bc66..82018ce864f7d911a7edf17121fa4b882af6835c 100644 (file)
--- a/src/Classes/CuteGrills.php
+++ b/src/Classes/CuteGrills.php
@@ -18,7 +18,7 @@
      * along with this program.  If not, see <https://www.gnu.org/licenses/>.
      */
     
-    namespace Pomf\Uguu\Classes;
+    namespace Pomf\Uguu;
     
     class CuteGrills
     {

diff --git a/src/Classes/Database.php b/src/Classes/Database.php
index 52ba22e10f972ed8257412f93a8e915b1307cb02..252f435f74e506ab0a87af14d184d7ff999a6cd6 100644 (file)
--- a/src/Classes/Database.php
+++ b/src/Classes/Database.php
@@ -18,7 +18,7 @@
      * along with this program.  If not, see <https://www.gnu.org/licenses/>.
      */
     
-    namespace Pomf\Uguu\Classes;
+    namespace Pomf\Uguu;
     
     use Exception;
     use PDO;

diff --git a/src/GrillLoader.php b/src/Classes/GrillLoader.php
similarity index 89%
rename from src/GrillLoader.php
rename to src/Classes/GrillLoader.php
index 9fe16766de353371c18ddb8820338fdb1d736645..f0f83237606c3060b74b06a729443f5a1b924915 100644 (file)
--- a/src/GrillLoader.php
+++ b/src/Classes/GrillLoader.php
@@ -18,9 +18,11 @@
      * along with this program.  If not, see <https://www.gnu.org/licenses/>.
      */
     
-    namespace Pomf\Uguu;
+    namespace Pomf\Uguu\Classes;
     
-    class GrillLoader extends Classes\CuteGrills
+    use Pomf\Uguu\CuteGrills;
+    
+    class GrillLoader extends CuteGrills
     {
         public function __construct()
         {

diff --git a/src/Classes/Response.php b/src/Classes/Response.php
index 7c2fe4f16f9de7230d65c163617a777c477b1c96..8ff736714daff764bfd195e488831006a31e0895 100644 (file)
--- a/src/Classes/Response.php
+++ b/src/Classes/Response.php
@@ -18,7 +18,7 @@
      * along with this program.  If not, see <https://www.gnu.org/licenses/>.
      */
     
-    namespace Pomf\Uguu\Classes;
+    namespace Pomf\Uguu;
     
     class Response
     {

diff --git a/src/Classes/Upload.php b/src/Classes/Upload.php
index b092cfec47fae6be81304560ff3536ceb2eb824e..c70a0af24c5166a6c37fc9f1a7954b51df304f78 100644 (file)
--- a/src/Classes/Upload.php
+++ b/src/Classes/Upload.php
@@ -18,7 +18,7 @@
      * along with this program.  If not, see <https://www.gnu.org/licenses/>.
      */
     
-    namespace Pomf\Uguu\Classes;
+    namespace Pomf\Uguu;
     
     use Exception;
     

diff --git a/src/UploadGateway.php b/src/Classes/UploadGateway.php
similarity index 92%
rename from src/UploadGateway.php
rename to src/Classes/UploadGateway.php
index a1f7830f7e0168473d1a9d837e77901856343c81..66d7b1044bf07eb28fc97cc2c813d4b4b33c62d5 100644 (file)
--- a/src/UploadGateway.php
+++ b/src/Classes/UploadGateway.php
@@ -18,12 +18,15 @@
      * along with this program.  If not, see <https://www.gnu.org/licenses/>.
      */
     
-    namespace Pomf\Uguu;
+    namespace Pomf\Uguu\Classes;
     
     use Exception;
-    use Pomf\Uguu\Classes\Response;
+    use Pomf\Uguu\Response;
+    use Pomf\Uguu\Upload;
     
-    class UploadGateway extends Classes\Upload
+    use function Pomf\Uguu\count;
+    
+    class UploadGateway extends Upload
     {
         /**
          * It handles the file uploads.

diff --git a/src/composer.json b/src/composer.json
index 71ec1a534401fe8f6af8adec4e74146945dd9bac..ba718a8e0d20255a56ecd15e6037ab146fe76efc 100644 (file)
--- a/src/composer.json
+++ b/src/composer.json
@@ -5,7 +5,8 @@
   "license": "GPL-3.0",
   "autoload": {
     "psr-4": {
-      "Uguu\\": "Classes"
+      "Pomf\\Uguu\\": "/",
+      "Pomf\\Uguu\\Classes\\": "src/Classes"
     }
   },
   "authors": [

diff --git a/src/static/php/grill.php b/src/static/php/grill.php
index d7e078cb620cfa7443a9bb5d86b6f196230dbe59..0f0eda62306d4e120fe970320632f212e1bd8f1d 100644 (file)
--- a/src/static/php/grill.php
+++ b/src/static/php/grill.php
@@ -41,6 +41,6 @@
      */
     require_once __DIR__ . '/../vendor/autoload.php';
     
-    use Pomf\Uguu\GrillLoader;
+    use Pomf\Uguu\Classes\GrillLoader;
     
     new GrillLoader();

diff --git a/src/static/php/upload.php b/src/static/php/upload.php
index e736a8543c205dec60c7ff75273ff36223785fee..1237ed7754955380a00202cde45b63812897efcf 100644 (file)
--- a/src/static/php/upload.php
+++ b/src/static/php/upload.php
@@ -41,7 +41,7 @@
     checkConfig();
     require_once __DIR__ . '/../vendor/autoload.php';
     
-    use Pomf\Uguu\UploadGateway;
+    use Pomf\Uguu\Classes\UploadGateway;
     
     try {
         (new UploadGateway())->handleFile($_GET['output'], $_FILES['files']);