X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=tests%2Fsrc%2FCore%2FConsole%2FAutomaticInstallationConsoleTest.php;h=9ed3d404f21a57bed039c9bada2a6503ed5c5989;hb=2d1e7711783828b9be17d24706055c3345531fae;hp=df679ed38c1f4873c34d9e2350b40ab5678c26aa;hpb=4e374fa4d3f462e425f1840b57afeb3ee07a73d8;p=friendica.git diff --git a/tests/src/Core/Console/AutomaticInstallationConsoleTest.php b/tests/src/Core/Console/AutomaticInstallationConsoleTest.php index df679ed38c..9ed3d404f2 100644 --- a/tests/src/Core/Console/AutomaticInstallationConsoleTest.php +++ b/tests/src/Core/Console/AutomaticInstallationConsoleTest.php @@ -10,6 +10,7 @@ use Friendica\Test\Util\DBAMockTrait; use Friendica\Test\Util\DBStructureMockTrait; use Friendica\Test\Util\L10nMockTrait; use Friendica\Test\Util\RendererMockTrait; +use Friendica\Util\BaseURL; use Friendica\Util\Logger\VoidLogger; use org\bovigo\vfs\vfsStream; use org\bovigo\vfs\vfsStreamFile; @@ -26,12 +27,6 @@ class AutomaticInstallationConsoleTest extends ConsoleTest use DBStructureMockTrait; use RendererMockTrait; - private $db_host; - private $db_port; - private $db_data; - private $db_user; - private $db_pass; - /** * @var vfsStreamFile Assert file without DB credentials */ @@ -41,6 +36,11 @@ class AutomaticInstallationConsoleTest extends ConsoleTest */ private $assertFileDb; + /** + * @var ConfigCache The configuration cache to check after each test + */ + private $configCache; + public function setUp() { parent::setUp(); @@ -50,13 +50,33 @@ class AutomaticInstallationConsoleTest extends ConsoleTest ->removeChild('local.config.php'); } - $this->db_host = getenv('MYSQL_HOST'); - $this->db_port = !empty(getenv('MYSQL_PORT')) ? getenv('MYSQL_PORT') : null; - $this->db_data = getenv('MYSQL_DATABASE'); - $this->db_user = getenv('MYSQL_USERNAME') . getenv('MYSQL_USER'); - $this->db_pass = getenv('MYSQL_PASSWORD'); - $this->mockL10nT(); + + $this->configCache = new ConfigCache(); + $this->configCache->set('system', 'basepath', $this->root->url()); + $this->configCache->set('config', 'php_path', trim(shell_exec('which php'))); + $this->configCache->set('system', 'theme', 'smarty3'); + + $this->mockApp($this->root, true); + + $this->configMock->shouldReceive('set')->andReturnUsing(function ($cat, $key, $value) { + if ($key !== 'basepath') { + return $this->configCache->set($cat, $key, $value); + } else { + return true; + } + }); + + $this->configMock->shouldReceive('has')->andReturn(true); + $this->configMock->shouldReceive('get')->andReturnUsing(function ($cat, $key) { + return $this->configCache->get($cat, $key); + }); + $this->configMock->shouldReceive('load')->andReturnUsing(function ($config, $overwrite = false) { + return $this->configCache->load($config, $overwrite); + }); + + $this->mode->shouldReceive('isInstall')->andReturn(true); + Logger::init(new VoidLogger()); } /** @@ -78,14 +98,14 @@ class AutomaticInstallationConsoleTest extends ConsoleTest ], 'config' => [ 'php_path' => '', - 'hostname' => '', + 'hostname' => 'friendica.local', 'admin_email' => '', ], 'system' => [ - 'urlpath' => '', - 'url' => '', 'basepath' => '', - 'ssl_policy' => '', + 'urlpath' => '', + 'url' => 'http://friendica.local', + 'ssl_policy' => 0, 'default_timezone' => '', 'language' => '', ], @@ -94,11 +114,11 @@ class AutomaticInstallationConsoleTest extends ConsoleTest 'normal' => [ 'data' => [ 'database' => [ - 'hostname' => getenv('MYSQL_HOST'), - 'port' =>!empty(getenv('MYSQL_PORT')) ? getenv('MYSQL_PORT') : null, - 'username' => getenv('MYSQL_USERNAME'), - 'password' => getenv('MYSQL_PASSWORD'), - 'database' => getenv('MYSQL_DATABASE'), + 'hostname' => 'testhost', + 'port' => 3306, + 'username' => 'friendica', + 'password' => 'a password', + 'database' => 'database', ], 'config' => [ 'php_path' => '', @@ -107,7 +127,7 @@ class AutomaticInstallationConsoleTest extends ConsoleTest ], 'system' => [ 'urlpath' => 'test/it', - 'url' => 'friendica.local/test/it', + 'url' => 'http://friendica.local/test/it', 'basepath' => '', 'ssl_policy' => '2', 'default_timezone' => 'en', @@ -115,6 +135,30 @@ class AutomaticInstallationConsoleTest extends ConsoleTest ], ], ], + 'special' => [ + 'data' => [ + 'database' => [ + 'hostname' => 'testhost.new.domain', + 'port' => 3341, + 'username' => 'fr"§%ica', + 'password' => '$%\"gse', + 'database' => 'db', + ], + 'config' => [ + 'php_path' => '', + 'hostname' => 'friendica.local', + 'admin_email' => 'admin@philipp.info', + ], + 'system' => [ + 'urlpath' => 'test/it', + 'url' => 'https://friendica.local/test/it', + 'basepath' => '', + 'ssl_policy' => '1', + 'default_timezone' => 'en', + 'language' => 'Europe/Berlin', + ], + ], + ], ]; } @@ -210,59 +254,119 @@ FIN; $this->assertEquals($finished, $txt); } + private function assertStuckURL($txt) + { + $finished = <<assertEquals($finished, $txt); + } + + /** + * Asserts one config entry + * + * @param string $cat The category to test + * @param string $key The key to test + * @param null|array $assertion The asserted value (null = empty, or array/string) + * @param string $default_value The default value + */ + public function assertConfigEntry($cat, $key, $assertion = null, $default_value = null) + { + if (!empty($assertion[$cat][$key])) { + $this->assertEquals($assertion[$cat][$key], $this->configCache->get($cat, $key)); + } elseif (!empty($assertion) && !is_array($assertion)) { + $this->assertEquals($assertion, $this->configCache->get($cat, $key)); + } elseif (!empty($default_value)) { + $this->assertEquals($default_value, $this->configCache->get($cat, $key)); + } else { + $this->assertEmpty($this->configCache->get($cat, $key), $this->configCache->get($cat, $key)); + } + } + + /** + * Asserts all config entries + * + * @param null|array $assertion The optional assertion array + * @param boolean $saveDb True, if the db credentials should get saved to the file + * @param boolean $default True, if we use the default values + * @param boolean $defaultDb True, if we use the default value for the DB + * @param boolean $realBasepath True, if we use the real basepath of the installation, not the mocked one + */ + public function assertConfig($assertion = null, $saveDb = false, $default = true, $defaultDb = true, $realBasepath = false) + { + if (!empty($assertion['database']['hostname'])) { + $assertion['database']['hostname'] .= (!empty($assertion['database']['port']) ? ':' . $assertion['database']['port'] : ''); + } + + $this->assertConfigEntry('database', 'hostname', ($saveDb) ? $assertion : null, (!$saveDb || $defaultDb) ? Installer::DEFAULT_HOST : null); + $this->assertConfigEntry('database', 'username', ($saveDb) ? $assertion : null); + $this->assertConfigEntry('database', 'password', ($saveDb) ? $assertion : null); + $this->assertConfigEntry('database', 'database', ($saveDb) ? $assertion : null); + + $this->assertConfigEntry('config', 'admin_email', $assertion); + $this->assertConfigEntry('config', 'php_path', trim(shell_exec('which php'))); + $this->assertConfigEntry('config', 'hostname', $assertion); + + $this->assertConfigEntry('system', 'default_timezone', $assertion, ($default) ? Installer::DEFAULT_TZ : null); + $this->assertConfigEntry('system', 'language', $assertion, ($default) ? Installer::DEFAULT_LANG : null); + $this->assertConfigEntry('system', 'url', $assertion); + $this->assertConfigEntry('system', 'urlpath', $assertion); + $this->assertConfigEntry('system', 'ssl_policy', $assertion, ($default) ? BaseURL::DEFAULT_SSL_SCHEME : null); + $this->assertConfigEntry('system', 'basepath', ($realBasepath) ? $this->root->url() : $assertion); + } + /** * Test the automatic installation without any parameter/setting + * Should stuck because of missing hostname */ public function testEmpty() { - $configCache = new ConfigCache(); - $configCache->set('system', 'basepath', $this->root->url()); - $configCache->set('config', 'php_path', trim(shell_exec('which php'))); + $console = new AutomaticInstallation($this->consoleArgv); - $this->mockApp($this->root, null, true); + $txt = $this->dumpExecute($console); - $this->configMock->shouldReceive('set')->andReturnUsing(function ($cat, $key, $value) use ($configCache) { - if ($key !== 'basepath') { - return $configCache->set($cat, $key, $value); - } else { - return true; - } - });; - $this->configMock->shouldReceive('has')->andReturn(true); - $this->configMock->shouldReceive('get')->andReturnUsing(function ($cat, $key) use ($configCache) { - return $configCache->get($cat, $key); - }); + $this->assertStuckURL($txt); + } + /** + * Test the automatic installation without any parameter/setting + * except URL + */ + public function testEmptyWithURL() + { $this->mockConnect(true, 1); $this->mockConnected(true, 1); $this->mockExistsTable('user', false, 1); $this->mockUpdate([$this->root->url(), false, true, true], null, 1); $this->mockGetMarkupTemplate('local.config.tpl', 'testTemplate', 1); - $this->mockReplaceMacros('testTemplate', \Mockery::any(), '', 1); + $this->mockReplaceMacros('testTemplate', \Mockery::any(), false, '', 1); $console = new AutomaticInstallation($this->consoleArgv); + $console->setOption('url', 'http://friendica.local'); $txt = $this->dumpExecute($console); $this->assertFinished($txt, true, false); $this->assertTrue($this->root->hasChild('config' . DIRECTORY_SEPARATOR . 'local.config.php')); - // Assert the default values without any config - $this->assertEquals(Installer::DEFAULT_HOST, $configCache->get('database', 'hostname')); - $this->assertEmpty($configCache->get('database', 'username')); - $this->assertEmpty($configCache->get('database', 'password')); - $this->assertEmpty($configCache->get('database', 'database')); - - $this->assertEmpty($configCache->get('config', 'hostname'), $configCache->get('config', 'hostname')); - $this->assertEmpty($configCache->get('config', 'admin_email'), $configCache->get('config', 'admin_email')); - $this->assertEquals(trim(shell_exec('which php')), $configCache->get('config', 'php_path')); - - $this->assertEquals(Installer::DEFAULT_TZ, $configCache->get('system', 'default_timezone')); - $this->assertEquals(Installer::DEFAULT_LANG, $configCache->get('system', 'language')); - $this->assertEquals(SSL_POLICY_NONE, $configCache->get('system', 'ssl_policy')); - $this->assertEmpty($configCache->get('system', 'urlpath'), $configCache->get('system', 'urlpath')); - $this->assertEquals($this->root->url(), $configCache->get('system', 'basepath')); + $this->assertConfig(['config' => ['hostname' => 'friendica.local'], 'system' => ['url' => 'http://friendica.local', 'ssl_policy' => 0, 'urlPath' => '']], false, true, true, true); } /** @@ -271,22 +375,16 @@ FIN; */ public function testWithConfig(array $data) { - $configCache = new ConfigCache(); - $configCache->load($data); - $configCache->set('system', 'basepath', $this->root->url()); - $configCache->set('config', 'php_path', trim(shell_exec('which php'))); - - $this->mockApp($this->root, $configCache, true); - $this->mode->shouldReceive('isInstall')->andReturn(false); - Logger::init(new VoidLogger()); - $this->mockConnect(true, 1); $this->mockConnected(true, 1); $this->mockExistsTable('user', false, 1); $this->mockUpdate([$this->root->url(), false, true, true], null, 1); - $conf = function ($cat, $key) use ($configCache) { - return $configCache->get($cat, $key); + $conf = function ($cat, $key) use ($data) { + if ($cat == 'database' && $key == 'hostname' && !empty($data['database']['port'])) { + return $data[$cat][$key] . ':' . $data['database']['port']; + } + return $data[$cat][$key]; }; $config = << [ - 'hostname' => '{$conf('database','hostname')}', + 'hostname' => '{$conf('database', 'hostname')}', 'username' => '{$conf('database', 'username')}', 'password' => '{$conf('database', 'password')}', 'database' => '{$conf('database', 'database')}', @@ -320,9 +418,10 @@ return [ 'register_text' => '', ], 'system' => [ - 'basepath => '{$conf('system', 'basepath')}', - 'urlpath => '{$conf('system', 'urlpath')}', + 'basepath' => '{$conf('system', 'basepath')}', + 'urlpath' => '{$conf('system', 'urlpath')}', 'url' => '{$conf('system', 'url')}', + 'ssl_policy' => '{$conf('system', 'ssl_policy')}', 'default_timezone' => '{$conf('system', 'default_timezone')}', 'language' => '{$conf('system', 'language')}', ], @@ -342,6 +441,8 @@ CONF; $this->assertTrue($this->root->hasChild('config' . DIRECTORY_SEPARATOR . 'local.config.php')); $this->assertEquals($config, file_get_contents($this->root->getChild('config' . DIRECTORY_SEPARATOR . 'local.config.php')->url())); + + $this->assertConfig($data, true, false, false); } /** @@ -351,31 +452,13 @@ CONF; */ public function testWithEnvironmentAndSave(array $data) { - $configCache = new ConfigCache(); - $configCache->set('system', 'basepath', $this->root->url()); - $configCache->set('config', 'php_path', trim(shell_exec('which php'))); - - $this->mockApp($this->root, null, true); - - $this->configMock->shouldReceive('set')->andReturnUsing(function ($cat, $key, $value) use ($configCache) { - if ($key !== 'basepath') { - return $configCache->set($cat, $key, $value); - } else { - return true; - } - });; - $this->configMock->shouldReceive('has')->andReturn(true); - $this->configMock->shouldReceive('get')->andReturnUsing(function ($cat, $key) use ($configCache) { - return $configCache->get($cat, $key); - }); - $this->mockConnect(true, 1); $this->mockConnected(true, 1); $this->mockExistsTable('user', false, 1); $this->mockUpdate([$this->root->url(), false, true, true], null, 1); $this->mockGetMarkupTemplate('local.config.tpl', 'testTemplate', 1); - $this->mockReplaceMacros('testTemplate', \Mockery::any(), '', 1); + $this->mockReplaceMacros('testTemplate', \Mockery::any(), false, '', 1); $this->assertTrue(putenv('MYSQL_HOST=' . $data['database']['hostname'])); $this->assertTrue(putenv('MYSQL_PORT=' . $data['database']['port'])); @@ -383,11 +466,10 @@ CONF; $this->assertTrue(putenv('MYSQL_USERNAME=' . $data['database']['username'])); $this->assertTrue(putenv('MYSQL_PASSWORD=' . $data['database']['password'])); - $this->assertTrue(putenv('FRIENDICA_URL_PATH=' . $data['system']['urlpath'])); + $this->assertTrue(putenv('FRIENDICA_HOSTNAME=' . $data['config']['hostname'])); $this->assertTrue(putenv('FRIENDICA_BASE_PATH=' . $data['system']['basepath'])); + $this->assertTrue(putenv('FRIENDICA_URL=' . $data['system']['url'])); $this->assertTrue(putenv('FRIENDICA_PHP_PATH=' . $data['config']['php_path'])); - $this->assertTrue(putenv('FRIENDICA_SSL_POLICY=' . $data['system']['ssl_policy'])); - $this->assertTrue(putenv('FRIENDICA_HOSTNAME=' . $data['config']['hostname'])); $this->assertTrue(putenv('FRIENDICA_ADMIN_MAIL=' . $data['config']['admin_email'])); $this->assertTrue(putenv('FRIENDICA_TZ=' . $data['system']['default_timezone'])); $this->assertTrue(putenv('FRIENDICA_LANG=' . $data['system']['language'])); @@ -397,27 +479,8 @@ CONF; $txt = $this->dumpExecute($console); - // Assert the default values without any config - $dbhost = $data['database']['hostname'] . (!empty($data['database']['port']) ? ':' . $data['database']['port'] : ''); - $this->assertEquals($dbhost, $configCache->get('database', 'hostname')); - $this->assertEquals($data['database']['username'], $configCache->get('database', 'username')); - $this->assertEquals($data['database']['database'], $configCache->get('database', 'database')); - $this->assertEquals($data['database']['password'], $configCache->get('database', 'password')); - - $this->assertEquals($data['config']['hostname'], $configCache->get('config', 'hostname')); - $this->assertEquals($data['config']['admin_email'], $configCache->get('config', 'admin_email')); - $this->assertEquals(trim(shell_exec('which php')), $configCache->get('config', 'php_path')); - - $this->assertEquals((!empty($data['system']['default_timezone']) ? $data['system']['default_timezone'] : Installer::DEFAULT_TZ), - $configCache->get('system', 'default_timezone')); - $this->assertEquals((!empty($data['system']['language']) ? $data['system']['language'] : Installer::DEFAULT_LANG), - $configCache->get('system', 'language')); - $this->assertEquals((!empty($data['system']['ssl_policy']) ? $data['system']['ssl_policy'] : SSL_POLICY_NONE), - $configCache->get('system', 'ssl_policy')); - $this->assertEquals((!empty($data['system']['urlpath']) ? $data['system']['urlpath'] : null), - $configCache->get('system', 'urlpath')); - $this->assertFinished($txt, true); + $this->assertConfig($data, true, true, false, true); } /** @@ -427,31 +490,13 @@ CONF; */ public function testWithEnvironmentWithoutSave(array $data) { - $configCache = new ConfigCache(); - $configCache->set('system', 'basepath', $this->root->url()); - $configCache->set('config', 'php_path', trim(shell_exec('which php'))); - - $this->mockApp($this->root, null, true); - - $this->configMock->shouldReceive('set')->andReturnUsing(function ($cat, $key, $value) use ($configCache) { - if ($key !== 'basepath') { - return $configCache->set($cat, $key, $value); - } else { - return true; - } - });; - $this->configMock->shouldReceive('has')->andReturn(true); - $this->configMock->shouldReceive('get')->andReturnUsing(function ($cat, $key) use ($configCache) { - return $configCache->get($cat, $key); - }); - $this->mockConnect(true, 1); $this->mockConnected(true, 1); $this->mockExistsTable('user', false, 1); $this->mockUpdate([$this->root->url(), false, true, true], null, 1); $this->mockGetMarkupTemplate('local.config.tpl', 'testTemplate', 1); - $this->mockReplaceMacros('testTemplate', \Mockery::any(), '', 1); + $this->mockReplaceMacros('testTemplate', \Mockery::any(), false, '', 1); $this->assertTrue(putenv('MYSQL_HOST=' . $data['database']['hostname'])); $this->assertTrue(putenv('MYSQL_PORT=' . $data['database']['port'])); @@ -459,38 +504,20 @@ CONF; $this->assertTrue(putenv('MYSQL_USERNAME=' . $data['database']['username'])); $this->assertTrue(putenv('MYSQL_PASSWORD=' . $data['database']['password'])); - $this->assertTrue(putenv('FRIENDICA_URL_PATH=' . $data['system']['urlpath'])); - $this->assertTrue(putenv('FRIENDICA_BASE_PATH=' . $data['system']['basepath'])); - $this->assertTrue(putenv('FRIENDICA_PHP_PATH=' . $data['config']['php_path'])); - $this->assertTrue(putenv('FRIENDICA_SSL_POLICY=' . $data['system']['ssl_policy'])); - $this->assertTrue(putenv('FRIENDICA_HOSTNAME=' . $data['config']['hostname'])); + $this->assertTrue(putenv('FRIENDICA_HOSTNAME=' . $data['config']['hostname'])); + $this->assertTrue(putenv('FRIENDICA_BASE_PATH=' . $data['system']['basepath'])); + $this->assertTrue(putenv('FRIENDICA_URL=' . $data['system']['url'])); + $this->assertTrue(putenv('FRIENDICA_PHP_PATH=' . $data['config']['php_path'])); $this->assertTrue(putenv('FRIENDICA_ADMIN_MAIL=' . $data['config']['admin_email'])); - $this->assertTrue(putenv('FRIENDICA_TZ=' . $data['system']['default_timezone'])); - $this->assertTrue(putenv('FRIENDICA_LANG=' . $data['system']['language'])); + $this->assertTrue(putenv('FRIENDICA_TZ=' . $data['system']['default_timezone'])); + $this->assertTrue(putenv('FRIENDICA_LANG=' . $data['system']['language'])); $console = new AutomaticInstallation($this->consoleArgv); $txt = $this->dumpExecute($console); - $this->assertEquals(Installer::DEFAULT_HOST, $configCache->get('database', 'hostname')); - $this->assertEmpty($configCache->get('database', 'username'), $configCache->get('database', 'username')); - $this->assertEmpty($configCache->get('database', 'password'), $configCache->get('database', 'password')); - $this->assertEmpty($configCache->get('database', 'database'), $configCache->get('database', 'database')); - - $this->assertEquals($data['config']['hostname'], $configCache->get('config', 'hostname')); - $this->assertEquals($data['config']['admin_email'], $configCache->get('config', 'admin_email')); - $this->assertEquals(trim(shell_exec('which php')), $configCache->get('config', 'php_path')); - - $this->assertEquals((!empty($data['system']['default_timezone']) ? $data['system']['default_timezone'] : Installer::DEFAULT_TZ), - $configCache->get('system', 'default_timezone')); - $this->assertEquals((!empty($data['system']['language']) ? $data['system']['language'] : Installer::DEFAULT_LANG), - $configCache->get('system', 'language')); - $this->assertEquals((!empty($data['system']['ssl_policy']) ? $data['system']['ssl_policy'] : SSL_POLICY_NONE), - $configCache->get('system', 'ssl_policy')); - $this->assertEquals((!empty($data['system']['urlpath']) ? $data['system']['urlpath'] : null), - $configCache->get('system', 'urlpath')); - $this->assertFinished($txt, true); + $this->assertConfig($data, false, true, false, true); } /** @@ -499,97 +526,37 @@ CONF; */ public function testWithArguments(array $data) { - $configCache = new ConfigCache(); - $configCache->set('system', 'basepath', $this->root->url()); - $configCache->set('config', 'php_path', trim(shell_exec('which php'))); - - $this->mockApp($this->root, null, true); - - $this->configMock->shouldReceive('set')->andReturnUsing(function ($cat, $key, $value) use ($configCache) { - if ($key !== 'basepath') { - return $configCache->set($cat, $key, $value); - } else { - return true; - } - });; - $this->configMock->shouldReceive('has')->andReturn(true); - $this->configMock->shouldReceive('get')->andReturnUsing(function ($cat, $key) use ($configCache) { - return $configCache->get($cat, $key); - }); - $this->mockConnect(true, 1); $this->mockConnected(true, 1); $this->mockExistsTable('user', false, 1); $this->mockUpdate([$this->root->url(), false, true, true], null, 1); $this->mockGetMarkupTemplate('local.config.tpl', 'testTemplate', 1); - $this->mockReplaceMacros('testTemplate', \Mockery::any(), '', 1); + $this->mockReplaceMacros('testTemplate', \Mockery::any(), false, '', 1); $console = new AutomaticInstallation($this->consoleArgv); - if (!empty($data['database']['hostname'])) { - $console->setOption('dbhost', $data['database']['hostname']); - } - if (!empty($data['database']['port'])) { - $console->setOption('dbport', $data['database']['port']); - } - if (!empty($data['database']['username'])) { - $console->setOption('dbuser', $data['database']['username']); - } - if (!empty($data['database']['password'])) { - $console->setOption('dbpass', $data['database']['password']); - } - if (!empty($data['database']['database'])) { - $console->setOption('dbdata', $data['database']['database']); - } - if (!empty($data['system']['urlpath'])) { - $console->setOption('urlpath', $data['system']['urlpath']); - } - if (!empty($data['system']['basepath'])) { - $console->setOption('basepath', $data['system']['basepath']); - } - if (!empty($data['config']['php_path'])) { - $console->setOption('phppath', $data['config']['php_path']); - } - if (!empty($data['system']['ssl_policy'])) { - $console->setOption('sslpolicy', $data['system']['ssl_policy']); - } - if (!empty($data['config']['hostname'])) { - $console->setOption('hostname', $data['config']['hostname']); - } - if (!empty($data['config']['admin_email'])) { - $console->setOption('admin', $data['config']['admin_email']); - } - if (!empty($data['system']['default_timezone'])) { - $console->setOption('tz', $data['system']['default_timezone']); - } - if (!empty($data['system']['language'])) { - $console->setOption('lang', $data['system']['language']); - } + $option = function($var, $cat, $key) use ($data, $console) { + if (!empty($data[$cat][$key])) { + $console->setOption($var, $data[$cat][$key]); + } + }; + $option('dbhost' , 'database', 'hostname'); + $option('dbport' , 'database', 'port'); + $option('dbuser' , 'database', 'username'); + $option('dbpass' , 'database', 'password'); + $option('dbdata' , 'database', 'database'); + $option('url' , 'system' , 'url'); + $option('phppath' , 'config' , 'php_path'); + $option('admin' , 'config' , 'admin_email'); + $option('tz' , 'system' , 'default_timezone'); + $option('lang' , 'system' , 'language'); + $option('basepath' , 'system' , 'basepath'); $txt = $this->dumpExecute($console); - $dbhost = (!empty($data['database']['hostname'])) ? $data['database']['hostname'] : Installer::DEFAULT_HOST; - $dbhost .= (!empty($data['database']['port']) ? ':' . $data['database']['port'] : ''); - $this->assertEquals($dbhost, $configCache->get('database', 'hostname')); - $this->assertEquals($data['database']['username'], $configCache->get('database', 'username')); - $this->assertEquals($data['database']['database'], $configCache->get('database', 'database')); - $this->assertEquals($data['database']['password'], $configCache->get('database', 'password')); - - $this->assertEquals($data['config']['hostname'], $configCache->get('config', 'hostname')); - $this->assertEquals($data['config']['admin_email'], $configCache->get('config', 'admin_email')); - $this->assertEquals(trim(shell_exec('which php')), $configCache->get('config', 'php_path')); - - $this->assertEquals((!empty($data['system']['default_timezone']) ? $data['system']['default_timezone'] : Installer::DEFAULT_TZ), - $configCache->get('system', 'default_timezone')); - $this->assertEquals((!empty($data['system']['language']) ? $data['system']['language'] : Installer::DEFAULT_LANG), - $configCache->get('system', 'language')); - $this->assertEquals((!empty($data['system']['ssl_policy']) ? $data['system']['ssl_policy'] : SSL_POLICY_NONE), - $configCache->get('system', 'ssl_policy')); - $this->assertEquals((!empty($data['system']['urlpath']) ? $data['system']['urlpath'] : null), - $configCache->get('system', 'urlpath')); - $this->assertFinished($txt, true); + $this->assertConfig($data, true, true, true, true); } /** @@ -597,51 +564,20 @@ CONF; */ public function testNoDatabaseConnection() { - $configCache = new ConfigCache(); - $configCache->set('system', 'basepath', $this->root->url()); - $configCache->set('config', 'php_path', trim(shell_exec('which php'))); - - $this->mockApp($this->root, null, true); - - $this->configMock->shouldReceive('set')->andReturnUsing(function ($cat, $key, $value) use ($configCache) { - if ($key !== 'basepath') { - return $configCache->set($cat, $key, $value); - } else { - return true; - } - });; - $this->configMock->shouldReceive('has')->andReturn(true); - $this->configMock->shouldReceive('get')->andReturnUsing(function ($cat, $key) use ($configCache) { - return $configCache->get($cat, $key); - }); - $this->mockConnect(false, 1); $this->mockGetMarkupTemplate('local.config.tpl', 'testTemplate', 1); - $this->mockReplaceMacros('testTemplate', \Mockery::any(), '', 1); + $this->mockReplaceMacros('testTemplate', \Mockery::any(), false, '', 1); $console = new AutomaticInstallation($this->consoleArgv); + $console->setOption('url', 'http://friendica.local'); $txt = $this->dumpExecute($console); $this->assertStuckDB($txt); $this->assertTrue($this->root->hasChild('config' . DIRECTORY_SEPARATOR . 'local.config.php')); - // Assert the default values without any config - $this->assertEquals(Installer::DEFAULT_HOST, $configCache->get('database', 'hostname')); - $this->assertEmpty($configCache->get('database', 'username')); - $this->assertEmpty($configCache->get('database', 'password')); - $this->assertEmpty($configCache->get('database', 'database')); - - $this->assertEmpty($configCache->get('config', 'hostname'), $configCache->get('config', 'hostname')); - $this->assertEmpty($configCache->get('config', 'admin_email'), $configCache->get('config', 'admin_email')); - $this->assertEquals(trim(shell_exec('which php')), $configCache->get('config', 'php_path')); - - $this->assertEquals(Installer::DEFAULT_TZ, $configCache->get('system', 'default_timezone')); - $this->assertEquals(Installer::DEFAULT_LANG, $configCache->get('system', 'language')); - $this->assertEquals(SSL_POLICY_NONE, $configCache->get('system', 'ssl_policy')); - $this->assertEmpty($configCache->get('system', 'urlpath'), $configCache->get('system', 'urlpath')); - $this->assertEquals($this->root->url(), $configCache->get('system', 'basepath')); + $this->assertConfig(['config' => ['hostname' => 'friendica.local'], 'system' => ['url' => 'http://friendica.local', 'ssl_policy' => 0, 'urlpath' => '']], false, true, false, true); } public function testGetHelp() @@ -663,19 +599,17 @@ Options -v Show more debug information. -a All setup checks are required (except .htaccess) -f|--file prepared config file (e.g. "config/local.config.php" itself) which will override every other config option - except the environment variables) - -s|--savedb Save the DB credentials to the file (if environment variables is used) - -H|--dbhost The host of the mysql/mariadb database (env MYSQL_HOST) - -p|--dbport The port of the mysql/mariadb database (env MYSQL_PORT) - -d|--dbdata The name of the mysql/mariadb database (env MYSQL_DATABASE) - -U|--dbuser The username of the mysql/mariadb database login (env MYSQL_USER or MYSQL_USERNAME) - -P|--dbpass The password of the mysql/mariadb database login (env MYSQL_PASSWORD) - -U|--urlpath The URL path of Friendica - f.e. '/friendica' (env FRIENDICA_URL_PATH) - -B|--phppath The path of the PHP binary (env FRIENDICA_PHP_PATH) - -b|--basepath The basepath of Friendica(env FRIENDICA_BASE_PATH) - -S|--sslpolicy The SSL policy of Friendica (env FRIENDICA_SSL_POLICY) - -n|--hostname The hostname of Friendica (env FRIENDICA_PHP_HOSTNAME) - -t|--tz The timezone of Friendica (env FRIENDICA_TZ) - -L|--lang The language of Friendica (env FRIENDICA_LANG) + -s|--savedb Save the DB credentials to the file (if environment variables is used) + -H|--dbhost The host of the mysql/mariadb database (env MYSQL_HOST) + -p|--dbport The port of the mysql/mariadb database (env MYSQL_PORT) + -d|--dbdata The name of the mysql/mariadb database (env MYSQL_DATABASE) + -U|--dbuser The username of the mysql/mariadb database login (env MYSQL_USER or MYSQL_USERNAME) + -P|--dbpass The password of the mysql/mariadb database login (env MYSQL_PASSWORD) + -U|--url The full base URL of Friendica - f.e. 'https://friendica.local/sub' (env FRIENDICA_URL) + -B|--phppath The path of the PHP binary (env FRIENDICA_PHP_PATH) + -b|--basepath The basepath of Friendica (env FRIENDICA_BASE_PATH) + -t|--tz The timezone of Friendica (env FRIENDICA_TZ) + -L|--lang The language of Friendica (env FRIENDICA_LANG) Environment variables MYSQL_HOST The host of the mysql/mariadb database (mandatory if mysql and environment is used) @@ -683,12 +617,10 @@ Environment variables MYSQL_USERNAME|MYSQL_USER The username of the mysql/mariadb database login (MYSQL_USERNAME is for mysql, MYSQL_USER for mariadb) MYSQL_PASSWORD The password of the mysql/mariadb database login MYSQL_DATABASE The name of the mysql/mariadb database - FRIENDICA_URL_PATH The URL path of Friendica (f.e. '/friendica') - leave empty for auto detection + FRIENDICA_URL The full base URL of Friendica - f.e. 'https://friendica.local/sub' FRIENDICA_PHP_PATH The path of the PHP binary - leave empty for auto detection FRIENDICA_BASE_PATH The basepath of Friendica - leave empty for auto detection FRIENDICA_ADMIN_MAIL The admin email address of Friendica (this email will be used for admin access) - FRIENDICA_SSL_POLICY The SSL policy of Friendica (default is NO SSL) - FRIENDICA_HOSTNAME The hostname of Friendica - leave empty for auto detection FRIENDICA_TZ The timezone of Friendica FRIENDICA_LANG The langauge of Friendica @@ -709,6 +641,6 @@ HELP; $txt = $this->dumpExecute($console); - $this->assertEquals($txt, $theHelp); + $this->assertEquals($theHelp, $txt); } }