diff --git a/Base/Model.php b/Base/Model.php index 5ad98ec..0822625 100644 --- a/Base/Model.php +++ b/Base/Model.php @@ -492,7 +492,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T */ private function diff(): array { - $changes = array_diff_assoc($this->_oldAttributes, $this->_attributes); + $changes = array_diff_assoc($this->_attributes, $this->_oldAttributes); $condition = array_intersect_assoc($this->_oldAttributes, $this->_attributes); diff --git a/DatabasesProviders.php b/DatabasesProviders.php index d97459e..3b40f39 100644 --- a/DatabasesProviders.php +++ b/DatabasesProviders.php @@ -6,8 +6,8 @@ namespace Database; use Exception; use Kiri; -use Kiri\Abstracts\Config; use Kiri\Abstracts\Providers; +use Kiri\Config\ConfigProvider; use Swoole\Timer; use Kiri\Di\LocalService; @@ -26,10 +26,10 @@ class DatabasesProviders extends Providers */ public function onImport(LocalService $application): void { - $main = Kiri::getDi()->get(Kiri\Main::class); + $main = Kiri::getDi()->get(Kiri\Application::class); $main->command(BackupCommand::class); - $databases = Config::get('databases.connections', []); + $databases = \config('databases.connections', []); if (empty($databases)) { return; } @@ -45,7 +45,7 @@ class DatabasesProviders extends Providers return; } Timer::tick(60000, function () { - $databases = Config::get('databases.connections', []); + $databases = \config('databases.connections', []); if (empty($databases)) { return; } @@ -65,7 +65,7 @@ class DatabasesProviders extends Providers public function exit(): void { Timer::clearAll(); - $databases = Config::get('databases.connections', []); + $databases = \config('databases.connections', []); if (!empty($databases)) { $connection = Kiri::getDi()->get(Kiri\Pool\Pool::class); foreach ($databases as $database) { diff --git a/Db.php b/Db.php index 23e42c2..dd31252 100644 --- a/Db.php +++ b/Db.php @@ -14,7 +14,6 @@ use Database\Affair\Commit; use Database\Affair\Rollback; use Database\Traits\QueryTrait; use Exception; -use Kiri\Abstracts\Config; use Kiri\Di\Context; use Kiri\Events\EventDispatch; use Kiri\Exception\ConfigException; @@ -377,7 +376,7 @@ class Db implements ISqlBuilder if ($connection instanceof Connection) { return $connection; } - $databases = Config::get('databases.connections', []); + $databases = \config('databases.connections', []); if (empty($databases) || !is_array($databases)) { throw new Exception('Please configure the database link.'); }