Completed
Pull Request — experimental/3.1 (#2674)
by
unknown
29:06 queued 02:39
created
src/Eccube/Service/ShoppingService.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -952,7 +952,7 @@
 block discarded – undo
952 952
 
953 953
         // 配送日数が設定されている
954 954
         if ($deliveryDurationFlag) {
955
-            $period = new \DatePeriod (
955
+            $period = new \DatePeriod(
956 956
                 new \DateTime($minDate.' day'),
957 957
                 new \DateInterval('P1D'),
958 958
                 new \DateTime($minDate + $this->appConfig['deliv_date_end_max'].' day')
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Shopping/ShippingType.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
         // 配送業者のプルダウンを生成
68 68
         $builder->addEventListener(
69 69
             FormEvents::PRE_SET_DATA,
70
-            function (FormEvent $event) {
70
+            function(FormEvent $event) {
71 71
                 /* @var Shipping $Shipping */
72 72
                 $Shipping = $event->getData();
73 73
                 if (is_null($Shipping) || !$Shipping->getId()) {
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
         // お届け日のプルダウンを生成
110 110
         $builder->addEventListener(
111 111
             FormEvents::PRE_SET_DATA,
112
-            function (FormEvent $event) {
112
+            function(FormEvent $event) {
113 113
                 $Shipping = $event->getData();
114 114
                 if (is_null($Shipping) || !$Shipping->getId()) {
115 115
                     return;
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
 
148 148
                 // 配送日数が設定されている
149 149
                 if ($deliveryDurationFlag) {
150
-                    $period = new \DatePeriod (
150
+                    $period = new \DatePeriod(
151 151
                         new \DateTime($minDate.' day'),
152 152
                         new \DateInterval('P1D'),
153 153
                         new \DateTime($minDate + $this->appConfig['deliv_date_end_max'].' day')
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
175 175
         // お届け時間のプルダウンを生成
176 176
         $builder->addEventListener(
177 177
             FormEvents::PRE_SET_DATA,
178
-            function (FormEvent $event) {
178
+            function(FormEvent $event) {
179 179
                 $Shipping = $event->getData();
180 180
                 if (is_null($Shipping) || !$Shipping->getId()) {
181 181
                     return;
Please login to merge, or discard this patch.
src/Eccube/Form/Type/MasterType.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
             'expanded' => false,
47 47
             'required' => false,
48 48
             'placeholder' => false,
49
-            'query_builder' => function (EntityRepository $er) {
49
+            'query_builder' => function(EntityRepository $er) {
50 50
                 return $er->createQueryBuilder('m')
51 51
                     ->orderBy('m.sort_no', 'ASC');
52 52
             },
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Content/FileController.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
     private $error = null;
63 63
     private $encode = '';
64 64
 
65
-    public function __construct(){
65
+    public function __construct() {
66 66
         $this->encode = self::UTF;
67 67
         if ('\\' === DIRECTORY_SEPARATOR) {
68 68
             $this->encode = self::SJIS;
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
         $arrFileList = $this->getFileList($app, $nowDir);
112 112
 
113 113
         $javascript = $this->getJsArrayList($tree);
114
-        $onload = "eccube.fileManager.viewFileTree('tree', arrTree, '" . $nowDir . "', 'tree_select_file', 'tree_status', 'move');";
114
+        $onload = "eccube.fileManager.viewFileTree('tree', arrTree, '".$nowDir."', 'tree_select_file', 'tree_status', 'move');";
115 115
 
116 116
         return [
117 117
             'form' => $form->createView(),
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
172 172
                 $nowDir = $this->checkDir($request->get('now_dir'), $topDir)
173 173
                     ? $this->normalizePath($request->get('now_dir'))
174 174
                     : $topDir;
175
-                $fs->mkdir($nowDir . '/' . $filename);
175
+                $fs->mkdir($nowDir.'/'.$filename);
176 176
             }
177 177
         }
178 178
     }
@@ -257,7 +257,7 @@  discard block
 block discarded – undo
257 257
     {
258 258
         $str = "arrTree = new Array();\n";
259 259
         foreach ($tree as $key => $val) {
260
-            $str .= 'arrTree[' . $key . "] = new Array(" . $key . ", '" . $val['type'] . "', '" . $val['path'] . "', " . $val['sort_no'] . ',';
260
+            $str .= 'arrTree['.$key."] = new Array(".$key.", '".$val['type']."', '".$val['path']."', ".$val['sort_no'].',';
261 261
             if ($val['open']) {
262 262
                 $str .= "true);\n";
263 263
             } else {
@@ -308,7 +308,7 @@  discard block
 block discarded – undo
308 308
     private function getFileList($app, $nowDir)
309 309
     {
310 310
         $topDir = $this->appConfig['user_data_realdir'];
311
-        $filter = function (\SplFileInfo $file) use ($topDir) {
311
+        $filter = function(\SplFileInfo $file) use ($topDir) {
312 312
             $acceptPath = realpath($topDir);
313 313
             $targetPath = $file->getRealPath();
314 314
             return (strpos($targetPath, $acceptPath) === 0);
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
@@ -172,7 +172,7 @@
 block discarded – undo
172 172
                 $entity = new $entityName();
173 173
                 $sortNo = 0;
174 174
                 $ids = array_map(
175
-                    function ($v) {
175
+                    function($v) {
176 176
                         return $v['id'];
177 177
                     },
178 178
                     $data['data']
Please login to merge, or discard this patch.
src/Eccube/Command/CacheClearCommand.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@
 block discarded – undo
52 52
 
53 53
         $this->app = $this->getSilexApplication();
54 54
         
55
-        \Eccube\Util\CacheUtil::clear($this->app,$input->getOption('all'));
55
+        \Eccube\Util\CacheUtil::clear($this->app, $input->getOption('all'));
56 56
         $output->writeln(sprintf("%s <info>success</info>", 'cache:clear'));
57 57
 
58 58
     }
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/Controller/Install/InstallController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -212,7 +212,7 @@
 block discarded – undo
212 212
 
213 213
                 // ロードバランサ, プロキシサーバ
214 214
                 if (!empty($config['trusted_proxies_connection_only'])) {
215
-                    $sessionData['trusted_proxies_connection_only'] = (bool)$config['trusted_proxies_connection_only'];
215
+                    $sessionData['trusted_proxies_connection_only'] = (bool) $config['trusted_proxies_connection_only'];
216 216
                 }
217 217
                 if (!empty($config['trusted_proxies'])) {
218 218
                     $sessionData['trusted_proxies'] = StringUtil::convertLineFeed(implode("\n",
Please login to merge, or discard this patch.