Completed
Pull Request — master (#1910)
by chihiro
60:18 queued 54:32
created
src/Eccube/Form/Type/Admin/PaymentRegisterType.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -36,6 +36,9 @@
 block discarded – undo
36 36
 {
37 37
     protected $app;
38 38
 
39
+    /**
40
+     * @param \Silex\Application $app
41
+     */
39 42
     public function __construct($app)
40 43
     {
41 44
         $this->app = $app;
Please login to merge, or discard this patch.
eccube_install.php 1 patch
Spacing   +13 added lines, -14 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
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;
@@ -157,8 +157,7 @@  discard block
 block discarded – undo
157 157
     putenv('MAIL_PASS='.(getenv('MAIL_PASS') ? getenv('MAIL_PASS') : null));
158 158
     putenv('ADMIN_ROUTE='.(getenv('ADMIN_ROUTE') ? getenv('ADMIN_ROUTE') : 'admin'));
159 159
     putenv('ROOT_URLPATH='.(getenv('ROOT_URLPATH') ? getenv('ROOT_URLPATH') : null));
160
-    putenv('AUTH_MAGIC='.(getenv('AUTH_MAGIC') ? getenv('AUTH_MAGIC') :
161
-                          substr(str_replace(array('/', '+', '='), '', base64_encode(openssl_random_pseudo_bytes(32 * 2))), 0, 32)));
160
+    putenv('AUTH_MAGIC='.(getenv('AUTH_MAGIC') ? getenv('AUTH_MAGIC') : substr(str_replace(array('/', '+', '='), '', base64_encode(openssl_random_pseudo_bytes(32 * 2))), 0, 32)));
162 161
 }
163 162
 
164 163
 function getExampleVariables()
@@ -357,15 +356,15 @@  discard block
 block discarded – undo
357 356
     foreach ($finder as $content) {
358 357
         $permission = $content->getPerms();
359 358
         // see also http://www.php.net/fileperms
360
-        if (!($permission & 0x0010) || !($permission & 0x0002)) {
359
+        if (!($permission&0x0010) || !($permission&0x0002)) {
361 360
             $realPath = $content->getRealPath();
362 361
             if ($verbose) {
363 362
                 out(sprintf('%s %s to ', $realPath, substr(sprintf('%o', $permission), -4)), 'info', false);
364 363
             }
365
-            $permission = !($permission & 0x0020) ? $permission += 040 : $permission; // g+r
366
-            $permission = !($permission & 0x0010) ? $permission += 020 : $permission; // g+w
367
-            $permission = !($permission & 0x0004) ? $permission += 04 : $permission;  // o+r
368
-            $permission = !($permission & 0x0002) ? $permission += 02 : $permission;  // o+w
364
+            $permission = !($permission&0x0020) ? $permission += 040 : $permission; // g+r
365
+            $permission = !($permission&0x0010) ? $permission += 020 : $permission; // g+w
366
+            $permission = !($permission&0x0004) ? $permission += 04 : $permission; // o+r
367
+            $permission = !($permission&0x0002) ? $permission += 02 : $permission; // o+w
369 368
             $result = chmod($realPath, $permission);
370 369
             if ($verbose) {
371 370
                 if ($result) {
@@ -396,13 +395,13 @@  discard block
 block discarded – undo
396 395
 
397 396
 function getConfig()
398 397
 {
399
-    $config = array (
398
+    $config = array(
400 399
         'auth_magic' => getenv('AUTH_MAGIC'),
401 400
         'password_hash_algos' => 'sha256',
402 401
         'shop_name' => getenv('SHOP_NAME'),
403 402
         'force_ssl' => NULL,
404 403
         'admin_allow_host' =>
405
-        array (
404
+        array(
406 405
         ),
407 406
         'cookie_lifetime' => 0,
408 407
         'locale' => 'ja',
@@ -414,9 +413,9 @@  discard block
 block discarded – undo
414 413
 
415 414
 function getDatabaseConfig($database_driver)
416 415
 {
417
-    $database = array (
416
+    $database = array(
418 417
         'database' =>
419
-        array (
418
+        array(
420 419
             'driver' => $database_driver,
421 420
         )
422 421
     );
@@ -443,9 +442,9 @@  discard block
 block discarded – undo
443 442
 
444 443
 function getMailConfig()
445 444
 {
446
-    $mail = array (
445
+    $mail = array(
447 446
         'mail' =>
448
-        array (
447
+        array(
449 448
             'transport' => getenv('MAIL_BACKEND'),
450 449
             'host' => getenv('MAIL_HOST'),
451 450
             'port' => getenv('MAIL_PORT'),
Please login to merge, or discard this patch.
src/Eccube/Log/Monolog/Helper/LogHelper.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -100,7 +100,7 @@
 block discarded – undo
100 100
         $webProcessor = new EccubeWebProcessor();
101 101
         $uidProcessor = new UidProcessor(8);
102 102
 
103
-        $FingerCrossedHandler->pushProcessor(function ($record) use ($app, $uidProcessor, $webProcessor) {
103
+        $FingerCrossedHandler->pushProcessor(function($record) use ($app, $uidProcessor, $webProcessor) {
104 104
             // ログフォーマットに出力する値を独自に設定
105 105
 
106 106
             $record['level_name'] = sprintf("%-5s", $record['level_name']);
Please login to merge, or discard this patch.
src/Eccube/ServiceProvider/LogServiceProvider.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -21,17 +21,17 @@  discard block
 block discarded – undo
21 21
         $app->register(new \Silex\Provider\MonologServiceProvider());
22 22
 
23 23
         // Log
24
-        $app['eccube.logger'] = $app->share(function ($app) {
24
+        $app['eccube.logger'] = $app->share(function($app) {
25 25
             return new Logger($app);
26 26
         });
27 27
 
28 28
         // ヘルパー作成
29
-        $app['eccube.monolog.helper'] = $app->share(function ($app) {
29
+        $app['eccube.monolog.helper'] = $app->share(function($app) {
30 30
             return new LogHelper($app);
31 31
         });
32 32
 
33 33
         // ログクラス作成ファクトリー
34
-        $app['eccube.monolog.factory'] = $app->protect(function (array $channelValues) use ($app) {
34
+        $app['eccube.monolog.factory'] = $app->protect(function(array $channelValues) use ($app) {
35 35
 
36 36
             $log = new $app['monolog.logger.class']($channelValues['name']);
37 37
 
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
         // monologの設定は除外
47 47
         unset($channels['monolog']);
48 48
         foreach ($channels as $channel => $channelValues) {
49
-            $app['monolog.logger.'.$channel] = $app->share(function ($app) use ($channelValues) {
49
+            $app['monolog.logger.'.$channel] = $app->share(function($app) use ($channelValues) {
50 50
                 return $app['eccube.monolog.factory']($channelValues);
51 51
             });
52 52
         }
@@ -54,15 +54,15 @@  discard block
 block discarded – undo
54 54
         // MonologServiceProviderで定義されているmonolog.handlerの置換
55 55
         $channelValues = $app['config']['log']['channel']['monolog'];
56 56
         $app['monolog.name'] = $channelValues['name'];
57
-        $app['monolog.handler'] = $app->share(function ($app) use ($channelValues) {
57
+        $app['monolog.handler'] = $app->share(function($app) use ($channelValues) {
58 58
             return $app['eccube.monolog.helper']->getHandler($channelValues);
59 59
         });
60 60
 
61
-        $app['eccube.monolog.listener'] = $app->share(function () use ($app) {
61
+        $app['eccube.monolog.listener'] = $app->share(function() use ($app) {
62 62
             return new LogListener($app['eccube.logger']);
63 63
         });
64 64
 
65
-        $app['listener.requestdump'] = $app->share(function ($app) {
65
+        $app['listener.requestdump'] = $app->share(function($app) {
66 66
             return new \Eccube\EventListener\RequestDumpListener($app);
67 67
         });
68 68
     }
Please login to merge, or discard this patch.
src/Eccube/Command/ConfigCommand.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -91,7 +91,7 @@
 block discarded – undo
91 91
             }
92 92
         }
93 93
 
94
-        $recursive = function ($config, $space = '    ') use (&$recursive, $output) {
94
+        $recursive = function($config, $space = '    ') use (&$recursive, $output) {
95 95
             foreach ($config as $key => $item) {
96 96
                 if (is_array($item)) {
97 97
                     $space = '    ';
Please login to merge, or discard this patch.