Failed Conditions
Push — 3.0 ( 1e5239 )
by Kiyotaka
38:11
created
src/Eccube/Controller/Admin/Content/FileController.php 2 patches
Doc Comments   +11 added lines patch added patch discarded remove patch
@@ -230,6 +230,10 @@  discard block
 block discarded – undo
230 230
         return $str;
231 231
     }
232 232
 
233
+    /**
234
+     * @param string $topDir
235
+     * @param Request $request
236
+     */
233 237
     private function getTree($topDir, $request)
234 238
     {
235 239
         $finder = Finder::create()->in($topDir)
@@ -267,6 +271,10 @@  discard block
 block discarded – undo
267 271
         return $tree;
268 272
     }
269 273
 
274
+    /**
275
+     * @param Application $app
276
+     * @param string $nowDir
277
+     */
270 278
     private function getFileList($app, $nowDir)
271 279
     {
272 280
         $topDir = $app['config']['user_data_realdir'];
@@ -326,6 +334,9 @@  discard block
 block discarded – undo
326 334
         return (strpos($targetDir, $topDir) === 0);
327 335
     }
328 336
 
337
+    /**
338
+     * @return string
339
+     */
329 340
     private function convertStrFromServer($target)
330 341
     {
331 342
         if ($this->encode == self::SJIS) {
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
     private $error = null;
40 40
     private $encode = '';
41 41
 
42
-    public function __construct(){
42
+    public function __construct() {
43 43
         $this->encode = self::UTF;
44 44
         if ('\\' === DIRECTORY_SEPARATOR) {
45 45
             $this->encode = self::SJIS;
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
         $arrFileList = $this->getFileList($app, $nowDir);
83 83
 
84 84
         $javascript = $this->getJsArrayList($tree);
85
-        $onload = "eccube.fileManager.viewFileTree('tree', arrTree, '" . $nowDir . "', 'tree_select_file', 'tree_status', 'move');";
85
+        $onload = "eccube.fileManager.viewFileTree('tree', arrTree, '".$nowDir."', 'tree_select_file', 'tree_status', 'move');";
86 86
 
87 87
         return $app->render('Content/file.twig', array(
88 88
             'form' => $form->createView(),
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
                 $nowDir = $this->checkDir($request->get('now_dir'), $topDir)
140 140
                     ? $this->normalizePath($request->get('now_dir'))
141 141
                     : $topDir;
142
-                $fs->mkdir($nowDir . '/' . $filename);
142
+                $fs->mkdir($nowDir.'/'.$filename);
143 143
             }
144 144
         }
145 145
 
@@ -219,7 +219,7 @@  discard block
 block discarded – undo
219 219
     {
220 220
         $str = "arrTree = new Array();\n";
221 221
         foreach ($tree as $key => $val) {
222
-            $str .= 'arrTree[' . $key . "] = new Array(" . $key . ", '" . $val['type'] . "', '" . $val['path'] . "', " . $val['rank'] . ',';
222
+            $str .= 'arrTree['.$key."] = new Array(".$key.", '".$val['type']."', '".$val['path']."', ".$val['rank'].',';
223 223
             if ($val['open']) {
224 224
                 $str .= "true);\n";
225 225
             } else {
@@ -270,7 +270,7 @@  discard block
 block discarded – undo
270 270
     private function getFileList($app, $nowDir)
271 271
     {
272 272
         $topDir = $app['config']['user_data_realdir'];
273
-        $filter = function (\SplFileInfo $file) use ($topDir) {
273
+        $filter = function(\SplFileInfo $file) use ($topDir) {
274 274
             $acceptPath = realpath($topDir);
275 275
             $targetPath = $file->getRealPath();
276 276
             return (strpos($targetPath, $acceptPath) === 0);
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Order/EditController.php 2 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -377,7 +377,7 @@  discard block
 block discarded – undo
377 377
     /**
378 378
      * フォームからの入直内容に基づいて、受注情報の再計算を行う
379 379
      *
380
-     * @param $app
380
+     * @param Application $app
381 381
      * @param $Order
382 382
      */
383 383
     protected function calculate($app, \Eccube\Entity\Order $Order)
@@ -471,7 +471,7 @@  discard block
 block discarded – undo
471 471
      * - 受注ステータスが入金済に設定された場合に入金日を更新
472 472
      *
473 473
      *
474
-     * @param $app
474
+     * @param Application $app
475 475
      * @param $TargetOrder
476 476
      * @param $OriginOrder
477 477
      */
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -333,7 +333,7 @@  discard block
 block discarded – undo
333 333
                 $session->set('eccube.admin.order.customer.search', $searchData);
334 334
                 $session->set('eccube.admin.order.customer.search.page_no', $page_no);
335 335
             } else {
336
-                $searchData = (array)$session->get('eccube.admin.order.customer.search');
336
+                $searchData = (array) $session->get('eccube.admin.order.customer.search');
337 337
                 if (is_null($page_no)) {
338 338
                     $page_no = intval($session->get('eccube.admin.order.customer.search.page_no'));
339 339
                 } else {
@@ -489,7 +489,7 @@  discard block
 block discarded – undo
489 489
                 $session->set('eccube.admin.order.product.search', $searchData);
490 490
                 $session->set('eccube.admin.order.product.search.page_no', $page_no);
491 491
             } else {
492
-                $searchData = (array)$session->get('eccube.admin.order.product.search');
492
+                $searchData = (array) $session->get('eccube.admin.order.product.search');
493 493
                 if (is_null($page_no)) {
494 494
                     $page_no = intval($session->get('eccube.admin.order.product.search.page_no'));
495 495
                 } else {
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Order/MailController.php 2 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -259,6 +259,9 @@
 block discarded – undo
259 259
     }
260 260
 
261 261
 
262
+    /**
263
+     * @param Application $app
264
+     */
262 265
     private function createBody($app, $header, $footer, $Order)
263 266
     {
264 267
         return $app->renderView('Mail/order.twig', array(
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -336,10 +336,10 @@
 block discarded – undo
336 336
                 }
337 337
             }
338 338
         } else {
339
-            $filter = function ($v) {
339
+            $filter = function($v) {
340 340
                 return preg_match('/^ids\d+$/', $v);
341 341
             };
342
-            $map = function ($v) {
342
+            $map = function($v) {
343 343
                 return preg_replace('/[^\d+]/', '', $v);
344 344
             };
345 345
             $keys = array_keys($request->query->all());
Please login to merge, or discard this patch.
src/Eccube/Controller/Install/InstallController.php 2 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -250,6 +250,9 @@
 block discarded – undo
250 250
     }
251 251
 
252 252
 
253
+    /**
254
+     * @param InstallApplication $app
255
+     */
253 256
     private function checkModules($app)
254 257
     {
255 258
         foreach ($this->required_modules as $module) {
Please login to merge, or discard this patch.
Spacing   +51 added lines, -51 removed lines patch added patch discarded remove patch
@@ -56,9 +56,9 @@  discard block
 block discarded – undo
56 56
 
57 57
     public function __construct()
58 58
     {
59
-        $this->config_path = __DIR__ . '/../../../../app/config/eccube';
60
-        $this->dist_path = __DIR__ . '/../../Resource/config';
61
-        $this->cache_path = __DIR__ . '/../../../../app/cache';
59
+        $this->config_path = __DIR__.'/../../../../app/config/eccube';
60
+        $this->dist_path = __DIR__.'/../../Resource/config';
61
+        $this->cache_path = __DIR__.'/../../../../app/cache';
62 62
     }
63 63
 
64 64
     private function isValid(Request $request, Form $form)
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
 
109 109
         return $app['twig']->render('step1.twig', array(
110 110
                 'form' => $form->createView(),
111
-                'publicPath' => '..' . RELATIVE_PUBLIC_DIR_PATH . '/',
111
+                'publicPath' => '..'.RELATIVE_PUBLIC_DIR_PATH.'/',
112 112
         ));
113 113
     }
114 114
 
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 
132 132
         return $app['twig']->render('step2.twig', array(
133 133
                 'protectedDirs' => $protectedDirs,
134
-                'publicPath' => '..' . RELATIVE_PUBLIC_DIR_PATH . '/',
134
+                'publicPath' => '..'.RELATIVE_PUBLIC_DIR_PATH.'/',
135 135
         ));
136 136
     }
137 137
 
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
 
146 146
         if (empty($sessionData['shop_name'])) {
147 147
 
148
-            $config_file = $this->config_path . '/config.yml';
148
+            $config_file = $this->config_path.'/config.yml';
149 149
             $fs = new Filesystem();
150 150
 
151 151
             if ($fs->exists($config_file)) {
@@ -159,11 +159,11 @@  discard block
 block discarded – undo
159 159
                 }
160 160
 
161 161
                 // セキュリティの設定
162
-                $config_file = $this->config_path . '/path.yml';
162
+                $config_file = $this->config_path.'/path.yml';
163 163
                 $config = Yaml::parse(file_get_contents($config_file));
164 164
                 $sessionData['admin_dir'] = $config['admin_route'];
165 165
 
166
-                $config_file = $this->config_path . '/config.yml';
166
+                $config_file = $this->config_path.'/config.yml';
167 167
                 $config = Yaml::parse(file_get_contents($config_file));
168 168
 
169 169
                 $allowHost = $config['admin_allow_host'];
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
173 173
                 $sessionData['admin_force_ssl'] = (bool) $config['force_ssl'];
174 174
 
175 175
                 // メール設定
176
-                $config_file = $this->config_path . '/mail.yml';
176
+                $config_file = $this->config_path.'/mail.yml';
177 177
                 $config = Yaml::parse(file_get_contents($config_file));
178 178
                 $mail = $config['mail'];
179 179
                 $sessionData['mail_backend'] = $mail['transport'];
@@ -196,7 +196,7 @@  discard block
 block discarded – undo
196 196
 
197 197
         return $app['twig']->render('step3.twig', array(
198 198
                 'form' => $form->createView(),
199
-                'publicPath' => '..' . RELATIVE_PUBLIC_DIR_PATH . '/',
199
+                'publicPath' => '..'.RELATIVE_PUBLIC_DIR_PATH.'/',
200 200
         ));
201 201
     }
202 202
 
@@ -211,7 +211,7 @@  discard block
 block discarded – undo
211 211
 
212 212
         if (empty($sessionData['database'])) {
213 213
 
214
-            $config_file = $this->config_path . '/database.yml';
214
+            $config_file = $this->config_path.'/database.yml';
215 215
             $fs = new Filesystem();
216 216
 
217 217
             if ($fs->exists($config_file)) {
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
239 239
 
240 240
         return $app['twig']->render('step4.twig', array(
241 241
                 'form' => $form->createView(),
242
-                'publicPath' => '..' . RELATIVE_PUBLIC_DIR_PATH . '/',
242
+                'publicPath' => '..'.RELATIVE_PUBLIC_DIR_PATH.'/',
243 243
         ));
244 244
     }
245 245
 
@@ -285,7 +285,7 @@  discard block
 block discarded – undo
285 285
                 $host = $request->getSchemeAndHttpHost();
286 286
                 $basePath = $request->getBasePath();
287 287
                 $params = array(
288
-                    'http_url' => $host . $basePath,
288
+                    'http_url' => $host.$basePath,
289 289
                     'shop_name' => $sessionData['shop_name'],
290 290
                 );
291 291
 
@@ -300,24 +300,24 @@  discard block
 block discarded – undo
300 300
 
301 301
         return $app['twig']->render('step5.twig', array(
302 302
                 'form' => $form->createView(),
303
-                'publicPath' => '..' . RELATIVE_PUBLIC_DIR_PATH . '/',
303
+                'publicPath' => '..'.RELATIVE_PUBLIC_DIR_PATH.'/',
304 304
         ));
305 305
     }
306 306
 
307 307
     //    インストール完了
308 308
     public function complete(InstallApplication $app, Request $request)
309 309
     {
310
-        $config_file = $this->config_path . '/path.yml';
310
+        $config_file = $this->config_path.'/path.yml';
311 311
         $config = Yaml::parse(file_get_contents($config_file));
312 312
 
313 313
         $host = $request->getSchemeAndHttpHost();
314 314
         $basePath = $request->getBasePath();
315 315
 
316
-        $adminUrl = $host . $basePath . '/' . $config['admin_dir'];
316
+        $adminUrl = $host.$basePath.'/'.$config['admin_dir'];
317 317
 
318 318
         return $app['twig']->render('complete.twig', array(
319 319
                 'admin_url' => $adminUrl,
320
-                'publicPath' => '..' . RELATIVE_PUBLIC_DIR_PATH . '/',
320
+                'publicPath' => '..'.RELATIVE_PUBLIC_DIR_PATH.'/',
321 321
         ));
322 322
     }
323 323
 
@@ -333,12 +333,12 @@  discard block
 block discarded – undo
333 333
     {
334 334
         foreach ($this->required_modules as $module) {
335 335
             if (!extension_loaded($module)) {
336
-                $app->addDanger('[必須] ' . $module . ' 拡張モジュールが有効になっていません。', 'install');
336
+                $app->addDanger('[必須] '.$module.' 拡張モジュールが有効になっていません。', 'install');
337 337
             }
338 338
         }
339 339
 
340 340
         if (!extension_loaded('pdo_mysql') && !extension_loaded('pdo_pgsql')) {
341
-            $app->addDanger('[必須] ' . 'pdo_pgsql又はpdo_mysql 拡張モジュールを有効にしてください。', 'install');
341
+            $app->addDanger('[必須] '.'pdo_pgsql又はpdo_mysql 拡張モジュールを有効にしてください。', 'install');
342 342
         }
343 343
 
344 344
         foreach ($this->recommended_module as $module) {
@@ -348,7 +348,7 @@  discard block
 block discarded – undo
348 348
                     //http://php.net/manual/en/migration71.deprecated.php
349 349
                     continue;
350 350
                 }
351
-                $app->addWarning('[推奨] ' . $module . ' 拡張モジュールが有効になっていません。', 'install');
351
+                $app->addWarning('[推奨] '.$module.' 拡張モジュールが有効になっていません。', 'install');
352 352
             }
353 353
         }
354 354
 
@@ -366,7 +366,7 @@  discard block
 block discarded – undo
366 366
             if (!function_exists('apache_get_modules')) {
367 367
                 $app->addWarning('mod_rewrite が有効になっているか不明です。', 'install');
368 368
             } elseif (!in_array('mod_rewrite', apache_get_modules())) {
369
-                $app->addDanger('[必須] ' . 'mod_rewriteを有効にしてください。', 'install');
369
+                $app->addDanger('[必須] '.'mod_rewriteを有効にしてください。', 'install');
370 370
             }
371 371
         } elseif (isset($_SERVER['SERVER_SOFTWARE']) && strpos('Microsoft-IIS', $_SERVER['SERVER_SOFTWARE']) !== false) {
372 372
             // iis
@@ -377,7 +377,7 @@  discard block
 block discarded – undo
377 377
 
378 378
     private function setPDO()
379 379
     {
380
-        $config_file = $this->config_path . '/database.yml';
380
+        $config_file = $this->config_path.'/database.yml';
381 381
         $config = Yaml::parse(file_get_contents($config_file));
382 382
 
383 383
         try {
@@ -411,7 +411,7 @@  discard block
 block discarded – undo
411 411
      */
412 412
     private function getEntityManager()
413 413
     {
414
-        $config_file = $this->config_path . '/database.yml';
414
+        $config_file = $this->config_path.'/database.yml';
415 415
         $database = Yaml::parse(file_get_contents($config_file));
416 416
 
417 417
         $this->app->register(new \Silex\Provider\DoctrineServiceProvider(), array(
@@ -419,15 +419,15 @@  discard block
 block discarded – undo
419 419
         ));
420 420
 
421 421
         $this->app->register(new \Dflydev\Silex\Provider\DoctrineOrm\DoctrineOrmServiceProvider(), array(
422
-            'orm.proxies_dir' => __DIR__ . '/../../app/cache/doctrine',
422
+            'orm.proxies_dir' => __DIR__.'/../../app/cache/doctrine',
423 423
             'orm.em.options' => array(
424 424
                 'mappings' => array(
425 425
                     array(
426 426
                         'type' => 'yml',
427 427
                         'namespace' => 'Eccube\Entity',
428 428
                         'path' => array(
429
-                            __DIR__ . '/../../Resource/doctrine',
430
-                            __DIR__ . '/../../Resource/doctrine/master',
429
+                            __DIR__.'/../../Resource/doctrine',
430
+                            __DIR__.'/../../Resource/doctrine/master',
431 431
                         ),
432 432
                     ),
433 433
                 ),
@@ -454,11 +454,11 @@  discard block
 block discarded – undo
454 454
     {
455 455
         $this->resetNatTimer();
456 456
 
457
-        $config_file = $this->config_path . '/database.yml';
457
+        $config_file = $this->config_path.'/database.yml';
458 458
         $database = Yaml::parse(file_get_contents($config_file));
459 459
         $config['database'] = $database['database'];
460 460
 
461
-        $config_file = $this->config_path . '/config.yml';
461
+        $config_file = $this->config_path.'/config.yml';
462 462
         $baseConfig = Yaml::parse(file_get_contents($config_file));
463 463
         $config['config'] = $baseConfig;
464 464
 
@@ -514,11 +514,11 @@  discard block
 block discarded – undo
514 514
     {
515 515
         $this->resetNatTimer();
516 516
 
517
-        $config_file = $this->config_path . '/database.yml';
517
+        $config_file = $this->config_path.'/database.yml';
518 518
         $database = Yaml::parse(file_get_contents($config_file));
519 519
         $config['database'] = $database['database'];
520 520
 
521
-        $config_file = $this->config_path . '/config.yml';
521
+        $config_file = $this->config_path.'/config.yml';
522 522
         $baseConfig = Yaml::parse(file_get_contents($config_file));
523 523
         $config['config'] = $baseConfig;
524 524
 
@@ -581,7 +581,7 @@  discard block
 block discarded – undo
581 581
         $config = new Configuration($app['db']);
582 582
         $config->setMigrationsNamespace('DoctrineMigrations');
583 583
 
584
-        $migrationDir = __DIR__ . '/../../Resource/doctrine/migration';
584
+        $migrationDir = __DIR__.'/../../Resource/doctrine/migration';
585 585
         $config->setMigrationsDirectory($migrationDir);
586 586
         $config->registerMigrationsFromDirectory($migrationDir);
587 587
 
@@ -613,7 +613,7 @@  discard block
 block discarded – undo
613 613
     private function getProtectedDirs()
614 614
     {
615 615
         $protectedDirs = array();
616
-        $base = __DIR__ . '/../../../..';
616
+        $base = __DIR__.'/../../../..';
617 617
         $dirs = array(
618 618
             '/html',
619 619
             '/app',
@@ -626,7 +626,7 @@  discard block
 block discarded – undo
626 626
         );
627 627
 
628 628
         foreach ($dirs as $dir) {
629
-            if (!is_writable($base . $dir)) {
629
+            if (!is_writable($base.$dir)) {
630 630
                 $protectedDirs[] = $dir;
631 631
             }
632 632
         }
@@ -637,7 +637,7 @@  discard block
 block discarded – undo
637 637
     private function createConfigYamlFile($data, $auth = true)
638 638
     {
639 639
         $fs = new Filesystem();
640
-        $config_file = $this->config_path . '/config.yml';
640
+        $config_file = $this->config_path.'/config.yml';
641 641
 
642 642
         if ($fs->exists($config_file)) {
643 643
             $config = Yaml::parse(file_get_contents($config_file));
@@ -666,7 +666,7 @@  discard block
 block discarded – undo
666 666
 
667 667
         $fs = new Filesystem();
668 668
         $content = str_replace(
669
-            $target, $replace, file_get_contents($this->dist_path . '/config.yml.dist')
669
+            $target, $replace, file_get_contents($this->dist_path.'/config.yml.dist')
670 670
         );
671 671
         $fs->dumpFile($config_file, $content);
672 672
 
@@ -680,7 +680,7 @@  discard block
 block discarded – undo
680 680
 
681 681
     private function addInstallStatus()
682 682
     {
683
-        $config_file = $this->config_path . '/config.yml';
683
+        $config_file = $this->config_path.'/config.yml';
684 684
         $config = Yaml::parse(file_get_contents($config_file));
685 685
         $config['eccube_install'] = 1;
686 686
         $yml = Yaml::dump($config);
@@ -692,7 +692,7 @@  discard block
 block discarded – undo
692 692
     private function createDatabaseYamlFile($data)
693 693
     {
694 694
         $fs = new Filesystem();
695
-        $config_file = $this->config_path . '/database.yml';
695
+        $config_file = $this->config_path.'/database.yml';
696 696
         if ($fs->exists($config_file)) {
697 697
             $fs->remove($config_file);
698 698
         }
@@ -725,14 +725,14 @@  discard block
 block discarded – undo
725 725
 
726 726
             $fs = new Filesystem();
727 727
             $content = str_replace(
728
-                $target, $replace, file_get_contents($this->dist_path . '/database.yml.dist')
728
+                $target, $replace, file_get_contents($this->dist_path.'/database.yml.dist')
729 729
             );
730 730
         } else {
731 731
             $content = Yaml::dump(
732 732
                     array(
733 733
                         'database' => array(
734 734
                             'driver' => 'pdo_sqlite',
735
-                            'path' => realpath($this->config_path . '/eccube.db')
735
+                            'path' => realpath($this->config_path.'/eccube.db')
736 736
                         )
737 737
                     )
738 738
             );
@@ -745,7 +745,7 @@  discard block
 block discarded – undo
745 745
     private function createMailYamlFile($data)
746 746
     {
747 747
         $fs = new Filesystem();
748
-        $config_file = $this->config_path . '/mail.yml';
748
+        $config_file = $this->config_path.'/mail.yml';
749 749
         if ($fs->exists($config_file)) {
750 750
             $fs->remove($config_file);
751 751
         }
@@ -760,7 +760,7 @@  discard block
 block discarded – undo
760 760
 
761 761
         $fs = new Filesystem();
762 762
         $content = str_replace(
763
-            $target, $replace, file_get_contents($this->dist_path . '/mail.yml.dist')
763
+            $target, $replace, file_get_contents($this->dist_path.'/mail.yml.dist')
764 764
         );
765 765
         $fs->dumpFile($config_file, $content);
766 766
 
@@ -770,7 +770,7 @@  discard block
 block discarded – undo
770 770
     private function createPathYamlFile($data, Request $request)
771 771
     {
772 772
         $fs = new Filesystem();
773
-        $config_file = $this->config_path . '/path.yml';
773
+        $config_file = $this->config_path.'/path.yml';
774 774
         if ($fs->exists($config_file)) {
775 775
             $fs->remove($config_file);
776 776
         }
@@ -778,16 +778,16 @@  discard block
 block discarded – undo
778 778
         $ADMIN_ROUTE = $data['admin_dir'];
779 779
         $TEMPLATE_CODE = 'default';
780 780
         $USER_DATA_ROUTE = 'user_data';
781
-        $ROOT_DIR = realpath(__DIR__ . '/../../../../');
781
+        $ROOT_DIR = realpath(__DIR__.'/../../../../');
782 782
         $ROOT_URLPATH = $request->getBasePath();
783
-        $ROOT_PUBLIC_URLPATH = $ROOT_URLPATH . RELATIVE_PUBLIC_DIR_PATH;
783
+        $ROOT_PUBLIC_URLPATH = $ROOT_URLPATH.RELATIVE_PUBLIC_DIR_PATH;
784 784
 
785 785
         $target = array('${ADMIN_ROUTE}', '${TEMPLATE_CODE}', '${USER_DATA_ROUTE}', '${ROOT_DIR}', '${ROOT_URLPATH}', '${ROOT_PUBLIC_URLPATH}');
786 786
         $replace = array($ADMIN_ROUTE, $TEMPLATE_CODE, $USER_DATA_ROUTE, $ROOT_DIR, $ROOT_URLPATH, $ROOT_PUBLIC_URLPATH);
787 787
 
788 788
         $fs = new Filesystem();
789 789
         $content = str_replace(
790
-            $target, $replace, file_get_contents($this->dist_path . '/path.yml.dist')
790
+            $target, $replace, file_get_contents($this->dist_path.'/path.yml.dist')
791 791
         );
792 792
         $fs->dumpFile($config_file, $content);
793 793
 
@@ -796,7 +796,7 @@  discard block
 block discarded – undo
796 796
 
797 797
     private function sendAppData($params)
798 798
     {
799
-        $config_file = $this->config_path . '/database.yml';
799
+        $config_file = $this->config_path.'/database.yml';
800 800
         $db_config = Yaml::parse(file_get_contents($config_file));
801 801
 
802 802
         $this->setPDO();
@@ -808,7 +808,7 @@  discard block
 block discarded – undo
808 808
         }
809 809
 
810 810
         if ($db_config['database']['driver'] === 'pdo_mysql') {
811
-            $db_ver = 'MySQL:' . $version;
811
+            $db_ver = 'MySQL:'.$version;
812 812
         } else {
813 813
             $db_ver = $version;
814 814
         }
@@ -826,7 +826,7 @@  discard block
 block discarded – undo
826 826
 
827 827
         $header = array(
828 828
             'Content-Type: application/x-www-form-urlencoded',
829
-            'Content-Length: ' . strlen($data),
829
+            'Content-Length: '.strlen($data),
830 830
         );
831 831
         $context = stream_context_create(
832 832
             array(
@@ -853,7 +853,7 @@  discard block
 block discarded – undo
853 853
     public function migration(InstallApplication $app, Request $request)
854 854
     {
855 855
         return $app['twig']->render('migration.twig', array(
856
-                'publicPath' => '..' . RELATIVE_PUBLIC_DIR_PATH . '/',
856
+                'publicPath' => '..'.RELATIVE_PUBLIC_DIR_PATH.'/',
857 857
         ));
858 858
     }
859 859
 
@@ -882,7 +882,7 @@  discard block
 block discarded – undo
882 882
             return $app['twig']->render('migration_plugin.twig', array(
883 883
                     'Plugins' => $Plugins,
884 884
                     'version' => Constant::VERSION,
885
-                    'publicPath' => '..' . RELATIVE_PUBLIC_DIR_PATH . '/',
885
+                    'publicPath' => '..'.RELATIVE_PUBLIC_DIR_PATH.'/',
886 886
             ));
887 887
         }
888 888
     }
@@ -905,7 +905,7 @@  discard block
 block discarded – undo
905 905
         \Eccube\Util\Cache::clear($config_app, true);
906 906
 
907 907
         return $app['twig']->render('migration_end.twig', array(
908
-                'publicPath' => '..' . RELATIVE_PUBLIC_DIR_PATH . '/',
908
+                'publicPath' => '..'.RELATIVE_PUBLIC_DIR_PATH.'/',
909 909
         ));
910 910
     }
911 911
 }
Please login to merge, or discard this patch.
src/Eccube/Repository/MemberRepository.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -130,7 +130,7 @@
 block discarded – undo
130 130
     /**
131 131
      * @param  \Eccube\Entity\Member $Member
132 132
      *
133
-     * @return void
133
+     * @return boolean
134 134
      */
135 135
     public function up(\Eccube\Entity\Member $Member)
136 136
     {
Please login to merge, or discard this patch.
src/Eccube/Repository/TaxRuleRepository.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -65,7 +65,7 @@
 block discarded – undo
65 65
      * @param  int|null|\Eccube\Entity\ProductClass   $ProductClass 商品規格
66 66
      * @param  int|null|\Eccube\Entity\Master\Pref    $Pref         都道府県
67 67
      * @param  int|null|\Eccube\Entity\Master\Country $Country      国
68
-     * @return \Eccube\Entity\TaxRule                 税設定情報
68
+     * @return integer                 税設定情報
69 69
      *
70 70
      * @throws NoResultException
71 71
      */
Please login to merge, or discard this patch.
src/Eccube/Service/CartService.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -201,7 +201,7 @@
 block discarded – undo
201 201
     }
202 202
 
203 203
     /**
204
-     * @param  \Eccube\Entity\ProductClass|integer $ProductClass
204
+     * @param  string $ProductClass
205 205
      * @param  integer $quantity
206 206
      * @return \Eccube\Service\CartService
207 207
      * @throws CartException
Please login to merge, or discard this patch.
src/Eccube/Service/PluginService.php 2 patches
Doc Comments   +21 added lines patch added patch discarded remove patch
@@ -36,6 +36,9 @@  discard block
 block discarded – undo
36 36
     const EVENT_YML = 'event.yml';
37 37
     private $app;
38 38
 
39
+    /**
40
+     * @param \Silex\Application $app
41
+     */
39 42
     public function __construct($app)
40 43
     {
41 44
         $this->app = $app;
@@ -98,6 +101,9 @@  discard block
 block discarded – undo
98 101
         }
99 102
     }
100 103
 
104
+    /**
105
+     * @param string $dir
106
+     */
101 107
     public function unpackPluginArchive($archive, $dir)
102 108
     {
103 109
         $extension = pathinfo($archive, PATHINFO_EXTENSION);
@@ -116,6 +122,9 @@  discard block
 block discarded – undo
116 122
         }
117 123
     }
118 124
 
125
+    /**
126
+     * @param string $dir
127
+     */
119 128
     public function checkPluginArchiveContent($dir)
120 129
     {
121 130
         $meta = $this->readYml($dir.'/config.yml');
@@ -138,6 +147,9 @@  discard block
 block discarded – undo
138 147
         }
139 148
     }
140 149
 
150
+    /**
151
+     * @param string $yml
152
+     */
141 153
     public function readYml($yml)
142 154
     {
143 155
         return Yaml::Parse($yml);
@@ -151,6 +163,9 @@  discard block
 block discarded – undo
151 163
         // ディレクトリ名などに使われれるので厳しめ
152 164
     }
153 165
 
166
+    /**
167
+     * @param string $path
168
+     */
154 169
     public function deleteFile($path)
155 170
     {
156 171
         $f = new Filesystem();
@@ -170,6 +185,9 @@  discard block
 block discarded – undo
170 185
         return $this->app['config']['plugin_realdir'].'/'.$name;
171 186
     }
172 187
 
188
+    /**
189
+     * @param string $d
190
+     */
173 191
     public function createPluginDir($d)
174 192
     {
175 193
         $b = mkdir($d);
@@ -229,6 +247,9 @@  discard block
 block discarded – undo
229 247
         return $p;
230 248
     }
231 249
 
250
+    /**
251
+     * @param string $method
252
+     */
232 253
     public function callPluginManagerMethod($meta, $method)
233 254
     {
234 255
         $class = '\\Plugin'.'\\'.$meta['code'].'\\'.'PluginManager';
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -124,7 +124,7 @@
 block discarded – undo
124 124
             if (!empty($config_cache)) {
125 125
                 $meta = $config_cache;
126 126
             } else {
127
-                $meta = $this->readYml($dir . '/config.yml');
127
+                $meta = $this->readYml($dir.'/config.yml');
128 128
             }
129 129
         } catch (\Symfony\Component\Yaml\Exception\ParseException $e) {
130 130
             throw new PluginException($e->getMessage(), $e->getCode(), $e);
Please login to merge, or discard this patch.
src/Eccube/Service/ShoppingService.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -137,7 +137,7 @@
 block discarded – undo
137 137
      * 仮受注情報作成
138 138
      *
139 139
      * @param $Customer
140
-     * @param $preOrderId
140
+     * @param string $preOrderId
141 141
      * @return mixed
142 142
      * @throws \Doctrine\ORM\NoResultException
143 143
      * @throws \Doctrine\ORM\NonUniqueResultException
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -920,7 +920,7 @@
 block discarded – undo
920 920
 
921 921
         // 配送日数が設定されている
922 922
         if ($deliveryDateFlag) {
923
-            $period = new \DatePeriod (
923
+            $period = new \DatePeriod(
924 924
                 new \DateTime($minDate.' day'),
925 925
                 new \DateInterval('P1D'),
926 926
                 new \DateTime($minDate + $this->app['config']['deliv_date_end_max'].' day')
Please login to merge, or discard this patch.