Jingga/oms-Navigation
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Navigation.git synced 2026-02-13 15:28:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adjust database pool name

Browse Source
This commit is contained in:
Dennis Eichhorn 2016-10-29 20:44:52 +02:00
parent 356d438137
commit 7beb497b58
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Admin/Activate.php
View File

@ -16,7 +16,7 @@
namespace Modules\Navigation\Admin; namespace Modules\Navigation\Admin;
use phpOMS\DataStorage\Database\Pool; use phpOMS\DataStorage\Database\DatabasePool;
use phpOMS\Module\ActivateAbstract; use phpOMS\Module\ActivateAbstract;
use phpOMS\Module\InfoManager; use phpOMS\Module\InfoManager;
@ -37,7 +37,7 @@ class Activate extends ActivateAbstract
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public static function activate(Pool $dbPool, InfoManager $info) public static function activate(DatabasePool $dbPool, InfoManager $info)
{ {
parent::activate($dbPool, $info); parent::activate($dbPool, $info);
} }

4
Admin/Deactivate.php
View File

@ -16,7 +16,7 @@
namespace Modules\Navigation\Admin; namespace Modules\Navigation\Admin;
use phpOMS\DataStorage\Database\Pool; use phpOMS\DataStorage\Database\DatabasePool;
use phpOMS\Module\DeactivateAbstract; use phpOMS\Module\DeactivateAbstract;
use phpOMS\Module\InfoManager; use phpOMS\Module\InfoManager;
@ -37,7 +37,7 @@ class Deactivate extends DeactivateAbstract
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public static function deactivate(Pool $dbPool, InfoManager $info) public static function deactivate(DatabasePool $dbPool, InfoManager $info)
{ {
parent::deactivate($dbPool, $info); parent::deactivate($dbPool, $info);
} }

6
Admin/Installer.php
View File

@ -16,7 +16,7 @@
namespace Modules\Navigation\Admin; namespace Modules\Navigation\Admin;
use phpOMS\DataStorage\Database\DatabaseType; use phpOMS\DataStorage\Database\DatabaseType;
use phpOMS\DataStorage\Database\Pool; use phpOMS\DataStorage\Database\DatabasePool;
use phpOMS\Module\InfoManager; use phpOMS\Module\InfoManager;
use phpOMS\Module\InstallerAbstract; use phpOMS\Module\InstallerAbstract;
@ -37,7 +37,7 @@ class Installer extends InstallerAbstract
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public static function install(string $path, Pool $dbPool, InfoManager $info) public static function install(string $path, DatabasePool $dbPool, InfoManager $info)
{ {
parent::install($path, $dbPool, $info); parent::install($path, $dbPool, $info);
@ -75,7 +75,7 @@ class Installer extends InstallerAbstract
* @since 1.0.0 * @since 1.0.0
* @author Dennis Eichhorn <d.eichhorn@oms.com> * @author Dennis Eichhorn <d.eichhorn@oms.com>
*/ */
public static function installExternal(Pool $dbPool, array $data) public static function installExternal(DatabasePool $dbPool, array $data)
{ {
try { try {
$dbPool->get('core')->con->query('select 1 from `' . $dbPool->get('core')->prefix . 'nav`'); $dbPool->get('core')->con->query('select 1 from `' . $dbPool->get('core')->prefix . 'nav`');

4
Admin/Uninstall.php
View File

@ -16,7 +16,7 @@
namespace Modules\Navigation\Admin; namespace Modules\Navigation\Admin;
use phpOMS\DataStorage\Database\Pool; use phpOMS\DataStorage\Database\DatabasePool;
use phpOMS\DataStorage\Database\Schema\Builder; use phpOMS\DataStorage\Database\Schema\Builder;
use phpOMS\Module\UninstallAbstract; use phpOMS\Module\UninstallAbstract;
@ -37,7 +37,7 @@ class Uninstall extends UninstallAbstract
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public static function uninstall(Pool $dbPool, InfoManager $info) public static function uninstall(DatabasePool $dbPool, InfoManager $info)
{ {
parent::uninstall($dbPool, $info); parent::uninstall($dbPool, $info);

4
Admin/Update.php
View File

@ -16,7 +16,7 @@
namespace Modules\Navigation\Admin; namespace Modules\Navigation\Admin;
use phpOMS\DataStorage\Database\Pool; use phpOMS\DataStorage\Database\DatabasePool;
use phpOMS\Module\UpdateAbstract; use phpOMS\Module\UpdateAbstract;
use phpOMS\System\File\Directory; use phpOMS\System\File\Directory;
@ -37,7 +37,7 @@ class Update extends UpdateAbstract
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public static function update(Pool $dbPool, array $info) public static function update(DatabasePool $dbPool, array $info)
{ {
Directory::deletePath(__DIR__ . '/Update'); Directory::deletePath(__DIR__ . '/Update');
mkdir('Update'); mkdir('Update');

6
Models/Navigation.php
View File

@ -15,7 +15,7 @@
*/ */
namespace Modules\Navigation\Models; namespace Modules\Navigation\Models;
use phpOMS\DataStorage\Database\Pool; use phpOMS\DataStorage\Database\DatabasePool;
use phpOMS\Message\RequestAbstract; use phpOMS\Message\RequestAbstract;
/** /**
@ -67,7 +67,7 @@ class Navigation
* @since 1.0.0 * @since 1.0.0
* @author Dennis Eichhorn <d.eichhorn@oms.com> * @author Dennis Eichhorn <d.eichhorn@oms.com>
*/ */
private function __construct(RequestAbstract $request, Pool $dbPool = null) private function __construct(RequestAbstract $request, DatabasePool $dbPool = null)
{ {
$this->dbPool = $dbPool; $this->dbPool = $dbPool;
$this->load($request->getHash()); $this->load($request->getHash());
@ -126,7 +126,7 @@ class Navigation
* @since 1.0.0 * @since 1.0.0
* @author Dennis Eichhorn <d.eichhorn@oms.com> * @author Dennis Eichhorn <d.eichhorn@oms.com>
*/ */
public static function getInstance(RequestAbstract $request = null, Pool $dbPool = null) public static function getInstance(RequestAbstract $request = null, DatabasePool $dbPool = null)
{ {
if (!isset(self::$instance)) { if (!isset(self::$instance)) {
if(!isset($request) || !isset($dbPool)) { if(!isset($request) || !isset($dbPool)) {