Completed
Pull Request — experimental/3.1 (#2561)
by k-yamamura
222:41 queued 215:24
created
src/Eccube/Form/Type/Admin/PageType.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@
 block discarded – undo
46 46
                 'label' => false,
47 47
                 'class' => 'Eccube\Entity\Page',
48 48
                 'choice_label' => 'name',
49
-                'query_builder' => function (EntityRepository $er) {
49
+                'query_builder' => function(EntityRepository $er) {
50 50
                     return $er
51 51
                         ->createQueryBuilder('l')
52 52
                         ->where('l.id <> 0')
Please login to merge, or discard this patch.
src/Eccube/Service/Calculator/Strategy/CalculateDeliveryFeeStrategy.php 1 patch
Unused Use Statements   -4 removed lines patch added patch discarded remove patch
@@ -2,13 +2,9 @@
 block discarded – undo
2 2
 namespace Eccube\Service\Calculator\Strategy;
3 3
 
4 4
 use Eccube\Application;
5
-use Eccube\Entity\Master\OrderItemType;
6
-use Eccube\Entity\Master\TaxType;
7
-use Eccube\Entity\Master\TaxDisplayType;
8 5
 use Eccube\Entity\Order;
9 6
 use Eccube\Entity\PurchaseInterface;
10 7
 use Eccube\Entity\OrderItem;
11
-use Eccube\Entity\Shipping;
12 8
 use Eccube\Repository\Master\OrderItemTypeRepository;
13 9
 use Eccube\Service\Calculator\OrderItemCollection;
14 10
 
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Admin/OrderType.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -256,7 +256,7 @@  discard block
 block discarded – undo
256 256
                 )));
257 257
 
258 258
         // 選択された支払い方法の名称をエンティティにコピーする
259
-        $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
259
+        $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) {
260 260
             $Order = $event->getData();
261 261
             $Payment = $Order->getPayment();
262 262
             if (!is_null($Payment)) {
@@ -264,7 +264,7 @@  discard block
 block discarded – undo
264 264
             }
265 265
         });
266 266
         // 会員受注の場合、会員の性別/職業/誕生日をエンティティにコピーする
267
-        $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
267
+        $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) {
268 268
             $Order = $event->getData();
269 269
             $Customer = $Order->getCustomer();
270 270
             if (!is_null($Customer)) {
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 . Str::random(12);
139
+                            $newClassName = $className.Str::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/Shop/DeliveryController.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -27,7 +27,6 @@
 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\Delivery;
33 32
 use Eccube\Event\EccubeEvents;
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\Str;
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/Controller/Install/InstallController.php 3 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -420,6 +420,9 @@
 block discarded – undo
420 420
         $session->set('eccube.session.install', $data);
421 421
     }
422 422
 
423
+    /**
424
+     * @param InstallApplication $app
425
+     */
423 426
     private function checkModules($app)
424 427
     {
425 428
         foreach ($this->requiredModules as $module) {
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -214,7 +214,7 @@
 block discarded – undo
214 214
 
215 215
                 // ロードバランサ, プロキシサーバ
216 216
                 if (!empty($config['trusted_proxies_connection_only'])) {
217
-                    $sessionData['trusted_proxies_connection_only'] = (bool)$config['trusted_proxies_connection_only'];
217
+                    $sessionData['trusted_proxies_connection_only'] = (bool) $config['trusted_proxies_connection_only'];
218 218
                 }
219 219
                 if (!empty($config['trusted_proxies'])) {
220 220
                     $sessionData['trusted_proxies'] = Str::convertLineFeed(implode("\n",
Please login to merge, or discard this patch.
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -40,7 +40,6 @@
 block discarded – undo
40 40
 use Eccube\InstallApplication;
41 41
 use Eccube\Security\Core\Encoder\PasswordEncoder;
42 42
 use Eccube\Util\Str;
43
-use Symfony\Component\Dotenv\Dotenv;
44 43
 use Symfony\Component\Filesystem\Filesystem;
45 44
 use Symfony\Component\Finder\Finder;
46 45
 use Symfony\Component\HttpFoundation\Request;
Please login to merge, or discard this patch.
eccube_install.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -400,15 +400,15 @@
 block discarded – undo
400 400
     foreach ($finder as $content) {
401 401
         $permission = $content->getPerms();
402 402
         // see also http://www.php.net/fileperms
403
-        if (!($permission & 0x0010) || !($permission & 0x0002)) {
403
+        if (!($permission&0x0010) || !($permission&0x0002)) {
404 404
             $realPath = $content->getRealPath();
405 405
             if ($verbose) {
406 406
                 out(sprintf('%s %s to ', $realPath, substr(sprintf('%o', $permission), -4)), 'info', false);
407 407
             }
408
-            $permission = !($permission & 0x0020) ? $permission += 040 : $permission; // g+r
409
-            $permission = !($permission & 0x0010) ? $permission += 020 : $permission; // g+w
410
-            $permission = !($permission & 0x0004) ? $permission += 04 : $permission;  // o+r
411
-            $permission = !($permission & 0x0002) ? $permission += 02 : $permission;  // o+w
408
+            $permission = !($permission&0x0020) ? $permission += 040 : $permission; // g+r
409
+            $permission = !($permission&0x0010) ? $permission += 020 : $permission; // g+w
410
+            $permission = !($permission&0x0004) ? $permission += 04 : $permission; // o+r
411
+            $permission = !($permission&0x0002) ? $permission += 02 : $permission; // o+w
412 412
             $result = chmod($realPath, $permission);
413 413
             if ($verbose) {
414 414
                 if ($result) {
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
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
                     } else {
96 96
                         // httpから変更されたらfalseのまま
97 97
                         $config['force_ssl'] = Constant::DISABLED;
98
-                        $data['force_ssl'] = (bool)Constant::DISABLED;
98
+                        $data['force_ssl'] = (bool) Constant::DISABLED;
99 99
                     }
100 100
                 } else {
101 101
                     $config['force_ssl'] = Constant::DISABLED;
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
             if (count($allowHost) > 0) {
141 141
                 $form->get('admin_allow_hosts')->setData(Str::convertLineFeed(implode("\n", $allowHost)));
142 142
             }
143
-            $form->get('force_ssl')->setData((bool)$this->appConfig['force_ssl']);
143
+            $form->get('force_ssl')->setData((bool) $this->appConfig['force_ssl']);
144 144
         }
145 145
 
146 146
         return [
Please login to merge, or discard this patch.