EC-CUBE / ec-cube

src/Eccube/Service/PluginService.php

Unused Use Statements -1 removed lines

@@ -31,7 +31,6 @@
 use Eccube\Common\Constant;
 use Eccube\Entity\Plugin;
 use Eccube\Exception\PluginException;
-use Eccube\Plugin\ConfigManager;
 use Eccube\Plugin\ConfigManager as PluginConfigManager;
 use Eccube\Repository\PluginEventHandlerRepository;
 use Eccube\Repository\PluginRepository;

Spacing +3 added lines, -3 removed lines

@@ -165,7 +165,7 @@ 
     {
         // Proxyのクラスをロードせずにスキーマを更新するために、
         // インストール時には一時的なディレクトリにProxyを生成する
-        $tmpProxyOutputDir = sys_get_temp_dir() . '/proxy_' . Str::random(12);
+        $tmpProxyOutputDir = sys_get_temp_dir().'/proxy_'.Str::random(12);
         @mkdir($tmpProxyOutputDir);
 
         try {
@@ -231,7 +231,7 @@ 
             if (!empty($config_cache)) {
                 $meta = $config_cache;
             } else {
-                $meta = $this->readYml($dir . '/config.yml');
+                $meta = $this->readYml($dir.'/config.yml');
             }
         } catch (\Symfony\Component\Yaml\Exception\ParseException $e) {
             throw new PluginException($e->getMessage(), $e->getCode(), $e);
@@ -821,7 +821,7 @@ 
     {
         $result = array_keys($packages);
         if ($getVersion) {
-            $result = array_map(function ($package, $version) {
+            $result = array_map(function($package, $version) {
                 return $package.':'.$version;
             }, array_keys($packages), array_values($packages));
         }

Doc Comments +21 added lines, -1 removed lines

@@ -114,7 +114,7 @@ 
      *
      * @param string $path   path to tar.gz/zip plugin file
      * @param int    $source
-     * @return mixed
+     * @return boolean
      * @throws PluginException
      * @throws \Exception
      */
@@ -177,6 +177,10 @@ 
     }
 
     // インストール事後処理
+
+    /**
+     * @param integer $source
+     */
     public function postInstall($config, $event, $source)
     {
         // Proxyのクラスをロードせずにスキーマを更新するために、
@@ -223,6 +227,10 @@ 
         }
     }
 
+    /**
+     * @param string $archive
+     * @param string $dir
+     */
     public function unpackPluginArchive($archive, $dir)
     {
         $extension = pathinfo($archive, PATHINFO_EXTENSION);
@@ -282,6 +290,9 @@ 
         }
     }
 
+    /**
+     * @param string $yml
+     */
     public function readYml($yml)
     {
         if (file_exists($yml)) {
@@ -299,6 +310,9 @@ 
         // ディレクトリ名などに使われれるので厳しめ
     }
 
+    /**
+     * @param string $path
+     */
     public function deleteFile($path)
     {
         $f = new Filesystem();
@@ -318,6 +332,9 @@ 
         return $this->appConfig['plugin_realdir'].'/'.$name;
     }
 
+    /**
+     * @param string $d
+     */
     public function createPluginDir($d)
     {
         $b = @mkdir($d);
@@ -375,6 +392,9 @@ 
         return $p;
     }
 
+    /**
+     * @param string $method
+     */
     public function callPluginManagerMethod($meta, $method)
     {
         $class = '\\Plugin'.'\\'.$meta['code'].'\\'.'PluginManager';

src/Eccube/Doctrine/ORM/Mapping/Driver/ReloadSafeAnnotationDriver.php

Spacing +7 added lines, -7 removed lines

@@ -72,7 +72,7 @@ 
         }
 
         foreach ($this->paths as $path) {
-            if ( ! is_dir($path)) {
+            if (!is_dir($path)) {
                 throw MappingException::fileMappingDriversRequireConfiguredDirectoryPath($path);
             }
 
@@ -81,14 +81,14 @@ 
                     new \RecursiveDirectoryIterator($path, \FilesystemIterator::SKIP_DOTS),
                     \RecursiveIteratorIterator::LEAVES_ONLY
                 ),
-                '/^.+' . preg_quote($this->fileExtension) . '$/i',
+                '/^.+'.preg_quote($this->fileExtension).'$/i',
                 \RecursiveRegexIterator::GET_MATCH
             );
 
             foreach ($iterator as $file) {
                 $sourceFile = $file[0];
 
-                if ( ! preg_match('(^phar:)i', $sourceFile)) {
+                if (!preg_match('(^phar:)i', $sourceFile)) {
                     $sourceFile = realpath($sourceFile);
                 }
 
@@ -133,15 +133,15 @@ 
                     $namespaceEndIndex = $tokens->getNextTokenOfKind($namespaceIndex, [';']);
                     $namespace = $tokens->generatePartialCode($tokens->getNextMeaningfulToken($namespaceIndex), $tokens->getPrevMeaningfulToken($namespaceEndIndex));
                     $className = $tokens[$classNameTokenIndex]->getContent();
-                    $fqcn = $namespace . '\\' . $className;
-                    if (class_exists($fqcn) && ! $this->isTransient($fqcn)) {
+                    $fqcn = $namespace.'\\'.$className;
+                    if (class_exists($fqcn) && !$this->isTransient($fqcn)) {
                         if (in_array($sourceFile, $this->newProxyFiles)) {
-                            $newClassName = $className . Str::random(12);
+                            $newClassName = $className.Str::random(12);
                             $tokens[$classNameTokenIndex] = new Token([T_STRING, $newClassName]);
                             $newFilePath = $this->outputDir."${newClassName}.php";
                             file_put_contents($newFilePath, $tokens->generateCode());
                             require_once $newFilePath;
-                            $results[] = $namespace . "\\${newClassName}";
+                            $results[] = $namespace."\\${newClassName}";
                         } else {
                             $results[] = $fqcn;
                         }

src/Eccube/Controller/Mypage/WithdrawController.php

Unused Use Statements -2 removed lines

@@ -27,14 +27,12 @@
 use Doctrine\ORM\EntityManager;
 use Eccube\Annotation\Inject;
 use Eccube\Application;
-use Eccube\Common\Constant;
 use Eccube\Controller\AbstractController;
 use Eccube\Entity\Master\CustomerStatus;
 use Eccube\Event\EccubeEvents;
 use Eccube\Event\EventArgs;
 use Eccube\Repository\Master\CustomerStatusRepository;
 use Eccube\Service\MailService;
-use Eccube\Util\Str;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 use Symfony\Component\EventDispatcher\EventDispatcher;

src/Eccube/Controller/Install/InstallController.php

Doc Comments +3 added lines

@@ -420,6 +420,9 @@
         $session->set('eccube.session.install', $data);
     }
 
+    /**
+     * @param InstallApplication $app
+     */
     private function checkModules($app)
     {
         foreach ($this->requiredModules as $module) {

Spacing +1 added lines, -1 removed lines

@@ -214,7 +214,7 @@
 
                 // ロードバランサ, プロキシサーバ
                 if (!empty($config['trusted_proxies_connection_only'])) {
-                    $sessionData['trusted_proxies_connection_only'] = (bool)$config['trusted_proxies_connection_only'];
+                    $sessionData['trusted_proxies_connection_only'] = (bool) $config['trusted_proxies_connection_only'];
                 }
                 if (!empty($config['trusted_proxies'])) {
                     $sessionData['trusted_proxies'] = Str::convertLineFeed(implode("\n",

eccube_install.php

Spacing +5 added lines, -5 removed lines

@@ -400,15 +400,15 @@
     foreach ($finder as $content) {
         $permission = $content->getPerms();
         // see also http://www.php.net/fileperms
-        if (!($permission & 0x0010) || !($permission & 0x0002)) {
+        if (!($permission&0x0010) || !($permission&0x0002)) {
             $realPath = $content->getRealPath();
             if ($verbose) {
                 out(sprintf('%s %s to ', $realPath, substr(sprintf('%o', $permission), -4)), 'info', false);
             }
-            $permission = !($permission & 0x0020) ? $permission += 040 : $permission; // g+r
-            $permission = !($permission & 0x0010) ? $permission += 020 : $permission; // g+w
-            $permission = !($permission & 0x0004) ? $permission += 04 : $permission;  // o+r
-            $permission = !($permission & 0x0002) ? $permission += 02 : $permission;  // o+w
+            $permission = !($permission&0x0020) ? $permission += 040 : $permission; // g+r
+            $permission = !($permission&0x0010) ? $permission += 020 : $permission; // g+w
+            $permission = !($permission&0x0004) ? $permission += 04 : $permission; // o+r
+            $permission = !($permission&0x0002) ? $permission += 02 : $permission; // o+w
             $result = chmod($realPath, $permission);
             if ($verbose) {
                 if ($result) {

src/Eccube/Controller/Admin/Setting/System/SecurityController.php

Spacing +2 added lines, -2 removed lines

@@ -95,7 +95,7 @@ 
                     } else {
                         // httpから変更されたらfalseのまま
                         $config['force_ssl'] = Constant::DISABLED;
-                        $data['force_ssl'] = (bool)Constant::DISABLED;
+                        $data['force_ssl'] = (bool) Constant::DISABLED;
                     }
                 } else {
                     $config['force_ssl'] = Constant::DISABLED;
@@ -140,7 +140,7 @@ 
             if (count($allowHost) > 0) {
                 $form->get('admin_allow_hosts')->setData(Str::convertLineFeed(implode("\n", $allowHost)));
             }
-            $form->get('force_ssl')->setData((bool)$this->appConfig['force_ssl']);
+            $form->get('force_ssl')->setData((bool) $this->appConfig['force_ssl']);
         }
 
         return [

src/Eccube/Form/Type/Admin/SecurityType.php

Indentation +2 added lines, -2 removed lines

@@ -77,8 +77,8 @@
                     new Assert\NotBlank(),
                     new Assert\Length(array('max' => $this->appConfig['stext_len'])),
                     new Assert\Regex(array(
-                       'pattern' => "/^[0-9a-zA-Z]+$/",
-                   )),
+                        'pattern' => "/^[0-9a-zA-Z]+$/",
+                    )),
                 ),
             ))
             ->add('admin_allow_hosts', TextareaType::class, array(

Spacing +3 added lines, -3 removed lines

@@ -92,19 +92,19 @@
                 'label' => 'SSLを強制',
                 'required' => false,
             ))
-            ->addEventListener(FormEvents::POST_SUBMIT, function ($event) use($app) {
+            ->addEventListener(FormEvents::POST_SUBMIT, function($event) use($app) {
                 $form = $event->getForm();
                 $data = $form->getData();
 
                 $ips = preg_split("/\R/", $data['admin_allow_hosts'], null, PREG_SPLIT_NO_EMPTY);
 
-                foreach($ips as $ip) {
+                foreach ($ips as $ip) {
                     $errors = $this->recursiveValidator->validate($ip, array(
                             new Assert\Ip(),
                         )
                     );
                     if ($errors->count() != 0) {
-                        $form['admin_allow_hosts']->addError(new FormError($ip . 'はIPv4アドレスではありません。'));
+                        $form['admin_allow_hosts']->addError(new FormError($ip.'はIPv4アドレスではありません。'));
                     }
                 }
             })

src/Eccube/Resource/config/log.php

Indentation +14 added lines, -14 removed lines

@@ -1,6 +1,6 @@ 
 <?php return [
-  'log' => 
-  [
+    'log' => 
+    [
     'suffix' => null,
     'filename' => 'site',
     'delimiter' => '_',
@@ -13,8 +13,8 @@ 
     'log_format' => '[%datetime%] %channel%.%level_name% [%session_id%] [%uid%] [%user_id%] [%class%:%function%:%line%] - %message% %context% %extra% [%method%, %url%, %ip%, %referrer%, %user_agent%]',
     'channel' => 
     [
-      'monolog' => 
-      [
+        'monolog' => 
+        [
         'name' => 'eccube',
         'filename' => 'site',
         'delimiter' => '_',
@@ -25,9 +25,9 @@ 
         'max_files' => 90,
         'log_dateformat' => 'Y-m-d H:i:s,u',
         'log_format' => '[%datetime%] %channel%.%level_name% [%session_id%] [%uid%] [%user_id%] [%class%:%function%:%line%] - %message% %context% %extra% [%method%, %url%, %ip%, %referrer%, %user_agent%]',
-      ],
-      'front' => 
-      [
+        ],
+        'front' => 
+        [
         'name' => 'front',
         'filename' => 'front_site',
         'delimiter' => '_',
@@ -38,9 +38,9 @@ 
         'max_files' => 90,
         'log_dateformat' => 'Y-m-d H:i:s,u',
         'log_format' => '[%datetime%] %channel%.%level_name% [%session_id%] [%uid%] [%user_id%] [%class%:%function%:%line%] - %message% %context% %extra% [%method%, %url%, %ip%, %referrer%, %user_agent%]',
-      ],
-      'admin' => 
-      [
+        ],
+        'admin' => 
+        [
         'name' => 'admin',
         'filename' => 'admin_site',
         'delimiter' => '_',
@@ -51,12 +51,12 @@ 
         'max_files' => 90,
         'log_dateformat' => 'Y-m-d H:i:s,u',
         'log_format' => '[%datetime%] %channel%.%level_name% [%session_id%] [%uid%] [%user_id%] [%class%:%function%:%line%] - %message% %context% %extra% [%method%, %url%, %ip%, %referrer%, %user_agent%]',
-      ],
+        ],
     ],
     'exclude_keys' => 
     [
-      'password',
-      'app',
+        'password',
+        'app',
+    ],
     ],
-  ],
 ];

src/Eccube/Resource/config/doctrine_cache.php

Indentation +25 added lines, -25 removed lines

@@ -1,39 +1,39 @@
 <?php return [
-  'doctrine_cache' => 
-  [
+    'doctrine_cache' => 
+    [
     'metadata_cache' => 
     [
-      'driver' => 'array',
-      'path' => null,
-      'host' => null,
-      'port' => null,
-      'password' => null,
+        'driver' => 'array',
+        'path' => null,
+        'host' => null,
+        'port' => null,
+        'password' => null,
     ],
     'query_cache' => 
     [
-      'driver' => 'array',
-      'path' => null,
-      'host' => null,
-      'port' => null,
-      'password' => null,
+        'driver' => 'array',
+        'path' => null,
+        'host' => null,
+        'port' => null,
+        'password' => null,
     ],
     'result_cache' => 
     [
-      'driver' => 'array',
-      'path' => null,
-      'host' => null,
-      'port' => null,
-      'password' => null,
-      'lifetime' => 3600,
-      'clear_cache' => true,
+        'driver' => 'array',
+        'path' => null,
+        'host' => null,
+        'port' => null,
+        'password' => null,
+        'lifetime' => 3600,
+        'clear_cache' => true,
     ],
     'hydration_cache' => 
     [
-      'driver' => 'array',
-      'path' => null,
-      'host' => null,
-      'port' => null,
-      'password' => null,
+        'driver' => 'array',
+        'path' => null,
+        'host' => null,
+        'port' => null,
+        'password' => null,
+    ],
     ],
-  ],
 ];