@@ -25,7 +25,7 @@ |
||
25 | 25 | $loader = require __DIR__.'/autoload.php'; |
26 | 26 | |
27 | 27 | ini_set('display_errors', 'Off'); |
28 | -error_reporting(E_ALL & ~E_DEPRECATED & ~E_STRICT); |
|
28 | +error_reporting(E_ALL&~E_DEPRECATED&~E_STRICT); |
|
29 | 29 | |
30 | 30 | // see http://silex.sensiolabs.org/doc/web_servers.html#php-5-4 |
31 | 31 | $filename = __DIR__.preg_replace('#(\?.*)$#', '', $_SERVER['REQUEST_URI']); |
@@ -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; |
@@ -166,8 +166,7 @@ discard block |
||
166 | 166 | putenv('MAIL_PASS='.(getenv('MAIL_PASS') ? getenv('MAIL_PASS') : null)); |
167 | 167 | putenv('ADMIN_ROUTE='.(getenv('ADMIN_ROUTE') ? getenv('ADMIN_ROUTE') : 'admin')); |
168 | 168 | putenv('ROOT_URLPATH='.(getenv('ROOT_URLPATH') ? getenv('ROOT_URLPATH') : null)); |
169 | - putenv('AUTH_MAGIC='.(getenv('AUTH_MAGIC') ? getenv('AUTH_MAGIC') : |
|
170 | - substr(str_replace(array('/', '+', '='), '', base64_encode(openssl_random_pseudo_bytes(32 * 2))), 0, 32))); |
|
169 | + putenv('AUTH_MAGIC='.(getenv('AUTH_MAGIC') ? getenv('AUTH_MAGIC') : substr(str_replace(array('/', '+', '='), '', base64_encode(openssl_random_pseudo_bytes(32 * 2))), 0, 32))); |
|
171 | 170 | } |
172 | 171 | |
173 | 172 | function getExampleVariables() |
@@ -277,7 +276,7 @@ discard block |
||
277 | 276 | { |
278 | 277 | $app = \Eccube\Application::getInstance(['eccube.autoloader' => $loader]); |
279 | 278 | $app['debug'] = true; |
280 | - $app['annotations'] = function () { |
|
279 | + $app['annotations'] = function() { |
|
281 | 280 | return new \Doctrine\Common\Annotations\AnnotationReader(); |
282 | 281 | }; |
283 | 282 | $app->initDoctrine(); |
@@ -388,15 +387,15 @@ discard block |
||
388 | 387 | foreach ($finder as $content) { |
389 | 388 | $permission = $content->getPerms(); |
390 | 389 | // see also http://www.php.net/fileperms |
391 | - if (!($permission & 0x0010) || !($permission & 0x0002)) { |
|
390 | + if (!($permission&0x0010) || !($permission&0x0002)) { |
|
392 | 391 | $realPath = $content->getRealPath(); |
393 | 392 | if ($verbose) { |
394 | 393 | out(sprintf('%s %s to ', $realPath, substr(sprintf('%o', $permission), -4)), 'info', false); |
395 | 394 | } |
396 | - $permission = !($permission & 0x0020) ? $permission += 040 : $permission; // g+r |
|
397 | - $permission = !($permission & 0x0010) ? $permission += 020 : $permission; // g+w |
|
398 | - $permission = !($permission & 0x0004) ? $permission += 04 : $permission; // o+r |
|
399 | - $permission = !($permission & 0x0002) ? $permission += 02 : $permission; // o+w |
|
395 | + $permission = !($permission&0x0020) ? $permission += 040 : $permission; // g+r |
|
396 | + $permission = !($permission&0x0010) ? $permission += 020 : $permission; // g+w |
|
397 | + $permission = !($permission&0x0004) ? $permission += 04 : $permission; // o+r |
|
398 | + $permission = !($permission&0x0002) ? $permission += 02 : $permission; // o+w |
|
400 | 399 | $result = chmod($realPath, $permission); |
401 | 400 | if ($verbose) { |
402 | 401 | if ($result) { |
@@ -428,13 +427,13 @@ discard block |
||
428 | 427 | |
429 | 428 | function getConfig() |
430 | 429 | { |
431 | - $config = array ( |
|
430 | + $config = array( |
|
432 | 431 | 'auth_magic' => getenv('AUTH_MAGIC'), |
433 | 432 | 'password_hash_algos' => 'sha256', |
434 | 433 | 'shop_name' => getenv('SHOP_NAME'), |
435 | 434 | 'force_ssl' => NULL, |
436 | 435 | 'admin_allow_host' => |
437 | - array ( |
|
436 | + array( |
|
438 | 437 | ), |
439 | 438 | 'cookie_lifetime' => 0, |
440 | 439 | 'locale' => 'ja', |
@@ -447,9 +446,9 @@ discard block |
||
447 | 446 | |
448 | 447 | function getDatabaseConfig($database_driver) |
449 | 448 | { |
450 | - $database = array ( |
|
449 | + $database = array( |
|
451 | 450 | 'database' => |
452 | - array ( |
|
451 | + array( |
|
453 | 452 | 'driver' => $database_driver, |
454 | 453 | ) |
455 | 454 | ); |
@@ -476,9 +475,9 @@ discard block |
||
476 | 475 | |
477 | 476 | function getMailConfig() |
478 | 477 | { |
479 | - $mail = array ( |
|
478 | + $mail = array( |
|
480 | 479 | 'mail' => |
481 | - array ( |
|
480 | + array( |
|
482 | 481 | 'transport' => getenv('MAIL_BACKEND'), |
483 | 482 | 'host' => getenv('MAIL_HOST'), |
484 | 483 | 'port' => getenv('MAIL_PORT'), |
@@ -1,19 +1,19 @@ |
||
1 | 1 | <?php return [ |
2 | - 'auth_magic' => '${AUTH_MAGIC}', |
|
3 | - 'password_hash_algos' => 'sha256', |
|
4 | - 'shop_name' => '${SHOP_NAME}', |
|
5 | - 'force_ssl' => '${FORCE_SSL}', |
|
6 | - 'admin_allow_host' => NULL, |
|
7 | - 'cookie_lifetime' => 0, |
|
8 | - 'cookie_name' => 'eccube', |
|
9 | - 'locale' => 'ja', |
|
10 | - 'timezone' => 'Asia/Tokyo', |
|
11 | - 'currency' => 'JPY', |
|
12 | - 'pageinrange' => false, |
|
13 | - 'trusted_proxies_connection_only' => false, |
|
14 | - 'trusted_proxies' => |
|
15 | - [ |
|
16 | - ], |
|
17 | - 'vendor_prefix' => 'Acme\\', |
|
18 | - 'vendor_dir' => 'Acme/', |
|
2 | + 'auth_magic' => '${AUTH_MAGIC}', |
|
3 | + 'password_hash_algos' => 'sha256', |
|
4 | + 'shop_name' => '${SHOP_NAME}', |
|
5 | + 'force_ssl' => '${FORCE_SSL}', |
|
6 | + 'admin_allow_host' => NULL, |
|
7 | + 'cookie_lifetime' => 0, |
|
8 | + 'cookie_name' => 'eccube', |
|
9 | + 'locale' => 'ja', |
|
10 | + 'timezone' => 'Asia/Tokyo', |
|
11 | + 'currency' => 'JPY', |
|
12 | + 'pageinrange' => false, |
|
13 | + 'trusted_proxies_connection_only' => false, |
|
14 | + 'trusted_proxies' => |
|
15 | + [ |
|
16 | + ], |
|
17 | + 'vendor_prefix' => 'Acme\\', |
|
18 | + 'vendor_dir' => 'Acme/', |
|
19 | 19 | ]; |