From 96bb2d3306a6ea6021bc44ed488bc4d8b6cf447e Mon Sep 17 00:00:00 2001 From: Go Johansson Date: Fri, 16 Dec 2022 23:16:57 +0100 Subject: [PATCH] wrong --- src/Classes/Connector.php | 125 ++++++++++++++-------------- src/Classes/CuteGrills.php | 2 +- src/Classes/Database.php | 2 +- src/{ => Classes}/GrillLoader.php | 6 +- src/Classes/Response.php | 2 +- src/Classes/Upload.php | 2 +- src/{ => Classes}/UploadGateway.php | 9 +- src/composer.json | 3 +- src/static/php/grill.php | 2 +- src/static/php/upload.php | 2 +- 10 files changed, 81 insertions(+), 74 deletions(-) rename src/{ => Classes}/GrillLoader.php (89%) rename src/{ => Classes}/UploadGateway.php (92%) diff --git a/src/Classes/Connector.php b/src/Classes/Connector.php index fc86b1d..fb57b26 100644 --- a/src/Classes/Connector.php +++ b/src/Classes/Connector.php @@ -1,70 +1,71 @@ - * - * 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 . - */ - -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 + * @copyright Copyright (c) 2022 Go Johansson (nokonoko) + * + * 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 . */ - public function __construct() + + namespace Pomf\Uguu; + + use Exception; + use PDO; + + class Connector extends Database { - if (!file_exists(__DIR__ . '../config.json')) { - throw new Exception('Cant read settings file.', 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); + } } - 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); + } } } - - /** - * > 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 af10590..82018ce 100644 --- a/src/Classes/CuteGrills.php +++ b/src/Classes/CuteGrills.php @@ -18,7 +18,7 @@ * along with this program. If not, see . */ - namespace Pomf\Uguu\Classes; + namespace Pomf\Uguu; class CuteGrills { diff --git a/src/Classes/Database.php b/src/Classes/Database.php index 52ba22e..252f435 100644 --- a/src/Classes/Database.php +++ b/src/Classes/Database.php @@ -18,7 +18,7 @@ * along with this program. If not, see . */ - 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 9fe1676..f0f8323 100644 --- a/src/GrillLoader.php +++ b/src/Classes/GrillLoader.php @@ -18,9 +18,11 @@ * along with this program. If not, see . */ - 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 7c2fe4f..8ff7367 100644 --- a/src/Classes/Response.php +++ b/src/Classes/Response.php @@ -18,7 +18,7 @@ * along with this program. If not, see . */ - namespace Pomf\Uguu\Classes; + namespace Pomf\Uguu; class Response { diff --git a/src/Classes/Upload.php b/src/Classes/Upload.php index b092cfe..c70a0af 100644 --- a/src/Classes/Upload.php +++ b/src/Classes/Upload.php @@ -18,7 +18,7 @@ * along with this program. If not, see . */ - 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 a1f7830..66d7b10 100644 --- a/src/UploadGateway.php +++ b/src/Classes/UploadGateway.php @@ -18,12 +18,15 @@ * along with this program. If not, see . */ - 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 71ec1a5..ba718a8 100644 --- 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 d7e078c..0f0eda6 100644 --- 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 e736a85..1237ed7 100644 --- 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']);