Completed
Pull Request — experimental/3.1 (#2515)
by Kentaro
147:20 queued 92:31
created
src/Eccube/Doctrine/ORM/Tools/Pagination/Paginator.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
         if ($this->count === null) {
122 122
             try {
123 123
                 $this->count = array_sum(array_map('current', $this->getCountQuery()->getScalarResult()));
124
-            } catch(NoResultException $e) {
124
+            } catch (NoResultException $e) {
125 125
                 $this->count = 0;
126 126
             }
127 127
         }
@@ -241,7 +241,7 @@  discard block
 block discarded – undo
241 241
         /* @var $countQuery Query */
242 242
         $countQuery = $this->cloneQuery($this->query);
243 243
 
244
-        if ( ! $countQuery->hasHint(CountWalker::HINT_DISTINCT)) {
244
+        if (!$countQuery->hasHint(CountWalker::HINT_DISTINCT)) {
245 245
             $countQuery->setHint(CountWalker::HINT_DISTINCT, true);
246 246
         }
247 247
 
@@ -267,7 +267,7 @@  discard block
 block discarded – undo
267 267
         foreach ($parameters as $key => $parameter) {
268 268
             $parameterName = $parameter->getName();
269 269
 
270
-            if( ! (isset($parameterMappings[$parameterName]) || array_key_exists($parameterName, $parameterMappings))) {
270
+            if (!(isset($parameterMappings[$parameterName]) || array_key_exists($parameterName, $parameterMappings))) {
271 271
                 unset($parameters[$key]);
272 272
             }
273 273
         }
Please login to merge, or discard this patch.
src/Eccube/Doctrine/ORM/Tools/Pagination/LimitSubqueryWalker.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
         );
94 94
 
95 95
         $pathExpression = new PathExpression(
96
-            PathExpression::TYPE_STATE_FIELD | PathExpression::TYPE_SINGLE_VALUED_ASSOCIATION,
96
+            PathExpression::TYPE_STATE_FIELD|PathExpression::TYPE_SINGLE_VALUED_ASSOCIATION,
97 97
             $rootAlias,
98 98
             $identifier
99 99
         );
@@ -104,13 +104,13 @@  discard block
 block discarded – undo
104 104
 
105 105
         if (isset($AST->orderByClause)) {
106 106
             foreach ($AST->orderByClause->orderByItems as $item) {
107
-                if ( ! $item->expression instanceof PathExpression) {
107
+                if (!$item->expression instanceof PathExpression) {
108 108
                     continue;
109 109
                 }
110 110
                 
111 111
                 $AST->selectClause->selectExpressions[] = new SelectExpression(
112 112
                     $this->createSelectExpressionItem($item->expression),
113
-                    '_dctrn_ord' . $this->_aliasCounter++
113
+                    '_dctrn_ord'.$this->_aliasCounter++
114 114
                 );
115 115
             }
116 116
         }
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
                     && isset($queryComponents[$expression->identificationVariable])) {
146 146
                     $queryComponent = $queryComponents[$expression->identificationVariable];
147 147
                     if (isset($queryComponent['parent'])
148
-                        && $queryComponent['relation']['type'] & ClassMetadataInfo::TO_MANY) {
148
+                        && $queryComponent['relation']['type']&ClassMetadataInfo::TO_MANY) {
149 149
                         throw new \RuntimeException("Cannot select distinct identifiers from query with LIMIT and ORDER BY on a column from a fetch joined to-many association. Use output walkers.");
150 150
                     }
151 151
                 }
Please login to merge, or discard this patch.
src/Eccube/Doctrine/ORM/Tools/Pagination/RowNumberOverFunction.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -44,9 +44,9 @@
 block discarded – undo
44 44
      */
45 45
     public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
46 46
     {
47
-        return 'ROW_NUMBER() OVER(' . trim($sqlWalker->walkOrderByClause(
47
+        return 'ROW_NUMBER() OVER('.trim($sqlWalker->walkOrderByClause(
48 48
             $this->orderByClause
49
-        )) . ')';
49
+        )).')';
50 50
     }
51 51
 
52 52
     /**
Please login to merge, or discard this patch.
src/Eccube/Doctrine/ORM/Tools/Pagination/LimitSubqueryOutputWalker.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -209,8 +209,8 @@  discard block
 block discarded – undo
209 209
         $sqlIdentifier = $this->getSQLIdentifier($AST);
210 210
 
211 211
         if ($hasOrderBy) {
212
-            $orderGroupBy = ' GROUP BY ' . implode(', ', $sqlIdentifier);
213
-            $sqlIdentifier[] = 'MIN(' . $this->walkResultVariable('dctrn_rownum') . ') AS dctrn_minrownum';
212
+            $orderGroupBy = ' GROUP BY '.implode(', ', $sqlIdentifier);
213
+            $sqlIdentifier[] = 'MIN('.$this->walkResultVariable('dctrn_rownum').') AS dctrn_minrownum';
214 214
         }
215 215
 
216 216
         // Build the counter query
@@ -221,7 +221,7 @@  discard block
 block discarded – undo
221 221
         );
222 222
 
223 223
         if ($hasOrderBy) {
224
-            $sql .= $orderGroupBy . $outerOrderBy;
224
+            $sql .= $orderGroupBy.$outerOrderBy;
225 225
         }
226 226
 
227 227
         // Apply the limit and offset.
@@ -368,7 +368,7 @@  discard block
 block discarded – undo
368 368
     {
369 369
         // If the sql statement has an order by clause, we need to wrap it in a new select distinct
370 370
         // statement
371
-        if (! $orderByClause instanceof OrderByClause) {
371
+        if (!$orderByClause instanceof OrderByClause) {
372 372
             return $sql;
373 373
         }
374 374
 
@@ -404,7 +404,7 @@  discard block
 block discarded – undo
404 404
             = array();
405 405
 
406 406
         // Generate DQL alias -> SQL table alias mapping
407
-        foreach(array_keys($this->rsm->aliasMap) as $dqlAlias) {
407
+        foreach (array_keys($this->rsm->aliasMap) as $dqlAlias) {
408 408
             $dqlAliasToClassMap[$dqlAlias] = $class = $this->queryComponents[$dqlAlias]['metadata'];
409 409
             $dqlAliasToSqlTableAliasMap[$dqlAlias] = $this->getSQLTableAlias($class->getTableName(), $dqlAlias);
410 410
         }
@@ -413,7 +413,7 @@  discard block
 block discarded – undo
413 413
         $fieldSearchPattern = '/(?<![a-z0-9_])%s\.%s(?![a-z0-9_])/i';
414 414
 
415 415
         // Generate search patterns for each field's path expression in the order by clause
416
-        foreach($this->rsm->fieldMappings as $fieldAlias => $fieldName) {
416
+        foreach ($this->rsm->fieldMappings as $fieldAlias => $fieldName) {
417 417
             $dqlAliasForFieldAlias = $this->rsm->columnOwnerMap[$fieldAlias];
418 418
             $class = $dqlAliasToClassMap[$dqlAliasForFieldAlias];
419 419
 
@@ -449,7 +449,7 @@  discard block
 block discarded – undo
449 449
             $replacements[] = $fieldAlias;
450 450
         }
451 451
 
452
-        foreach($orderByClause->orderByItems as $orderByItem) {
452
+        foreach ($orderByClause->orderByItems as $orderByItem) {
453 453
             // Walk order by item to get string representation of it
454 454
             $orderByItemString = $this->walkOrderByItem($orderByItem);
455 455
 
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.
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.
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.