Completed
Pull Request — experimental/3.1 (#1985)
by Kentaro
132:51 queued 123:28
created
src/Eccube/Form/Type/Admin/ShipmentItemType.php 1 patch
Spacing   +5 added lines, -9 removed lines patch added patch discarded remove patch
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
                 )));
98 98
 
99 99
         $app = $this->app;
100
-        $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($app) {
100
+        $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($app) {
101 101
             // モーダルからのPOST時に、金額等をセットする.
102 102
             if ('modal' === $app['request']->get('modal')) {
103 103
                 $data = $event->getData();
@@ -112,17 +112,13 @@  discard block
 block discarded – undo
112 112
                     $data['product_name'] = $Product->getName();
113 113
                     $data['product_code'] = $ProductClass->getCode();
114 114
                     $data['class_name1'] = $ProductClass->hasClassCategory1() ?
115
-                        $ProductClass->getClassCategory1()->getClassName() :
116
-                        null;
115
+                        $ProductClass->getClassCategory1()->getClassName() : null;
117 116
                     $data['class_name2'] = $ProductClass->hasClassCategory2() ?
118
-                        $ProductClass->getClassCategory2()->getClassName() :
119
-                        null;
117
+                        $ProductClass->getClassCategory2()->getClassName() : null;
120 118
                     $data['class_category_name1'] = $ProductClass->hasClassCategory1() ?
121
-                        $ProductClass->getClassCategory1()->getName() :
122
-                        null;
119
+                        $ProductClass->getClassCategory1()->getName() : null;
123 120
                     $data['class_category_name2'] = $ProductClass->hasClassCategory2() ?
124
-                        $ProductClass->getClassCategory2()->getName() :
125
-                        null;
121
+                        $ProductClass->getClassCategory2()->getName() : null;
126 122
                     $data['price'] = $ProductClass->getPrice02();
127 123
                     $data['quantity'] = empty($data['quantity']) ? 1 : $data['quantity'];
128 124
                     $event->setData($data);
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Setting/System/MasterdataController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -128,7 +128,7 @@
 block discarded – undo
128 128
                 $entityName = str_replace('-', '\\', $data['masterdata_name']);
129 129
                 $entity = new $entityName();
130 130
                 $rank = 0;
131
-                $ids = array_map(function ($v) {return $v['id'];}, $data['data']);
131
+                $ids = array_map(function($v) {return $v['id']; }, $data['data']);
132 132
                 foreach ($data['data'] as $key => $value) {
133 133
                     if ($value['id'] !== null && $value['name'] !== null) {
134 134
                         $entity->setId($value['id']);
Please login to merge, or discard this patch.
src/Eccube/Doctrine/ORM/Query/Extract.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -108,7 +108,7 @@
 block discarded – undo
108 108
         if ($driver == 'pdo_sqlite') {
109 109
             return sprintf("CAST(STRFTIME('%s', %s) AS INTEGER)", $this->formats[$this->field], $this->source->dispatch($sqlWalker));
110 110
         } else {
111
-            return sprintf('EXTRACT(%s FROM %s %s)', $this->field, (string)$this->type, $this->source->dispatch($sqlWalker));
111
+            return sprintf('EXTRACT(%s FROM %s %s)', $this->field, (string) $this->type, $this->source->dispatch($sqlWalker));
112 112
         }
113 113
     }
114 114
 }
115 115
\ No newline at end of file
Please login to merge, or discard this patch.
src/Eccube/Repository/Master/OrderStatusRepository.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@
 block discarded – undo
53 53
 
54 54
         foreach ($criteria as $col => $val) {
55 55
             $qb->andWhere($qb->expr()->notIn('o.'.$col, ':'.$col))
56
-                ->setParameter($col, (array)$val);
56
+                ->setParameter($col, (array) $val);
57 57
         }
58 58
 
59 59
         if (is_array($orderBy)) {
Please login to merge, or discard this patch.
src/Eccube/Service/PluginService.php 2 patches
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.
Doc Comments   +21 added lines patch added patch discarded remove patch
@@ -38,6 +38,9 @@  discard block
 block discarded – undo
38 38
     const EVENT_YML = 'event.yml';
39 39
     private $app;
40 40
 
41
+    /**
42
+     * @param \Pimple\Container $app
43
+     */
41 44
     public function __construct($app)
42 45
     {
43 46
         $this->app = $app;
@@ -103,6 +106,9 @@  discard block
 block discarded – undo
103 106
         }
104 107
     }
105 108
 
109
+    /**
110
+     * @param string $dir
111
+     */
106 112
     public function unpackPluginArchive($archive, $dir)
107 113
     {
108 114
         $extension = pathinfo($archive, PATHINFO_EXTENSION);
@@ -121,6 +127,9 @@  discard block
 block discarded – undo
121 127
         }
122 128
     }
123 129
 
130
+    /**
131
+     * @param string $dir
132
+     */
124 133
     public function checkPluginArchiveContent($dir, array $config_cache = array())
125 134
     {
126 135
         try {
@@ -162,6 +171,9 @@  discard block
 block discarded – undo
162 171
         }
163 172
     }
164 173
 
174
+    /**
175
+     * @param string $yml
176
+     */
165 177
     public function readYml($yml)
166 178
     {
167 179
         if (file_exists($yml)) {
@@ -179,6 +191,9 @@  discard block
 block discarded – undo
179 191
         // ディレクトリ名などに使われれるので厳しめ
180 192
     }
181 193
 
194
+    /**
195
+     * @param string $path
196
+     */
182 197
     public function deleteFile($path)
183 198
     {
184 199
         $f = new Filesystem();
@@ -198,6 +213,9 @@  discard block
 block discarded – undo
198 213
         return $this->app['config']['plugin_realdir'].'/'.$name;
199 214
     }
200 215
 
216
+    /**
217
+     * @param string $d
218
+     */
201 219
     public function createPluginDir($d)
202 220
     {
203 221
         $b = @mkdir($d);
@@ -257,6 +275,9 @@  discard block
 block discarded – undo
257 275
         return $p;
258 276
     }
259 277
 
278
+    /**
279
+     * @param string $method
280
+     */
260 281
     public function callPluginManagerMethod($meta, $method)
261 282
     {
262 283
         $class = '\\Plugin'.'\\'.$meta['code'].'\\'.'PluginManager';
Please login to merge, or discard this patch.
eccube_install.php 1 patch
Spacing   +13 added lines, -14 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
 out('EC-CUBE3 installer use database driver of ', null, false);
32 32
 
33 33
 $database_driver = 'pdo_sqlite';
34
-switch($argv[1]) {
34
+switch ($argv[1]) {
35 35
     case 'mysql':
36 36
         $database_driver = 'pdo_mysql';
37 37
         break;
@@ -157,8 +157,7 @@  discard block
 block discarded – undo
157 157
     putenv('MAIL_PASS='.(getenv('MAIL_PASS') ? getenv('MAIL_PASS') : null));
158 158
     putenv('ADMIN_ROUTE='.(getenv('ADMIN_ROUTE') ? getenv('ADMIN_ROUTE') : 'admin'));
159 159
     putenv('ROOT_URLPATH='.(getenv('ROOT_URLPATH') ? getenv('ROOT_URLPATH') : null));
160
-    putenv('AUTH_MAGIC='.(getenv('AUTH_MAGIC') ? getenv('AUTH_MAGIC') :
161
-                          substr(str_replace(array('/', '+', '='), '', base64_encode(openssl_random_pseudo_bytes(32 * 2))), 0, 32)));
160
+    putenv('AUTH_MAGIC='.(getenv('AUTH_MAGIC') ? getenv('AUTH_MAGIC') : substr(str_replace(array('/', '+', '='), '', base64_encode(openssl_random_pseudo_bytes(32 * 2))), 0, 32)));
162 161
 }
163 162
 
164 163
 function getExampleVariables()
@@ -357,15 +356,15 @@  discard block
 block discarded – undo
357 356
     foreach ($finder as $content) {
358 357
         $permission = $content->getPerms();
359 358
         // see also http://www.php.net/fileperms
360
-        if (!($permission & 0x0010) || !($permission & 0x0002)) {
359
+        if (!($permission&0x0010) || !($permission&0x0002)) {
361 360
             $realPath = $content->getRealPath();
362 361
             if ($verbose) {
363 362
                 out(sprintf('%s %s to ', $realPath, substr(sprintf('%o', $permission), -4)), 'info', false);
364 363
             }
365
-            $permission = !($permission & 0x0020) ? $permission += 040 : $permission; // g+r
366
-            $permission = !($permission & 0x0010) ? $permission += 020 : $permission; // g+w
367
-            $permission = !($permission & 0x0004) ? $permission += 04 : $permission;  // o+r
368
-            $permission = !($permission & 0x0002) ? $permission += 02 : $permission;  // o+w
364
+            $permission = !($permission&0x0020) ? $permission += 040 : $permission; // g+r
365
+            $permission = !($permission&0x0010) ? $permission += 020 : $permission; // g+w
366
+            $permission = !($permission&0x0004) ? $permission += 04 : $permission; // o+r
367
+            $permission = !($permission&0x0002) ? $permission += 02 : $permission; // o+w
369 368
             $result = chmod($realPath, $permission);
370 369
             if ($verbose) {
371 370
                 if ($result) {
@@ -396,13 +395,13 @@  discard block
 block discarded – undo
396 395
 
397 396
 function getConfig()
398 397
 {
399
-    $config = array (
398
+    $config = array(
400 399
         'auth_magic' => getenv('AUTH_MAGIC'),
401 400
         'password_hash_algos' => 'sha256',
402 401
         'shop_name' => getenv('SHOP_NAME'),
403 402
         'force_ssl' => NULL,
404 403
         'admin_allow_host' =>
405
-        array (
404
+        array(
406 405
         ),
407 406
         'cookie_lifetime' => 0,
408 407
         'locale' => 'ja',
@@ -414,9 +413,9 @@  discard block
 block discarded – undo
414 413
 
415 414
 function getDatabaseConfig($database_driver)
416 415
 {
417
-    $database = array (
416
+    $database = array(
418 417
         'database' =>
419
-        array (
418
+        array(
420 419
             'driver' => $database_driver,
421 420
         )
422 421
     );
@@ -443,9 +442,9 @@  discard block
 block discarded – undo
443 442
 
444 443
 function getMailConfig()
445 444
 {
446
-    $mail = array (
445
+    $mail = array(
447 446
         'mail' =>
448
-        array (
447
+        array(
449 448
             'transport' => getenv('MAIL_BACKEND'),
450 449
             'host' => getenv('MAIL_HOST'),
451 450
             'port' => getenv('MAIL_PORT'),
Please login to merge, or discard this patch.
src/Eccube/Doctrine/ORM/Tools/Pagination/Paginator.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -57,7 +57,7 @@
 block discarded – undo
57 57
     /**
58 58
      * Constructor.
59 59
      *
60
-     * @param Query|QueryBuilder $query               A Doctrine ORM query or query builder.
60
+     * @param Query $query               A Doctrine ORM query or query builder.
61 61
      * @param boolean            $fetchJoinCollection Whether the query joins a collection (true by default).
62 62
      */
63 63
     public function __construct($query, $fetchJoinCollection = true)
Please login to merge, or discard this 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/WhereInWalker.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
             $pathType = PathExpression::TYPE_SINGLE_VALUED_ASSOCIATION;
90 90
         }
91 91
 
92
-        $pathExpression       = new PathExpression(PathExpression::TYPE_STATE_FIELD | PathExpression::TYPE_SINGLE_VALUED_ASSOCIATION, $rootAlias, $identifierFieldName);
92
+        $pathExpression       = new PathExpression(PathExpression::TYPE_STATE_FIELD|PathExpression::TYPE_SINGLE_VALUED_ASSOCIATION, $rootAlias, $identifierFieldName);
93 93
         $pathExpression->type = $pathType;
94 94
 
95 95
         $count = $this->_getQuery()->getHint(self::HINT_PAGINATOR_ID_COUNT);
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
                 array($pathExpression)
101 101
             );
102 102
             $expression = new InExpression($arithmeticExpression);
103
-            $expression->literals[] = new InputParameter(":" . self::PAGINATOR_ID_ALIAS);
103
+            $expression->literals[] = new InputParameter(":".self::PAGINATOR_ID_ALIAS);
104 104
 
105 105
         } else {
106 106
             $expression = new NullComparisonExpression($pathExpression);
Please login to merge, or discard this patch.
src/Eccube/Doctrine/ORM/Tools/Pagination/CountWalker.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -69,7 +69,7 @@
 block discarded – undo
69 69
         }
70 70
 
71 71
         $pathExpression = new PathExpression(
72
-            PathExpression::TYPE_STATE_FIELD | PathExpression::TYPE_SINGLE_VALUED_ASSOCIATION, $rootAlias,
72
+            PathExpression::TYPE_STATE_FIELD|PathExpression::TYPE_SINGLE_VALUED_ASSOCIATION, $rootAlias,
73 73
             $identifierFieldName
74 74
         );
75 75
         $pathExpression->type = $pathType;
Please login to merge, or discard this patch.