Getting closer to being usable.

examples/blog-app/src/Models/Base/BaseCommentsModel.php

@@ -4,7 +4,7 @@ use \⌬\Config\⌬\⌬ as App;
 use \Example\BlogApp\Example\BlogApp;
 use \Gone\AppCore\Exceptions;
 use \⌬\Controllers\Abstracts\Model as AbstractModel;
-use \Gone\AppCore\Interfaces\ModelInterface as ModelInterface;
+use ⌬\Database\Interfaces\ModelInterface as ModelInterface;
 use \Example\BlogApp\Services;
 use \Example\BlogApp\Models;
 use \Example\BlogApp\TableGateways;

examples/blog-app/src/Models/Base/BasePostsModel.php

@@ -4,7 +4,7 @@ use \⌬\Config\⌬\⌬ as App;
 use \Example\BlogApp\Example\BlogApp;
 use \Gone\AppCore\Exceptions;
 use \⌬\Controllers\Abstracts\Model as AbstractModel;
-use \Gone\AppCore\Interfaces\ModelInterface as ModelInterface;
+use ⌬\Database\Interfaces\ModelInterface as ModelInterface;
 use \Example\BlogApp\Services;
 use \Example\BlogApp\Models;
 use \Example\BlogApp\TableGateways;

examples/blog-app/src/Models/Base/BaseUsersModel.php

@@ -4,7 +4,7 @@ use \⌬\Config\⌬\⌬ as App;
 use \Example\BlogApp\Example\BlogApp;
 use \Gone\AppCore\Exceptions;
 use \⌬\Controllers\Abstracts\Model as AbstractModel;
-use \Gone\AppCore\Interfaces\ModelInterface as ModelInterface;
+use ⌬\Database\Interfaces\ModelInterface as ModelInterface;
 use \Example\BlogApp\Services;
 use \Example\BlogApp\Models;
 use \Example\BlogApp\TableGateways;

examples/blog-app/src/Services/Base/BaseCommentsService.php

@@ -2,7 +2,7 @@
 namespace Example\BlogApp\Services\Base;
 
 use ⌬\Controllers\Abstracts\Service as AbstractService;
-use Gone\AppCore\Interfaces\ServiceInterface as ServiceInterface;
+use ⌬\Database\Interfaces\ServiceInterface as ServiceInterface;
 use \Example\BlogApp\TableGateways;
 use \Example\BlogApp\Models;
 use Zend\Db\ResultSet\ResultSet;

examples/blog-app/src/Services/Base/BasePostsService.php

@@ -2,7 +2,7 @@
 namespace Example\BlogApp\Services\Base;
 
 use ⌬\Controllers\Abstracts\Service as AbstractService;
-use Gone\AppCore\Interfaces\ServiceInterface as ServiceInterface;
+use ⌬\Database\Interfaces\ServiceInterface as ServiceInterface;
 use \Example\BlogApp\TableGateways;
 use \Example\BlogApp\Models;
 use Zend\Db\ResultSet\ResultSet;

examples/blog-app/src/Services/Base/BaseUsersService.php

@@ -2,7 +2,7 @@
 namespace Example\BlogApp\Services\Base;
 
 use ⌬\Controllers\Abstracts\Service as AbstractService;
-use Gone\AppCore\Interfaces\ServiceInterface as ServiceInterface;
+use ⌬\Database\Interfaces\ServiceInterface as ServiceInterface;
 use \Example\BlogApp\TableGateways;
 use \Example\BlogApp\Models;
 use Zend\Db\ResultSet\ResultSet;

examples/blog-app/src/TableGateways/Base/BaseCommentsTableGateway.php

@@ -2,7 +2,7 @@
 namespace Example\BlogApp\TableGateways\Base;
 use \⌬\Controllers\Abstracts\TableGateway as AbstractTableGateway;
 use \⌬\Controllers\Abstracts\Model;
-use \Gone\AppCore\Db;
+use \⌬\Database\Db;
 use \Example\BlogApp\TableGateways;
 use \Example\BlogApp\Models;
 use \Zend\Db\Adapter\AdapterInterface;

examples/blog-app/src/TableGateways/Base/BasePostsTableGateway.php

@@ -2,7 +2,7 @@
 namespace Example\BlogApp\TableGateways\Base;
 use \⌬\Controllers\Abstracts\TableGateway as AbstractTableGateway;
 use \⌬\Controllers\Abstracts\Model;
-use \Gone\AppCore\Db;
+use \⌬\Database\Db;
 use \Example\BlogApp\TableGateways;
 use \Example\BlogApp\Models;
 use \Zend\Db\Adapter\AdapterInterface;

examples/blog-app/src/TableGateways/Base/BaseUsersTableGateway.php

@@ -2,7 +2,7 @@
 namespace Example\BlogApp\TableGateways\Base;
 use \⌬\Controllers\Abstracts\TableGateway as AbstractTableGateway;
 use \⌬\Controllers\Abstracts\Model;
-use \Gone\AppCore\Db;
+use \⌬\Database\Db;
 use \Example\BlogApp\TableGateways;
 use \Example\BlogApp\Models;
 use \Zend\Db\Adapter\AdapterInterface;

src/Db.php

