Completed
Pull Request — experimental/3.1 (#2653)
by
unknown
18:42
created
src/Eccube/ServiceProvider/CompatRepositoryProvider.php 1 patch
Spacing   +52 added lines, -52 removed lines patch added patch discarded remove patch
@@ -11,163 +11,163 @@
 block discarded – undo
11 11
     public function register(Container $app)
12 12
     {
13 13
         // Repository
14
-        $app['eccube.repository.master.authority'] = function () use ($app) {
14
+        $app['eccube.repository.master.authority'] = function() use ($app) {
15 15
             return $app['Eccube\Repository\Master\AuthorityRepository'];
16 16
         };
17
-        $app['eccube.repository.master.tag'] = function () use ($app) {
17
+        $app['eccube.repository.master.tag'] = function() use ($app) {
18 18
             return $app['Eccube\Repository\Master\TagRepository'];
19 19
         };
20
-        $app['eccube.repository.master.pref'] = function () use ($app) {
20
+        $app['eccube.repository.master.pref'] = function() use ($app) {
21 21
             return $app['Eccube\Repository\Master\PrefRepository'];
22 22
         };
23
-        $app['eccube.repository.master.sex'] = function () use ($app) {
23
+        $app['eccube.repository.master.sex'] = function() use ($app) {
24 24
             return $app['Eccube\Repository\Master\SexRepository'];
25 25
         };
26
-        $app['eccube.repository.master.product_status'] = function () use ($app) {
26
+        $app['eccube.repository.master.product_status'] = function() use ($app) {
27 27
             return $app['Eccube\Repository\Master\ProductStatusRepository'];
28 28
         };
29
-        $app['eccube.repository.master.sale_type'] = function () use ($app) {
29
+        $app['eccube.repository.master.sale_type'] = function() use ($app) {
30 30
             return $app['Eccube\Repository\Master\SaleTypeRepository'];
31 31
         };
32
-        $app['eccube.repository.master.page_max'] = function () use ($app) {
32
+        $app['eccube.repository.master.page_max'] = function() use ($app) {
33 33
             return $app['Eccube\Repository\Master\PageMaxRepository'];
34 34
         };
35
-        $app['eccube.repository.master.order_status'] = function () use ($app) {
35
+        $app['eccube.repository.master.order_status'] = function() use ($app) {
36 36
             return $app['Eccube\Repository\Master\OrderStatusRepository'];
37 37
         };
38
-        $app['eccube.repository.master.product_list_max'] = function () use ($app) {
38
+        $app['eccube.repository.master.product_list_max'] = function() use ($app) {
39 39
             return $app['Eccube\Repository\Master\ProductListMaxRepository'];
40 40
         };
41
-        $app['eccube.repository.master.product_list_order_by'] = function () use ($app) {
41
+        $app['eccube.repository.master.product_list_order_by'] = function() use ($app) {
42 42
             return $app['Eccube\Repository\Master\ProductListOrderByRepository'];
43 43
         };
44
-        $app['eccube.repository.master.device_type'] = function () use ($app) {
44
+        $app['eccube.repository.master.device_type'] = function() use ($app) {
45 45
             return $app['Eccube\Repository\Master\DeviceTypeRepository'];
46 46
         };
47
-        $app['eccube.repository.master.csv_type'] = function () use ($app) {
47
+        $app['eccube.repository.master.csv_type'] = function() use ($app) {
48 48
             return $app['Eccube\Repository\Master\CsvTypeRepository'];
49 49
         };
50
-        $app['eccube.repository.master.order_item_type'] = function () use ($app) {
50
+        $app['eccube.repository.master.order_item_type'] = function() use ($app) {
51 51
             return $app['Eccube\Repository\Master\OrderItemTypeRepository'];
52 52
         };
53
-        $app['eccube.repository.base_info'] = function () use ($app) {
53
+        $app['eccube.repository.base_info'] = function() use ($app) {
54 54
             return $app['Eccube\Repository\BaseInfoRepository'];
55 55
         };
56
-        $app['eccube.repository.delivery'] = function () use ($app) {
56
+        $app['eccube.repository.delivery'] = function() use ($app) {
57 57
             return $app['Eccube\Repository\DeliveryRepository'];
58 58
         };
59
-        $app['eccube.repository.delivery_date'] = function () use ($app) {
59
+        $app['eccube.repository.delivery_date'] = function() use ($app) {
60 60
             return $app['Eccube\Repository\DeliveryDateRepository'];
61 61
         };
62
-        $app['eccube.repository.delivery_fee'] = function () use ($app) {
62
+        $app['eccube.repository.delivery_fee'] = function() use ($app) {
63 63
             return $app['Eccube\Repository\DeliveryFeeRepository'];
64 64
         };
65
-        $app['eccube.repository.delivery_time'] = function () use ($app) {
65
+        $app['eccube.repository.delivery_time'] = function() use ($app) {
66 66
             return $app['Eccube\Repository\DeliveryTimeRepository'];
67 67
         };
68
-        $app['eccube.repository.payment'] = function () use ($app) {
68
+        $app['eccube.repository.payment'] = function() use ($app) {
69 69
             return $app['Eccube\Repository\PaymentRepository'];
70 70
         };
71
-        $app['eccube.repository.payment_option'] = function () use ($app) {
71
+        $app['eccube.repository.payment_option'] = function() use ($app) {
72 72
             return $app['Eccube\Repository\PaymentOptionRepository'];
73 73
         };
74
-        $app['eccube.repository.customer'] = function () use ($app) {
74
+        $app['eccube.repository.customer'] = function() use ($app) {
75 75
             return $app['Eccube\Repository\CustomerRepository'];
76 76
         };
77
-        $app['eccube.repository.news'] = function () use ($app) {
77
+        $app['eccube.repository.news'] = function() use ($app) {
78 78
             return $app['Eccube\Repository\NewsRepository'];
79 79
         };
80
-        $app['eccube.repository.mail_history'] = function () use ($app) {
80
+        $app['eccube.repository.mail_history'] = function() use ($app) {
81 81
             return $app['Eccube\Repository\MailHistoryRepository'];
82 82
         };
83
-        $app['eccube.repository.member'] = function () use ($app) {
83
+        $app['eccube.repository.member'] = function() use ($app) {
84 84
             return $app['Eccube\Repository\MemberRepository'];
85 85
         };
86
-        $app['eccube.repository.order'] = function () use ($app) {
86
+        $app['eccube.repository.order'] = function() use ($app) {
87 87
             return $app['Eccube\Repository\OrderRepository'];
88 88
         };
89
-        $app['eccube.repository.product'] = function () use ($app) {
89
+        $app['eccube.repository.product'] = function() use ($app) {
90 90
             return $app['Eccube\Repository\ProductRepository'];
91 91
         };
92
-        $app['eccube.repository.product_image'] = function () use ($app) {
92
+        $app['eccube.repository.product_image'] = function() use ($app) {
93 93
             return $app['Eccube\Repository\ProductImageRepository'];
94 94
         };
95
-        $app['eccube.repository.product_class'] = function () use ($app) {
95
+        $app['eccube.repository.product_class'] = function() use ($app) {
96 96
             return $app['Eccube\Repository\ProductClassRepository'];
97 97
         };
98
-        $app['eccube.repository.product_stock'] = function () use ($app) {
98
+        $app['eccube.repository.product_stock'] = function() use ($app) {
99 99
             return $app['Eccube\Repository\ProductStockRepository'];
100 100
         };
101
-        $app['eccube.repository.product_tag'] = function () use ($app) {
101
+        $app['eccube.repository.product_tag'] = function() use ($app) {
102 102
             return $app['Eccube\Repository\ProductTagRepository'];
103 103
         };
104
-        $app['eccube.repository.class_name'] = function () use ($app) {
104
+        $app['eccube.repository.class_name'] = function() use ($app) {
105 105
             return $app['Eccube\Repository\ClassNameRepository'];
106 106
         };
107
-        $app['eccube.repository.class_category'] = function () use ($app) {
107
+        $app['eccube.repository.class_category'] = function() use ($app) {
108 108
             return $app['Eccube\Repository\ClassCategoryRepository'];
109 109
         };
110
-        $app['eccube.repository.customer_favorite_product'] = function () use ($app) {
110
+        $app['eccube.repository.customer_favorite_product'] = function() use ($app) {
111 111
             return $app['Eccube\Repository\CustomerFavoriteProductRepository'];
112 112
         };
113
-        $app['eccube.repository.tax_rule'] = function () use ($app) {
113
+        $app['eccube.repository.tax_rule'] = function() use ($app) {
114 114
             return $app['Eccube\Repository\TaxRuleRepository'];
115 115
         };
116
-        $app['eccube.repository.page'] = function () use ($app) {
116
+        $app['eccube.repository.page'] = function() use ($app) {
117 117
             return $app['Eccube\Repository\PageRepository'];
118 118
         };
119
-        $app['eccube.repository.block'] = function () use ($app) {
119
+        $app['eccube.repository.block'] = function() use ($app) {
120 120
             return $app['Eccube\Repository\BlockRepository'];
121 121
         };
122
-        $app['eccube.repository.order'] = function () use ($app) {
122
+        $app['eccube.repository.order'] = function() use ($app) {
123 123
             return $app['Eccube\Repository\OrderRepository'];
124 124
         };
125
-        $app['eccube.repository.customer_address'] = function () use ($app) {
125
+        $app['eccube.repository.customer_address'] = function() use ($app) {
126 126
             return $app['Eccube\Repository\CustomerAddressRepository'];
127 127
         };
128
-        $app['eccube.repository.shipping'] = function () use ($app) {
128
+        $app['eccube.repository.shipping'] = function() use ($app) {
129 129
             return $app['Eccube\Repository\ShippingRepository'];
130 130
         };
131
-        $app['eccube.repository.order_item'] = function () use ($app) {
131
+        $app['eccube.repository.order_item'] = function() use ($app) {
132 132
             return $app['Eccube\Repository\OrderItemRepository'];
133 133
         };
134
-        $app['eccube.repository.master.customer_status'] = function () use ($app) {
134
+        $app['eccube.repository.master.customer_status'] = function() use ($app) {
135 135
             return $app['Eccube\Repository\Master\CustomerStatusRepository'];
136 136
         };
137 137
 
138
-        $app['eccube.repository.mail_template'] = function () use ($app) {
138
+        $app['eccube.repository.mail_template'] = function() use ($app) {
139 139
             return $app['Eccube\Repository\MailTemplateRepository'];
140 140
         };
141
-        $app['eccube.repository.csv'] = function () use ($app) {
141
+        $app['eccube.repository.csv'] = function() use ($app) {
142 142
             return $app['Eccube\Repository\CsvRepository'];
143 143
         };
144
-        $app['eccube.repository.template'] = function () use ($app) {
144
+        $app['eccube.repository.template'] = function() use ($app) {
145 145
             return $app['Eccube\Repository\TemplateRepository'];
146 146
         };
147
-        $app['eccube.repository.authority_role'] = function () use ($app) {
147
+        $app['eccube.repository.authority_role'] = function() use ($app) {
148 148
             return $app['Eccube\Repository\AuthorityRoleRepository'];
149 149
         };
150
-        $app['eccube.repository.category'] = function () use ($app) {
150
+        $app['eccube.repository.category'] = function() use ($app) {
151 151
             return $app['Eccube\Repository\CategoryRepository'];
152 152
         };
153
-        $app['eccube.repository.help'] = function () use ($app) {
153
+        $app['eccube.repository.help'] = function() use ($app) {
154 154
             return $app['Eccube\Repository\HelpRepository'];
155 155
         };
156
-        $app['eccube.repository.plugin'] = function () use ($app) {
156
+        $app['eccube.repository.plugin'] = function() use ($app) {
157 157
             return $app['Eccube\Repository\PluginRepository'];
158 158
         };
159
-        $app['eccube.repository.plugin_event_handler'] = function () use ($app) {
159
+        $app['eccube.repository.plugin_event_handler'] = function() use ($app) {
160 160
             return $app['Eccube\Repository\PluginEventHandlerRepository'];
161 161
         };
162
-        $app['eccube.repository.layout'] = function () use ($app) {
162
+        $app['eccube.repository.layout'] = function() use ($app) {
163 163
             return $app['Eccube\Repository\LayoutRepository'];
164 164
         };
165 165
 
166 166
         // alias
167
-        $app['eccube.repository.order_status'] = function () use ($app) {
167
+        $app['eccube.repository.order_status'] = function() use ($app) {
168 168
             return $app['Eccube\Repository\Master\OrderStatusRepository'];
169 169
         };
170
-        $app['eccube.repository.customer_status'] = function () use ($app) {
170
+        $app['eccube.repository.customer_status'] = function() use ($app) {
171 171
             return $app['Eccube\Repository\Master\CustomerStatusRepository'];
172 172
         };
173 173
     }
Please login to merge, or discard this patch.
src/Eccube/Controller/Mypage/WithdrawController.php 1 patch
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -27,14 +27,12 @@
 block discarded – undo
27 27
 use Doctrine\ORM\EntityManager;
28 28
 use Eccube\Annotation\Inject;
29 29
 use Eccube\Application;
30
-use Eccube\Common\Constant;
31 30
 use Eccube\Controller\AbstractController;
32 31
 use Eccube\Entity\Master\CustomerStatus;
33 32
 use Eccube\Event\EccubeEvents;
34 33
 use Eccube\Event\EventArgs;
35 34
 use Eccube\Repository\Master\CustomerStatusRepository;
36 35
 use Eccube\Service\MailService;
37
-use Eccube\Util\StringUtil;
38 36
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
39 37
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
40 38
 use Symfony\Component\EventDispatcher\EventDispatcher;
Please login to merge, or discard this patch.
src/Eccube/Doctrine/ORM/Mapping/Driver/ReloadSafeAnnotationDriver.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
         }
73 73
 
74 74
         foreach ($this->paths as $path) {
75
-            if ( ! is_dir($path)) {
75
+            if (!is_dir($path)) {
76 76
                 throw MappingException::fileMappingDriversRequireConfiguredDirectoryPath($path);
77 77
             }
78 78
 
@@ -81,14 +81,14 @@  discard block
 block discarded – undo
81 81
                     new \RecursiveDirectoryIterator($path, \FilesystemIterator::SKIP_DOTS),
82 82
                     \RecursiveIteratorIterator::LEAVES_ONLY
83 83
                 ),
84
-                '/^.+' . preg_quote($this->fileExtension) . '$/i',
84
+                '/^.+'.preg_quote($this->fileExtension).'$/i',
85 85
                 \RecursiveRegexIterator::GET_MATCH
86 86
             );
87 87
 
88 88
             foreach ($iterator as $file) {
89 89
                 $sourceFile = $file[0];
90 90
 
91
-                if ( ! preg_match('(^phar:)i', $sourceFile)) {
91
+                if (!preg_match('(^phar:)i', $sourceFile)) {
92 92
                     $sourceFile = realpath($sourceFile);
93 93
                 }
94 94
 
@@ -133,15 +133,15 @@  discard block
 block discarded – undo
133 133
                     $namespaceEndIndex = $tokens->getNextTokenOfKind($namespaceIndex, [';']);
134 134
                     $namespace = $tokens->generatePartialCode($tokens->getNextMeaningfulToken($namespaceIndex), $tokens->getPrevMeaningfulToken($namespaceEndIndex));
135 135
                     $className = $tokens[$classNameTokenIndex]->getContent();
136
-                    $fqcn = $namespace . '\\' . $className;
137
-                    if (class_exists($fqcn) && ! $this->isTransient($fqcn)) {
136
+                    $fqcn = $namespace.'\\'.$className;
137
+                    if (class_exists($fqcn) && !$this->isTransient($fqcn)) {
138 138
                         if (in_array($sourceFile, $this->newProxyFiles)) {
139
-                            $newClassName = $className . StringUtil::random(12);
139
+                            $newClassName = $className.StringUtil::random(12);
140 140
                             $tokens[$classNameTokenIndex] = new Token([T_STRING, $newClassName]);
141 141
                             $newFilePath = $this->outputDir."${newClassName}.php";
142 142
                             file_put_contents($newFilePath, $tokens->generateCode());
143 143
                             require_once $newFilePath;
144
-                            $results[] = $namespace . "\\${newClassName}";
144
+                            $results[] = $namespace."\\${newClassName}";
145 145
                         } else {
146 146
                             $results[] = $fqcn;
147 147
                         }
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Setting/System/SecurityController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
                     } else {
94 94
                         // httpから変更されたらfalseのまま
95 95
                         $config['force_ssl'] = Constant::DISABLED;
96
-                        $data['force_ssl'] = (bool)Constant::DISABLED;
96
+                        $data['force_ssl'] = (bool) Constant::DISABLED;
97 97
                     }
98 98
                 } else {
99 99
                     $config['force_ssl'] = Constant::DISABLED;
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
             if (count($allowHost) > 0) {
139 139
                 $form->get('admin_allow_hosts')->setData(StringUtil::convertLineFeed(implode("\n", $allowHost)));
140 140
             }
141
-            $form->get('force_ssl')->setData((bool)$this->appConfig['force_ssl']);
141
+            $form->get('force_ssl')->setData((bool) $this->appConfig['force_ssl']);
142 142
         }
143 143
 
144 144
         return [
Please login to merge, or discard this patch.
src/Eccube/Service/SchemaService.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@
 block discarded – undo
44 44
 
45 45
     public function updateSchema($generatedFiles, $proxiesDirectory)
46 46
     {
47
-        $outputDir = sys_get_temp_dir() . '/proxy_' . StringUtil::random(12);
47
+        $outputDir = sys_get_temp_dir().'/proxy_'.StringUtil::random(12);
48 48
         mkdir($outputDir);
49 49
 
50 50
         try {
Please login to merge, or discard this patch.
src/Eccube/Util/StringUtil.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
             return $value;
160 160
         }
161 161
 
162
-        return rtrim(mb_substr($value, 0, $length, 'UTF-8')) . $end;
162
+        return rtrim(mb_substr($value, 0, $length, 'UTF-8')).$end;
163 163
     }
164 164
 
165 165
 
@@ -186,18 +186,18 @@  discard block
 block discarded – undo
186 186
         }
187 187
         if ($diff->m == 1 || $diff->days > 0) {
188 188
             if ($diff->days <= 31) {
189
-                return $diff->days . '日前';
189
+                return $diff->days.'日前';
190 190
             }
191 191
             // return $date->format("Y/m/d H:i");
192 192
             return $date->format("Y/m/d");
193 193
         }
194 194
         if ($diff->h > 0) {
195
-            return $diff->h . "時間前";
195
+            return $diff->h."時間前";
196 196
         }
197 197
         if ($diff->i > 0) {
198
-            return $diff->i . "分前";
198
+            return $diff->i."分前";
199 199
         }
200
-        return $diff->s . "秒前";
200
+        return $diff->s."秒前";
201 201
     }
202 202
 
203 203
     /**
Please login to merge, or discard this patch.
src/Eccube/ServiceProvider/ComposerServiceProvider.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@
 block discarded – undo
38 38
      */
39 39
     public function register(Container $app)
40 40
     {
41
-        $app['eccube.service.composer'] = function () use ($app) {
41
+        $app['eccube.service.composer'] = function() use ($app) {
42 42
             /**@var \Eccube\Service\SystemService $systemService */
43 43
             $systemService = $app['eccube.service.system'];
44 44
             $composerMemory = $app['config']['composer_memory_limit'];
Please login to merge, or discard this patch.
src/Eccube/Service/Composer/ComposerApiService.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -234,7 +234,7 @@
 block discarded – undo
234 234
 
235 235
     /**
236 236
      * Get mode
237
-     * @return mixed|string
237
+     * @return string
238 238
      */
239 239
     public function getMode()
240 240
     {
Please login to merge, or discard this patch.
src/Eccube/Service/Composer/ComposerProcessService.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -275,7 +275,7 @@
 block discarded – undo
275 275
 
276 276
     /**
277 277
      * Get mode
278
-     * @return mixed|string
278
+     * @return string
279 279
      */
280 280
     public function getMode()
281 281
     {
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -269,7 +269,7 @@
 block discarded – undo
269 269
     public function composerVersion()
270 270
     {
271 271
         $this->init();
272
-        $command = $this->pathPHP . ' ' . $this->composerFile . ' -V';
272
+        $command = $this->pathPHP.' '.$this->composerFile.' -V';
273 273
         return exec($command);
274 274
     }
275 275
 
Please login to merge, or discard this patch.