From dfe08c18462a368ced4eb5f7b13d68d1c2653f79 Mon Sep 17 00:00:00 2001 From: Henry Paradiz Date: Wed, 16 May 2018 19:18:19 -0400 Subject: [PATCH] Moved /classes/Divergence to /src --- composer.json | 3 +-- config/db.php | 2 +- {classes/Divergence => src}/App.php | 0 .../Divergence => src}/Controllers/RecordsRequestHandler.php | 0 {classes/Divergence => src}/Controllers/RequestHandler.php | 0 {classes/Divergence => src}/Controllers/SiteRequestHandler.php | 0 {classes/Divergence => src}/Helpers/JSON.php | 0 {classes/Divergence => src}/Helpers/JSONP.php | 0 {classes/Divergence => src}/Helpers/Util.php | 0 {classes/Divergence => src}/Helpers/Validate.php | 0 {classes/Divergence => src}/IO/Database/MySQL.php | 0 {classes/Divergence => src}/IO/Database/SQL.php | 0 {classes/Divergence => src}/Models/ActiveRecord.php | 1 + {classes/Divergence => src}/Models/Model.php | 0 {classes/Divergence => src}/Models/RecordValidator.php | 0 {classes/Divergence => src}/Models/Relations.php | 0 {classes/Divergence => src}/Models/Versioning.php | 0 {classes/Divergence => src}/Templates/Engines/Dwoo.php | 0 18 files changed, 3 insertions(+), 3 deletions(-) rename {classes/Divergence => src}/App.php (100%) rename {classes/Divergence => src}/Controllers/RecordsRequestHandler.php (100%) rename {classes/Divergence => src}/Controllers/RequestHandler.php (100%) rename {classes/Divergence => src}/Controllers/SiteRequestHandler.php (100%) rename {classes/Divergence => src}/Helpers/JSON.php (100%) rename {classes/Divergence => src}/Helpers/JSONP.php (100%) rename {classes/Divergence => src}/Helpers/Util.php (100%) rename {classes/Divergence => src}/Helpers/Validate.php (100%) rename {classes/Divergence => src}/IO/Database/MySQL.php (100%) rename {classes/Divergence => src}/IO/Database/SQL.php (100%) rename {classes/Divergence => src}/Models/ActiveRecord.php (99%) rename {classes/Divergence => src}/Models/Model.php (100%) rename {classes/Divergence => src}/Models/RecordValidator.php (100%) rename {classes/Divergence => src}/Models/Relations.php (100%) rename {classes/Divergence => src}/Models/Versioning.php (100%) rename {classes/Divergence => src}/Templates/Engines/Dwoo.php (100%) diff --git a/composer.json b/composer.json index 48384b7..f419d92 100644 --- a/composer.json +++ b/composer.json @@ -20,8 +20,7 @@ }, "autoload": { "psr-4": { - "App\\": "classes/App", - "Divergence\\": "classes/Divergence" + "Divergence\\": "src" } }, "autoload-dev": { diff --git a/config/db.php b/config/db.php index cc204ee..b80a224 100644 --- a/config/db.php +++ b/config/db.php @@ -16,7 +16,7 @@ * This configuration will be used instead of the default if * the file .dev is detected inside of $_SERVER['DOCUMENT_ROOT'] * - * You may override this behaviour in /config/DB.config.php + * You may override this behaviour in /config/app.php * */ 'dev-mysql' => [ diff --git a/classes/Divergence/App.php b/src/App.php similarity index 100% rename from classes/Divergence/App.php rename to src/App.php diff --git a/classes/Divergence/Controllers/RecordsRequestHandler.php b/src/Controllers/RecordsRequestHandler.php similarity index 100% rename from classes/Divergence/Controllers/RecordsRequestHandler.php rename to src/Controllers/RecordsRequestHandler.php diff --git a/classes/Divergence/Controllers/RequestHandler.php b/src/Controllers/RequestHandler.php similarity index 100% rename from classes/Divergence/Controllers/RequestHandler.php rename to src/Controllers/RequestHandler.php diff --git a/classes/Divergence/Controllers/SiteRequestHandler.php b/src/Controllers/SiteRequestHandler.php similarity index 100% rename from classes/Divergence/Controllers/SiteRequestHandler.php rename to src/Controllers/SiteRequestHandler.php diff --git a/classes/Divergence/Helpers/JSON.php b/src/Helpers/JSON.php similarity index 100% rename from classes/Divergence/Helpers/JSON.php rename to src/Helpers/JSON.php diff --git a/classes/Divergence/Helpers/JSONP.php b/src/Helpers/JSONP.php similarity index 100% rename from classes/Divergence/Helpers/JSONP.php rename to src/Helpers/JSONP.php diff --git a/classes/Divergence/Helpers/Util.php b/src/Helpers/Util.php similarity index 100% rename from classes/Divergence/Helpers/Util.php rename to src/Helpers/Util.php diff --git a/classes/Divergence/Helpers/Validate.php b/src/Helpers/Validate.php similarity index 100% rename from classes/Divergence/Helpers/Validate.php rename to src/Helpers/Validate.php diff --git a/classes/Divergence/IO/Database/MySQL.php b/src/IO/Database/MySQL.php similarity index 100% rename from classes/Divergence/IO/Database/MySQL.php rename to src/IO/Database/MySQL.php diff --git a/classes/Divergence/IO/Database/SQL.php b/src/IO/Database/SQL.php similarity index 100% rename from classes/Divergence/IO/Database/SQL.php rename to src/IO/Database/SQL.php diff --git a/classes/Divergence/Models/ActiveRecord.php b/src/Models/ActiveRecord.php similarity index 99% rename from classes/Divergence/Models/ActiveRecord.php rename to src/Models/ActiveRecord.php index cdc65ac..0cf8146 100644 --- a/classes/Divergence/Models/ActiveRecord.php +++ b/src/Models/ActiveRecord.php @@ -684,6 +684,7 @@ public static function getAllRecordsByWhere($conditions = [], $options = []) 'having' => false, ]); + $join = ''; // handle joining related tables if (static::isRelational()) { diff --git a/classes/Divergence/Models/Model.php b/src/Models/Model.php similarity index 100% rename from classes/Divergence/Models/Model.php rename to src/Models/Model.php diff --git a/classes/Divergence/Models/RecordValidator.php b/src/Models/RecordValidator.php similarity index 100% rename from classes/Divergence/Models/RecordValidator.php rename to src/Models/RecordValidator.php diff --git a/classes/Divergence/Models/Relations.php b/src/Models/Relations.php similarity index 100% rename from classes/Divergence/Models/Relations.php rename to src/Models/Relations.php diff --git a/classes/Divergence/Models/Versioning.php b/src/Models/Versioning.php similarity index 100% rename from classes/Divergence/Models/Versioning.php rename to src/Models/Versioning.php diff --git a/classes/Divergence/Templates/Engines/Dwoo.php b/src/Templates/Engines/Dwoo.php similarity index 100% rename from classes/Divergence/Templates/Engines/Dwoo.php rename to src/Templates/Engines/Dwoo.php