Completed
Pull Request — master (#1999)
by chihiro
69:58
created
src/Eccube/Controller/Admin/Customer/CustomerEditController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -88,7 +88,7 @@
 block discarded – undo
88 88
                         ->setCompanyName($Customer->getCompanyName())
89 89
                         ->setZip01($Customer->getZip01())
90 90
                         ->setZip02($Customer->getZip02())
91
-                        ->setZipcode($Customer->getZip01() . $Customer->getZip02())
91
+                        ->setZipcode($Customer->getZip01().$Customer->getZip02())
92 92
                         ->setPref($Customer->getPref())
93 93
                         ->setAddr01($Customer->getAddr01())
94 94
                         ->setAddr02($Customer->getAddr02())
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Product/ProductClassController.php 3 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -138,7 +138,7 @@
 block discarded – undo
138 138
                                 'allow_add' => true,
139 139
                                 'allow_delete' => true,
140 140
                                 'data' => $ProductClasses,
141
-                             ));
141
+                                ));
142 142
 
143 143
                         $event = new EventArgs(
144 144
                             array(
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -106,7 +106,7 @@
 block discarded – undo
106 106
                     $class2Valied = $this->isValiedCategory($ClassName2);
107 107
 
108 108
                     // 規格が選択されていないか、選択された状態で分類が保有されていれば、画面表示
109
-                    if($class1Valied && $class2Valied){
109
+                    if ($class1Valied && $class2Valied) {
110 110
                         $hasClassCategoryFlg = true;
111 111
                     }
112 112
 
Please login to merge, or discard this patch.
Doc Comments   +5 added lines patch added patch discarded remove patch
@@ -529,6 +529,9 @@  discard block
 block discarded – undo
529 529
     /**
530 530
      * 登録、更新時のエラー画面表示
531 531
      *
532
+     * @param Application $app
533
+     * @param boolean $not_product_class
534
+     * @param \Symfony\Component\Form\FormInterface $classForm
532 535
      */
533 536
     protected function render($app, $Product, $ProductClass, $not_product_class, $classForm, $error = null)
534 537
     {
@@ -580,6 +583,7 @@  discard block
 block discarded – undo
580 583
 
581 584
     /**
582 585
      * 規格1と規格2を組み合わせた商品規格を作成
586
+     * @param Application $app
583 587
      */
584 588
     private function createProductClasses($app, Product $Product, ClassName $ClassName1 = null, ClassName $ClassName2 = null)
585 589
     {
@@ -667,6 +671,7 @@  discard block
 block discarded – undo
667 671
      *
668 672
      * @param $productClassDest コピー先となる商品規格
669 673
      * @param $productClassOrig コピー元となる商品規格
674
+     * @param Application $app
670 675
      */
671 676
     private function setDefualtProductClass($app, $productClassDest, $productClassOrig) {
672 677
         $productClassDest->setDeliveryDate($productClassOrig->getDeliveryDate());
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Content/BlockController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -113,13 +113,13 @@  discard block
 block discarded – undo
113 113
                 // ファイル生成・更新
114 114
                 $tplDir = $app['config']['block_realdir'];
115 115
 
116
-                $filePath = $tplDir . '/' . $Block->getFileName() . '.twig';
116
+                $filePath = $tplDir.'/'.$Block->getFileName().'.twig';
117 117
 
118 118
                 $fs = new Filesystem();
119 119
                 $fs->dumpFile($filePath, $form->get('block_html')->getData());
120 120
                 // 更新でファイル名を変更した場合、以前のファイルを削除
121 121
                 if ($Block->getFileName() != $previous_filename && !is_null($previous_filename)) {
122
-                    $oldFilePath = $tplDir . '/' . $previous_filename . '.twig';
122
+                    $oldFilePath = $tplDir.'/'.$previous_filename.'.twig';
123 123
                     if ($fs->exists($oldFilePath)) {
124 124
                         $fs->remove($oldFilePath);
125 125
                     }
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
         // テンプレートが変更されていた場合、DBからはブロック削除されるがtwigファイルは残る
172 172
         if ($Block->getDeletableFlg() > 0) {
173 173
             $tplDir = $app['config']['block_realdir'];
174
-            $file = $tplDir . '/' . $Block->getFileName() . '.twig';
174
+            $file = $tplDir.'/'.$Block->getFileName().'.twig';
175 175
             $fs = new Filesystem();
176 176
             if ($fs->exists($file)) {
177 177
                 $fs->remove($file);
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Setting/System/SecurityController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -102,7 +102,7 @@
 block discarded – undo
102 102
             if (count($allowHost) > 0) {
103 103
                 $form->get('admin_allow_host')->setData(Str::convertLineFeed(implode("\n", $allowHost)));
104 104
             }
105
-            $form->get('force_ssl')->setData((bool)$app['config']['force_ssl']);
105
+            $form->get('force_ssl')->setData((bool) $app['config']['force_ssl']);
106 106
         }
107 107
 
108 108
         return $app->render('Setting/System/security.twig', array(
Please login to merge, or discard this patch.
src/Eccube/Resource/doctrine/migration/Version20160413151321.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@
 block discarded – undo
21 21
 
22 22
         // path.ymlの更新
23 23
         $app = Application::getInstance();
24
-        $file = $app['config']['root_dir'] . '/app/config/eccube/path.yml';
24
+        $file = $app['config']['root_dir'].'/app/config/eccube/path.yml';
25 25
         $config = Yaml::parse(file_get_contents($file));
26 26
 
27 27
         if (!array_key_exists('public_path', $config)) {
Please login to merge, or discard this patch.
src/Eccube/ServiceProvider/DebugServiceProvider.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
 {
67 67
     public function register(Application $app)
68 68
     {
69
-        $app['var_dumper.cloner'] = $app->share(function ($app) {
69
+        $app['var_dumper.cloner'] = $app->share(function($app) {
70 70
             $cloner = new VarCloner();
71 71
 
72 72
             if (isset($app['debug.max_items'])) {
@@ -80,23 +80,23 @@  discard block
 block discarded – undo
80 80
             return $cloner;
81 81
         });
82 82
 
83
-        $app['data_collector.templates'] = $app->share($app->extend('data_collector.templates', function ($templates) {
83
+        $app['data_collector.templates'] = $app->share($app->extend('data_collector.templates', function($templates) {
84 84
             return array_merge($templates, array(array('dump', '@Debug/Profiler/dump.html.twig')));
85 85
         }));
86 86
 
87
-        $app['data_collector.dump'] = $app->share(function ($app) {
87
+        $app['data_collector.dump'] = $app->share(function($app) {
88 88
             return new DumpDataCollector($app['stopwatch'], $app['code.file_link_format']);
89 89
         });
90 90
 
91
-        $app['data_collectors'] = $app->share($app->extend('data_collectors', function ($collectors, $app) {
92
-            $collectors['dump'] = $app->share(function ($app) {
91
+        $app['data_collectors'] = $app->share($app->extend('data_collectors', function($collectors, $app) {
92
+            $collectors['dump'] = $app->share(function($app) {
93 93
                 return $app['data_collector.dump'];
94 94
             });
95 95
 
96 96
             return $collectors;
97 97
         }));
98 98
 
99
-        $app['twig'] = $app->share($app->extend('twig', function ($twig, $app) {
99
+        $app['twig'] = $app->share($app->extend('twig', function($twig, $app) {
100 100
             if (class_exists('\Symfony\Bridge\Twig\Extension\DumpExtension')) {
101 101
                 $twig->addExtension(new DumpExtension($app['var_dumper.cloner']));
102 102
             }
@@ -104,13 +104,13 @@  discard block
 block discarded – undo
104 104
             return $twig;
105 105
         }));
106 106
 
107
-        $app['twig.loader.filesystem'] = $app->share($app->extend('twig.loader.filesystem', function ($loader, $app) {
107
+        $app['twig.loader.filesystem'] = $app->share($app->extend('twig.loader.filesystem', function($loader, $app) {
108 108
             $loader->addPath($app['debug.templates_path'], 'Debug');
109 109
 
110 110
             return $loader;
111 111
         }));
112 112
 
113
-        $app['debug.templates_path'] = function () {
113
+        $app['debug.templates_path'] = function() {
114 114
             $r = new \ReflectionClass('Symfony\Bundle\DebugBundle\DependencyInjection\Configuration');
115 115
 
116 116
             return dirname(dirname($r->getFileName())).'/Resources/views';
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
         // This code is here to lazy load the dump stack. This default
123 123
         // configuration for CLI mode is overridden in HTTP mode on
124 124
         // 'kernel.request' event
125
-        VarDumper::setHandler(function ($var) use ($app) {
125
+        VarDumper::setHandler(function($var) use ($app) {
126 126
             $dumper = new CliDumper();
127 127
             $dumper->dump($app['var_dumper.cloner']->cloneVar($var));
128 128
         });
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Admin/SearchProductType.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -27,7 +27,6 @@
 block discarded – undo
27 27
 use Symfony\Component\Form\AbstractType;
28 28
 use Symfony\Component\Form\Extension\Core\Type;
29 29
 use Symfony\Component\Form\FormBuilderInterface;
30
-use Symfony\Component\Validator\Constraints as Assert;
31 30
 
32 31
 class SearchProductType extends AbstractType
33 32
 {
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Content/CacheController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -58,7 +58,7 @@
 block discarded – undo
58 58
                 }
59 59
                 if ($dir == 'doctrine') {
60 60
                     // doctrineが指定された場合は, cache driver経由で削除.
61
-                    $config =  $app['orm.em']->getConfiguration();
61
+                    $config = $app['orm.em']->getConfiguration();
62 62
                     $this->deleteDoctrineCache($config->getMetadataCacheImpl());
63 63
                     $this->deleteDoctrineCache($config->getQueryCacheImpl());
64 64
                     $this->deleteDoctrineCache($config->getResultCacheImpl());
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Admin/ChangePasswordType.php 2 patches
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.
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -25,8 +25,6 @@
 block discarded – undo
25 25
 
26 26
 use Symfony\Component\Form\AbstractType;
27 27
 use Symfony\Component\Form\FormBuilderInterface;
28
-use Symfony\Component\Form\FormError;
29
-use Symfony\Component\Form\FormEvents;
30 28
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
31 29
 use Symfony\Component\Security\Core\Validator\Constraints\UserPassword;
32 30
 use Symfony\Component\Validator\Constraints as Assert;
Please login to merge, or discard this patch.