From cdd4068d447b66dffddf1467bab2ad73378c0a18 Mon Sep 17 00:00:00 2001 From: yiendos Date: Thu, 23 Jul 2020 10:21:13 +0100 Subject: [PATCH] #125: define beta install files and order --- .../Console/Command/Database/Install.php | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/src/Joomlatools/Console/Command/Database/Install.php b/src/Joomlatools/Console/Command/Database/Install.php index c42449d..b064efd 100644 --- a/src/Joomlatools/Console/Command/Database/Install.php +++ b/src/Joomlatools/Console/Command/Database/Install.php @@ -234,20 +234,6 @@ protected function _getInstallFiles($sample_data = false) { $files = array(); - $beta_installs = function($path) { - - $beta_installs = array(); - - foreach (array_diff(scandir($path), array('.', '..')) AS $install_sql) - { - if (strpos($install_sql, 'sample_') === false){ - $beta_installs[] = $path .$install_sql; - } - } - - return $beta_installs; - }; - if (Util::isPlatform($this->target_dir) || Util::isKodekitPlatform($this->target_dir)) { $path = $this->target_dir .'/install/mysql/'; @@ -267,7 +253,10 @@ protected function _getInstallFiles($sample_data = false) if (version_compare($version->release, '3.9', '>')) { - $files = $beta_installs($path); + $files[] = $path . "base.sql"; + $files[] = $path . "extensions.sql"; + $files[] = $path . "supports.sql"; + }else{ $files[] = $path.'joomla.sql'; }