Completed
Pull Request — master (#1504)
by Kentaro
60:07 queued 04:12
created
src/Eccube/Controller/Admin/Product/ClassCategoryController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -95,7 +95,7 @@
 block discarded – undo
95 95
         $num = $app['eccube.repository.product_class']->createQueryBuilder('pc')
96 96
             ->select('count(pc.id)')
97 97
             ->where('pc.ClassCategory1 = :id OR pc.ClassCategory2 = :id')
98
-            ->setParameter('id',$id)
98
+            ->setParameter('id', $id)
99 99
             ->getQuery()
100 100
             ->getSingleScalarResult();
101 101
         if ($num > 0) {
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Setting/System/LogController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@
 block discarded – undo
62 62
         $log = array();
63 63
         $message = array();
64 64
 
65
-        foreach (array_reverse(file($logFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES)) as $line) {
65
+        foreach (array_reverse(file($logFile, FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES)) as $line) {
66 66
             // 上限に達した場合、処理を抜ける
67 67
             if (count($log) >= $formData['line_max']) {
68 68
                 break;
Please login to merge, or discard this patch.
src/Eccube/Controller/Mypage/DeliveryController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@
 block discarded – undo
79 79
 
80 80
         // 遷移が正しくない場合、デフォルトであるマイページの配送先追加の画面を設定する
81 81
         if (!in_array($parentPage, $allowdParents)) {
82
-            $parentPage  = $app->url('mypage_delivery');
82
+            $parentPage = $app->url('mypage_delivery');
83 83
         }
84 84
 
85 85
         /* @var $form \Symfony\Component\Form\FormInterface */
Please login to merge, or discard this patch.
src/Eccube/Form/Type/AddCartType.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -113,7 +113,7 @@
 block discarded – undo
113 113
                 }
114 114
             }
115 115
 
116
-            $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($Product) {
116
+            $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($Product) {
117 117
                 $data = $event->getData();
118 118
                 $form = $event->getForm();
119 119
                 if ($Product->getClassName2()) {
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Admin/PageLayoutType.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@
 block discarded – undo
41 41
                 'label' => false,
42 42
                 'class' => 'Eccube\Entity\PageLayout',
43 43
                 'property' => 'name',
44
-                'query_builder' => function (EntityRepository $er) {
44
+                'query_builder' => function(EntityRepository $er) {
45 45
                     return $er
46 46
                         ->createQueryBuilder('l')
47 47
                         ->where('l.id <> 0')
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Admin/ProductClassType.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -148,7 +148,7 @@
 block discarded – undo
148 148
                 'required' => false,
149 149
                 'value' => 1,
150 150
             ))
151
-            ->addEventListener(FormEvents::POST_SUBMIT, function ($event) {
151
+            ->addEventListener(FormEvents::POST_SUBMIT, function($event) {
152 152
                 $form = $event->getForm();
153 153
                 $data = $form->getData();
154 154
 
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Admin/ProductType.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -72,10 +72,10 @@
 block discarded – undo
72 72
                 'required' => false,
73 73
             ))
74 74
             ->add('Category', 'category', array(
75
-               'label' => '商品カテゴリ',
76
-               'multiple' => true,
77
-               'expanded' => true,
78
-               'mapped' => false,
75
+                'label' => '商品カテゴリ',
76
+                'multiple' => true,
77
+                'expanded' => true,
78
+                'mapped' => false,
79 79
             ))
80 80
 
81 81
             // 詳細な説明
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Admin/SecurityType.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -55,8 +55,8 @@
 block discarded – undo
55 55
                     new Assert\NotBlank(),
56 56
                     new Assert\Length(array('max' => $this->config['stext_len'])),
57 57
                     new Assert\Regex(array(
58
-                       'pattern' => "/^[0-9a-zA-Z]+$/",
59
-                   )),
58
+                        'pattern' => "/^[0-9a-zA-Z]+$/",
59
+                    )),
60 60
                 ),
61 61
             ))
62 62
             ->add('admin_allow_host', 'textarea', array(
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@
 block discarded – undo
70 70
                 'label' => 'SSLを強制',
71 71
                 'required' => false,
72 72
             ))
73
-            ->addEventListener(FormEvents::POST_SUBMIT, function ($event) use ($app) {
73
+            ->addEventListener(FormEvents::POST_SUBMIT, function($event) use ($app) {
74 74
                 $form = $event->getForm();
75 75
                 $data = $form->getData();
76 76
 
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Master/ProductListOrderByType.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -38,14 +38,14 @@
 block discarded – undo
38 38
      */
39 39
     public function buildForm(FormBuilderInterface $builder, array $options)
40 40
     {
41
-        $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) {
41
+        $builder->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $event) {
42 42
             $options = $event->getForm()->getConfig()->getOptions();
43 43
             if (!$event->getData()) {
44 44
                 $data = current(array_keys($options['choice_list']->getValues()));
45 45
                 $event->setData($data);
46 46
             }
47 47
         });
48
-        $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) {
48
+        $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) {
49 49
             $options = $event->getForm()->getConfig()->getOptions();
50 50
             $values = $options['choice_list']->getValues();
51 51
             if (!in_array($event->getData(), $values)) {
Please login to merge, or discard this patch.