Compare commits

...

1 Commits

Author SHA1 Message Date
Clemens Schwaighofer
4bac10bb42 Bug fix for checks, bug fix in config other, test host
Add test host soba-dev.tequila.jp, others will be added

config.other had errors with double define a constant

Supress phan/phpstan errors for ...array calls in methods
2021-12-01 10:58:23 +09:00
4 changed files with 12 additions and 2 deletions

View File

@@ -23,6 +23,14 @@ declare(strict_types=1);
// 'login_enabled' => true // 'login_enabled' => true
// ]; // ];
$__LOCAL_CONFIG = [
'db_host' => 'test',
'location' => 'test',
'debug_flag' => true,
'site_lang' => 'en_utf8',
'login_enabled' => true
];
// each host has a different db_host // each host has a different db_host
$SITE_CONFIG = [ $SITE_CONFIG = [
// development host // development host
@@ -42,6 +50,7 @@ $SITE_CONFIG = [
'login_enabled' => true 'login_enabled' => true
], ],
// 'other.host.com' => $__LOCAL_CONFIG // 'other.host.com' => $__LOCAL_CONFIG
'soba-dev.tequila.jp' => $__LOCAL_CONFIG
]; ];
// __END__ // __END__

View File

@@ -24,6 +24,7 @@ foreach ($paths as $path) {
if (file_exists($path . DS . 'convert') && is_file($path . DS . 'convert')) { if (file_exists($path . DS . 'convert') && is_file($path . DS . 'convert')) {
// image magick convert location // image magick convert location
define('CONVERT', $path . DS . 'convert'); define('CONVERT', $path . DS . 'convert');
break;
} }
} }
unset($paths); unset($paths);

View File

@@ -281,7 +281,7 @@ class Basic
public function debugFor(string $type, string $flag): void public function debugFor(string $type, string $flag): void
{ {
trigger_error('Method ' . __METHOD__ . ' is deprecated, use $basic->log->debugFor() or use \CoreLibs\Debug\Logging() class', E_USER_DEPRECATED); trigger_error('Method ' . __METHOD__ . ' is deprecated, use $basic->log->debugFor() or use \CoreLibs\Debug\Logging() class', E_USER_DEPRECATED);
/** @phan-suppress-next-line PhanTypeMismatchArgumentReal @phpstan-ignore-next-line */ /** @phan-suppress-next-line PhanTypeMismatchArgumentReal, PhanParamTooFew @phpstan-ignore-next-line */
$this->log->debugFor(...[func_get_args()]); $this->log->debugFor(...[func_get_args()]);
} }

View File

@@ -369,7 +369,7 @@ class Logging
*/ */
public function debugFor(string $type, string $flag): void public function debugFor(string $type, string $flag): void
{ {
/** @phan-suppress-next-line PhanTypeMismatchArgumentReal @phpstan-ignore-next-line */ /** @phan-suppress-next-line PhanTypeMismatchArgumentReal, PhanParamTooFew @phpstan-ignore-next-line */
$this->setLogLevel(...[func_get_args()]); $this->setLogLevel(...[func_get_args()]);
} }