Completed
Pull Request — experimental/3.1 (#2168)
by Kentaro
93:49 queued 72:21
created
src/Eccube/Service/Calculator/CalculateContext.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@
 block discarded – undo
18 18
             $Strategy->execute($this->OrderDetails);
19 19
         }
20 20
 
21
-        foreach($this->OrderDetails as $OrderDetail) {
21
+        foreach ($this->OrderDetails as $OrderDetail) {
22 22
             if (!$this->Order->getOrderDetails()->contains($OrderDetail)) {
23 23
                 $OrderDetail->setOrder($this->Order);
24 24
                 $this->Order->addOrderDetail($OrderDetail);
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Shopping/ShippingType.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
         // 配送業者のプルダウンを生成
55 55
         $builder->addEventListener(
56 56
             FormEvents::PRE_SET_DATA,
57
-            function (FormEvent $event) {
57
+            function(FormEvent $event) {
58 58
                 $Shipping = $event->getData();
59 59
                 if (is_null($Shipping) || !$Shipping->getId()) {
60 60
                     return;
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
         // お届け日のプルダウンを生成
96 96
         $builder->addEventListener(
97 97
             FormEvents::PRE_SET_DATA,
98
-            function (FormEvent $event) {
98
+            function(FormEvent $event) {
99 99
                 $Shipping = $event->getData();
100 100
                 if (is_null($Shipping) || !$Shipping->getId()) {
101 101
                     return;
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 
132 132
                 // 配送日数が設定されている
133 133
                 if ($deliveryDateFlag) {
134
-                    $period = new \DatePeriod (
134
+                    $period = new \DatePeriod(
135 135
                         new \DateTime($minDate.' day'),
136 136
                         new \DateInterval('P1D'),
137 137
                         new \DateTime($minDate + $this->config['deliv_date_end_max'].' day')
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
         // お届け時間のプルダウンを生成
160 160
         $builder->addEventListener(
161 161
             FormEvents::PRE_SET_DATA,
162
-            function (FormEvent $event) {
162
+            function(FormEvent $event) {
163 163
                 $Shipping = $event->getData();
164 164
                 if (is_null($Shipping) || !$Shipping->getId()) {
165 165
                     return;
Please login to merge, or discard this patch.
src/Eccube/InstallApplication.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@
 block discarded – undo
39 39
 
40 40
         if (is_writable($logDir)) {
41 41
             if (file_exists($installLog) && !is_writable($installLog)) {
42
-                die($installLog . ' の書込権限を変更して下さい。');
42
+                die($installLog.' の書込権限を変更して下さい。');
43 43
             }
44 44
             // install step2 でログディレクトリに書き込み権限が付与されればログ出力を開始する.
45 45
             $app->register(new \Silex\Provider\MonologServiceProvider(), array(
Please login to merge, or discard this patch.
src/Eccube/Repository/CustomerRepository.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -153,9 +153,9 @@  discard block
 block discarded – undo
153 153
             $qb
154 154
                 ->andWhere('c.id = :customer_id OR CONCAT(c.name01, c.name02) LIKE :name OR CONCAT(c.kana01, c.kana02) LIKE :kana OR c.email LIKE :email')
155 155
                 ->setParameter('customer_id', $id)
156
-                ->setParameter('name', '%' . $clean_key_multi . '%')
157
-                ->setParameter('kana', '%' . $clean_key_multi . '%')
158
-                ->setParameter('email', '%' . $clean_key_multi . '%');
156
+                ->setParameter('name', '%'.$clean_key_multi.'%')
157
+                ->setParameter('kana', '%'.$clean_key_multi.'%')
158
+                ->setParameter('email', '%'.$clean_key_multi.'%');
159 159
         }
160 160
 
161 161
         // Pref
@@ -205,7 +205,7 @@  discard block
 block discarded – undo
205 205
         if (isset($searchData['tel']) && Str::isNotBlank($searchData['tel'])) {
206 206
             $qb
207 207
                 ->andWhere('CONCAT(c.tel01, c.tel02, c.tel03) LIKE :tel')
208
-                ->setParameter('tel', '%' . $searchData['tel'] . '%');
208
+                ->setParameter('tel', '%'.$searchData['tel'].'%');
209 209
         }
210 210
 
211 211
         // buy_total
@@ -299,7 +299,7 @@  discard block
 block discarded – undo
299 299
                 ->leftJoin('c.Orders', 'o')
300 300
                 ->leftJoin('o.OrderDetails', 'od')
301 301
                 ->andWhere('od.product_name LIKE :buy_product_name OR od.product_code LIKE :buy_product_name')
302
-                ->setParameter('buy_product_name', '%' . $searchData['buy_product_code'] . '%');
302
+                ->setParameter('buy_product_name', '%'.$searchData['buy_product_code'].'%');
303 303
         }
304 304
 
305 305
         // Order By
Please login to merge, or discard this patch.
src/Eccube/Command/GeneratorCommand/EntityFromDbGenerator.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -164,7 +164,7 @@
 block discarded – undo
164 164
             $cmf->setEntityManager($em);
165 165
             $metadatas = $cmf->getAllMetadata();
166 166
 
167
-            $filters = array_map(function ($value) {
167
+            $filters = array_map(function($value) {
168 168
                 return ucfirst(Inflector::camelize(str_replace('plg_', '', $value)));
169 169
             }, $tableList);
170 170
             $metadatas = MetadataFilter::filter($metadatas, $filters);
Please login to merge, or discard this patch.
html/install.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -27,12 +27,12 @@
 block discarded – undo
27 27
 }
28 28
 
29 29
 //[INFO]index.php,install.phpをEC-CUBEルート直下に移動させる場合は、コメントアウトしている行に置き換える
30
-require __DIR__ . '/../autoload.php';
30
+require __DIR__.'/../autoload.php';
31 31
 //require __DIR__ . '/autoload.php';
32 32
 
33 33
 $app = new Eccube\InstallApplication();
34 34
 $app['debug'] = true;
35
-$app->before(function (\Symfony\Component\HttpFoundation\Request $request, \Silex\Application $app) {
35
+$app->before(function(\Symfony\Component\HttpFoundation\Request $request, \Silex\Application $app) {
36 36
     if (!$request->getSession()->isStarted()) {
37 37
         $request->getSession()->start();
38 38
     }
Please login to merge, or discard this patch.
html/index.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@
 block discarded – undo
27 27
 //require __DIR__.'/autoload.php';
28 28
 
29 29
 ini_set('display_errors', 'Off');
30
-error_reporting(E_ALL & ~E_DEPRECATED & ~E_STRICT);
30
+error_reporting(E_ALL&~E_DEPRECATED&~E_STRICT);
31 31
 
32 32
 // see http://silex.sensiolabs.org/doc/web_servers.html#php-5-4
33 33
 $filename = __DIR__.preg_replace('#(\?.*)$#', '', $_SERVER['REQUEST_URI']);
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Admin/CsvImportType.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -53,8 +53,8 @@
 block discarded – undo
53 53
                 'constraints' => array(
54 54
                     new Assert\NotBlank(array('message' => 'ファイルを選択してください。')),
55 55
                     new Assert\File(array(
56
-                        'maxSize' => $app['config']['csv_size'] . 'M',
57
-                        'maxSizeMessage' => 'CSVファイルは' . $app['config']['csv_size'] . 'M以下でアップロードしてください。',
56
+                        'maxSize' => $app['config']['csv_size'].'M',
57
+                        'maxSizeMessage' => 'CSVファイルは'.$app['config']['csv_size'].'M以下でアップロードしてください。',
58 58
                     )),
59 59
                 ),
60 60
             ));
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
@@ -112,7 +112,7 @@
 block discarded – undo
112 112
                 }
113 113
             }
114 114
 
115
-            $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($Product) {
115
+            $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($Product) {
116 116
                 $data = $event->getData();
117 117
                 $form = $event->getForm();
118 118
                 if (!is_null($Product->getClassName2())) {
Please login to merge, or discard this patch.