@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | out('EC-CUBE3 installer use database driver of ', null, false); |
| 32 | 32 | |
| 33 | 33 | $database_driver = 'pdo_sqlite'; |
| 34 | -switch($argv[1]) { |
|
| 34 | +switch ($argv[1]) { |
|
| 35 | 35 | case 'mysql': |
| 36 | 36 | $database_driver = 'pdo_mysql'; |
| 37 | 37 | break; |
@@ -350,15 +350,15 @@ discard block |
||
| 350 | 350 | foreach ($finder as $content) { |
| 351 | 351 | $permission = $content->getPerms(); |
| 352 | 352 | // see also http://www.php.net/fileperms |
| 353 | - if (!($permission & 0x0010) || !($permission & 0x0002)) { |
|
| 353 | + if (!($permission&0x0010) || !($permission&0x0002)) { |
|
| 354 | 354 | $realPath = $content->getRealPath(); |
| 355 | 355 | if ($verbose) { |
| 356 | 356 | out(sprintf('%s %s to ', $realPath, substr(sprintf('%o', $permission), -4)), 'info', false); |
| 357 | 357 | } |
| 358 | - $permission = !($permission & 0x0020) ? $permission += 040 : $permission; // g+r |
|
| 359 | - $permission = !($permission & 0x0010) ? $permission += 020 : $permission; // g+w |
|
| 360 | - $permission = !($permission & 0x0004) ? $permission += 04 : $permission; // o+r |
|
| 361 | - $permission = !($permission & 0x0002) ? $permission += 02 : $permission; // o+w |
|
| 358 | + $permission = !($permission&0x0020) ? $permission += 040 : $permission; // g+r |
|
| 359 | + $permission = !($permission&0x0010) ? $permission += 020 : $permission; // g+w |
|
| 360 | + $permission = !($permission&0x0004) ? $permission += 04 : $permission; // o+r |
|
| 361 | + $permission = !($permission&0x0002) ? $permission += 02 : $permission; // o+w |
|
| 362 | 362 | $result = chmod($realPath, $permission); |
| 363 | 363 | if ($verbose) { |
| 364 | 364 | if ($result) { |
@@ -389,13 +389,13 @@ discard block |
||
| 389 | 389 | |
| 390 | 390 | function getConfig() |
| 391 | 391 | { |
| 392 | - $config = array ( |
|
| 392 | + $config = array( |
|
| 393 | 393 | 'auth_magic' => \Eccube\Util\Str::random(32), |
| 394 | 394 | 'password_hash_algos' => 'sha256', |
| 395 | 395 | 'shop_name' => getenv('SHOP_NAME'), |
| 396 | 396 | 'force_ssl' => NULL, |
| 397 | 397 | 'admin_allow_host' => |
| 398 | - array ( |
|
| 398 | + array( |
|
| 399 | 399 | ), |
| 400 | 400 | 'cookie_lifetime' => 0, |
| 401 | 401 | 'locale' => 'ja', |
@@ -407,9 +407,9 @@ discard block |
||
| 407 | 407 | |
| 408 | 408 | function getDatabaseConfig($database_driver) |
| 409 | 409 | { |
| 410 | - $database = array ( |
|
| 410 | + $database = array( |
|
| 411 | 411 | 'database' => |
| 412 | - array ( |
|
| 412 | + array( |
|
| 413 | 413 | 'driver' => $database_driver, |
| 414 | 414 | ) |
| 415 | 415 | ); |
@@ -436,9 +436,9 @@ discard block |
||
| 436 | 436 | |
| 437 | 437 | function getMailConfig() |
| 438 | 438 | { |
| 439 | - $mail = array ( |
|
| 439 | + $mail = array( |
|
| 440 | 440 | 'mail' => |
| 441 | - array ( |
|
| 441 | + array( |
|
| 442 | 442 | 'transport' => getenv('MAIL_BACKEND'), |
| 443 | 443 | 'host' => getenv('MAIL_HOST'), |
| 444 | 444 | 'port' => getenv('MAIL_PORT'), |
@@ -457,7 +457,7 @@ discard block |
||
| 457 | 457 | $root_dir = realpath(__DIR__); |
| 458 | 458 | $root_urlpath = getenv('ROOT_URLPATH'); |
| 459 | 459 | // TODO path.yml.dist から取得したい |
| 460 | - $path = array ( |
|
| 460 | + $path = array( |
|
| 461 | 461 | 'root' => $root_urlpath.'/', |
| 462 | 462 | 'admin_dir' => getenv('ADMIN_ROUTE'), |
| 463 | 463 | 'tpl' => $root_urlpath.'/user_data/packages/default/', |