Completed
Pull Request — experimental/3.1 (#2643)
by
unknown
21:16
created
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/Controller/Admin/Customer/CustomerDeliveryEditController.php 1 patch
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -26,12 +26,10 @@
 block discarded – undo
26 26
 use Doctrine\ORM\EntityManager;
27 27
 use Eccube\Annotation\Inject;
28 28
 use Eccube\Application;
29
-use Eccube\Common\Constant;
30 29
 use Eccube\Controller\AbstractController;
31 30
 use Eccube\Entity\CustomerAddress;
32 31
 use Eccube\Event\EccubeEvents;
33 32
 use Eccube\Event\EventArgs;
34
-use Eccube\Form\Type\Admin\CustomerType;
35 33
 use Eccube\Repository\CustomerRepository;
36 34
 use Eccube\Repository\CustomerAddressRepository;
37 35
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
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
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.
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.