@@ -0,0 +1,73 @@
+<?php
+
+namespace ⌬\Database;
+
+use ⌬\Database\Exception\Exception as DbException;
+use ⌬\Configuration\DatabaseConfig;
+
+class Db
+{
+    private static $instance;
+
+    /** @var Adapter[] */
+    private $pool = [];
+
+    public function __construct(DatabaseConfig $config)
+    {
+        $this->pool = $config->getAdapterPool();
+    }
+
+    public function isMySQLConfigured() : bool
+    {
+        return count($this->getPool()) > 0;
+    }
+
+    public static function clean()
+    {
+        self::$instance = null;
+    }
+
+    /**
+     * @param $name
+     *
+     * @throws DbException
+     *
+     * @return Adapter
+     */
+    public function getDatabase($name)
+    {
+        if (isset($this->pool[$name])) {
+            return $this->pool[$name];
+        }
+        throw new DbException("No Database connected called '{$name}'.");
+    }
+
+    /**
+     * @return Adapter[]
+     */
+    public function getDatabases()
+    {
+        return $this->pool;
+    }
+
+    /**
+     * @param DbConfig $dbConfig
+     *
+     * @return Db
+     */
+    public static function getInstance(DbConfig $dbConfig = null)
+    {
+        if (!self::$instance instanceof Db && $dbConfig instanceof DbConfig) {
+            self::$instance = new Db($dbConfig);
+        }
+        return self::$instance;
+    }
+
+    /**
+     * @return Adapter[]
+     */
+    public function getPool() : array
+    {
+        return $this->pool;
+    }
+}

src/Generator/sdkifier

@@ -13,7 +13,7 @@ $namespace     = isset($argv[4]) ? $argv[4] : "Gone";
 define("APP_NAMESPACE", $namespace);
 
 try {
-    $databaseConfigs = $scope::Container()->get(\Gone\AppCore\DbConfig::class);
+    $databaseConfigs = $scope::Container()->get(\⌬\Database\DbConfig::class);
 }catch(\Gone\AppCore\Exceptions\DbConfigException $dbConfigException){
     $databaseConfigs = null;
 }

src/Generator/templates/Models/basemodel.php.twig

@@ -4,7 +4,7 @@ use \{{ app_container }} as App;
 use \{{ namespace }}\{{ namespace }};
 use \Gone\AppCore\Exceptions;
 use \⌬\Controllers\Abstracts\Model as AbstractModel;
-use \Gone\AppCore\Interfaces\ModelInterface as ModelInterface;
+use ⌬\Database\Interfaces\ModelInterface as ModelInterface;
 use \{{ namespace }}\Services;
 use \{{ namespace }}\Models;
 use \{{ namespace }}\TableGateways;

src/Generator/templates/Models/basetable.php.twig

@@ -2,7 +2,7 @@
 namespace {{ namespace }}\TableGateways\Base;
 use \⌬\Controllers\Abstracts\TableGateway as AbstractTableGateway;
 use \⌬\Controllers\Abstracts\Model;
-use \Gone\AppCore\Db;
+use \⌬\Database\Db;
 use \{{ namespace }}\TableGateways;
 use \{{ namespace }}\Models;
 use \Zend\Db\Adapter\AdapterInterface;

src/Generator/templates/Services/baseservice.php.twig

@@ -2,7 +2,7 @@
 namespace {{ namespace }}\Services\Base;
 
 use ⌬\Controllers\Abstracts\Service as AbstractService;
-use Gone\AppCore\Interfaces\ServiceInterface as ServiceInterface;
+use ⌬\Database\Interfaces\ServiceInterface as ServiceInterface;
 use \{{ namespace }}\TableGateways;
 use \{{ namespace }}\Models;
 use Zend\Db\ResultSet\ResultSet;

src/Interfaces/ModelInterface.php

@@ -0,0 +1,15 @@
+<?php
+namespace ⌬\Database\Interfaces;
+
+interface ModelInterface
+{
+    public static function factory();
+
+    public function save();
+
+    public function destroy();
+
+    public function destroyThoroughly();
+
+    public function getListOfProperties();
+}

src/Interfaces/ServiceInterface.php

@@ -0,0 +1,30 @@
+<?php
+namespace ⌬\Database\Interfaces;
+
+use Zend\Db\Sql\Expression;
+
+interface ServiceInterface
+{
+    /**
+     * @param int|null           $limit
+     * @param int|null           $offset
+     * @param array|null         $wheres
+     * @param string|Expression| null $order
+     * @param string|null        $orderDirection
+     *
+     * @return ModelInterface[]
+     */
+    public function getAll(
+        int $limit = null,
+        int $offset = null,
+        array $wheres = null,
+        $order = null,
+        string $orderDirection = null
+    );
+
+    public function getById(int $id);
+
+    public function getByField(string $field, $value);
+
+    public function getRandom();
+}

src/ZendSql.php

@@ -0,0 +1,12 @@
+<?php
+namespace ⌬\Database;
+
+use Zend\Db\Adapter\AdapterInterface;
+
+class ZendSql extends \Zend\Db\Sql\Sql
+{
+    public function __construct(AdapterInterface $adapter, $table = null, $sqlPlatform = null)
+    {
+        parent::__construct($adapter, $table, $sqlPlatform);
+    }
+}