EC-CUBE / ec-cube

src/Eccube/Controller/Install/InstallController.php

Doc Comments +3 added lines

@@ -250,6 +250,9 @@
     }
 
 
+    /**
+     * @param InstallApplication $app
+     */
     private function checkModules($app)
     {
         foreach ($this->required_modules as $module) {

Spacing +40 added lines, -40 removed lines

@@ -60,9 +60,9 @@ 
 
     public function __construct()
     {
-        $this->config_path = __DIR__ . '/../../../../app/config/eccube';
-        $this->dist_path = __DIR__ . '/../../Resource/config';
-        $this->cache_path = __DIR__ . '/../../../../app/cache';
+        $this->config_path = __DIR__.'/../../../../app/config/eccube';
+        $this->dist_path = __DIR__.'/../../Resource/config';
+        $this->cache_path = __DIR__.'/../../../../app/cache';
     }
 
     private function isValid(Request $request, Form $form)
@@ -147,7 +147,7 @@ 
 
         if (empty($sessionData['shop_name'])) {
 
-            $config_file = $this->config_path . '/config.yml';
+            $config_file = $this->config_path.'/config.yml';
             $fs = new Filesystem();
 
             if ($fs->exists($config_file)) {
@@ -161,21 +161,21 @@ 
                 }
 
                 // セキュリティの設定
-                $config_file = $this->config_path . '/path.yml';
+                $config_file = $this->config_path.'/path.yml';
                 $config = Yaml::parse(file_get_contents($config_file));
                 $sessionData['admin_dir'] = $config['admin_route'];
 
-                $config_file = $this->config_path . '/config.yml';
+                $config_file = $this->config_path.'/config.yml';
                 $config = Yaml::parse(file_get_contents($config_file));
 
                 $allowHost = $config['admin_allow_host'];
                 if (count($allowHost) > 0) {
                     $sessionData['admin_allow_hosts'] = Str::convertLineFeed(implode("\n", $allowHost));
                 }
-                $sessionData['admin_force_ssl'] = (bool)$config['force_ssl'];
+                $sessionData['admin_force_ssl'] = (bool) $config['force_ssl'];
 
                 // メール設定
-                $config_file = $this->config_path . '/mail.yml';
+                $config_file = $this->config_path.'/mail.yml';
                 $config = Yaml::parse(file_get_contents($config_file));
                 $mail = $config['mail'];
                 $sessionData['mail_backend'] = $mail['transport'];
@@ -285,7 +285,7 @@ 
                 $host = $request->getSchemeAndHttpHost();
                 $basePath = $request->getBasePath();
                 $params = array(
-                    'http_url' => $host . $basePath,
+                    'http_url' => $host.$basePath,
                     'shop_name' => $sessionData['shop_name'],
                 );
 
@@ -306,13 +306,13 @@ 
     //    インストール完了
     public function complete(InstallApplication $app, Request $request)
     {
-        $config_file = $this->config_path . '/path.yml';
+        $config_file = $this->config_path.'/path.yml';
         $config = Yaml::parse(file_get_contents($config_file));
 
         $host = $request->getSchemeAndHttpHost();
         $basePath = $request->getBasePath();
 
-        $adminUrl = $host . $basePath . '/' . $config['admin_dir'];
+        $adminUrl = $host.$basePath.'/'.$config['admin_dir'];
 
         return $app['twig']->render('complete.twig', array(
             'admin_url' => $adminUrl,
@@ -332,17 +332,17 @@ 
     {
         foreach ($this->required_modules as $module) {
             if (!extension_loaded($module)) {
-                $app->addDanger('[必須] ' . $module . ' 拡張モジュールが有効になっていません。', 'install');
+                $app->addDanger('[必須] '.$module.' 拡張モジュールが有効になっていません。', 'install');
             }
         }
 
         if (!extension_loaded('pdo_mysql') && !extension_loaded('pdo_pgsql')) {
-            $app->addDanger('[必須] ' . 'pdo_pgsql又はpdo_mysql 拡張モジュールを有効にしてください。', 'install');
+            $app->addDanger('[必須] '.'pdo_pgsql又はpdo_mysql 拡張モジュールを有効にしてください。', 'install');
         }
 
         foreach ($this->recommended_module as $module) {
             if (!extension_loaded($module)) {
-                $app->addWarning('[推奨] ' . $module . ' 拡張モジュールが有効になっていません。', 'install');
+                $app->addWarning('[推奨] '.$module.' 拡張モジュールが有効になっていません。', 'install');
             }
         }
 
@@ -360,7 +360,7 @@ 
             if (!function_exists('apache_get_modules')) {
                 $app->addWarning('mod_rewrite が有効になっているか不明です。', 'install');
             } elseif (!in_array('mod_rewrite', apache_get_modules())) {
-                $app->addDanger('[必須] ' . 'mod_rewriteを有効にしてください。', 'install');
+                $app->addDanger('[必須] '.'mod_rewriteを有効にしてください。', 'install');
             }
         } elseif (isset($_SERVER['SERVER_SOFTWARE']) && strpos('Microsoft-IIS', $_SERVER['SERVER_SOFTWARE']) !== false) {
             // iis
@@ -371,7 +371,7 @@ 
 
     private function setPDO()
     {
-        $config_file = $this->config_path . '/database.yml';
+        $config_file = $this->config_path.'/database.yml';
         $config = Yaml::parse(file_get_contents($config_file));
 
         try {
@@ -406,7 +406,7 @@ 
      */
     private function getEntityManager()
     {
-        $config_file = $this->config_path . '/database.yml';
+        $config_file = $this->config_path.'/database.yml';
         $database = Yaml::parse(file_get_contents($config_file));
 
         $this->app->register(new \Silex\Provider\DoctrineServiceProvider(), array(
@@ -414,15 +414,15 @@ 
         ));
 
         $this->app->register(new \Dflydev\Silex\Provider\DoctrineOrm\DoctrineOrmServiceProvider(), array(
-            'orm.proxies_dir' => __DIR__ . '/../../app/cache/doctrine',
+            'orm.proxies_dir' => __DIR__.'/../../app/cache/doctrine',
             'orm.em.options' => array(
                 'mappings' => array(
                     array(
                         'type' => 'yml',
                         'namespace' => 'Eccube\Entity',
                         'path' => array(
-                            __DIR__ . '/../../Resource/doctrine',
-                            __DIR__ . '/../../Resource/doctrine/master',
+                            __DIR__.'/../../Resource/doctrine',
+                            __DIR__.'/../../Resource/doctrine/master',
                         ),
                     ),
 
@@ -450,11 +450,11 @@ 
     {
         $this->resetNatTimer();
 
-        $config_file = $this->config_path . '/database.yml';
+        $config_file = $this->config_path.'/database.yml';
         $database = Yaml::parse(file_get_contents($config_file));
         $config['database'] = $database['database'];
 
-        $config_file = $this->config_path . '/config.yml';
+        $config_file = $this->config_path.'/config.yml';
         $baseConfig = Yaml::parse(file_get_contents($config_file));
         $config['config'] = $baseConfig;
 
@@ -510,11 +510,11 @@ 
     {
         $this->resetNatTimer();
 
-        $config_file = $this->config_path . '/database.yml';
+        $config_file = $this->config_path.'/database.yml';
         $database = Yaml::parse(file_get_contents($config_file));
         $config['database'] = $database['database'];
 
-        $config_file = $this->config_path . '/config.yml';
+        $config_file = $this->config_path.'/config.yml';
         $baseConfig = Yaml::parse(file_get_contents($config_file));
         $config['config'] = $baseConfig;
 
@@ -579,7 +579,7 @@ 
         $config = new Configuration($app['db']);
         $config->setMigrationsNamespace('DoctrineMigrations');
 
-        $migrationDir = __DIR__ . '/../../Resource/doctrine/migration';
+        $migrationDir = __DIR__.'/../../Resource/doctrine/migration';
         $config->setMigrationsDirectory($migrationDir);
         $config->registerMigrationsFromDirectory($migrationDir);
 
@@ -610,7 +610,7 @@ 
     private function getProtectedDirs()
     {
         $protectedDirs = array();
-        $base = __DIR__ . '/../../../..';
+        $base = __DIR__.'/../../../..';
         $dirs = array(
             '/html',
             '/app',
@@ -623,7 +623,7 @@ 
         );
 
         foreach ($dirs as $dir) {
-            if (!is_writable($base . $dir)) {
+            if (!is_writable($base.$dir)) {
                 $protectedDirs[] = $dir;
             }
         }
@@ -634,7 +634,7 @@ 
     private function createConfigYamlFile($data, $auth = true)
     {
         $fs = new Filesystem();
-        $config_file = $this->config_path . '/config.yml';
+        $config_file = $this->config_path.'/config.yml';
 
         if ($fs->exists($config_file)) {
             $config = Yaml::parse(file_get_contents($config_file));
@@ -665,7 +665,7 @@ 
         $content = str_replace(
             $target,
             $replace,
-            file_get_contents($this->dist_path . '/config.yml.dist')
+            file_get_contents($this->dist_path.'/config.yml.dist')
         );
         $fs->dumpFile($config_file, $content);
 
@@ -679,7 +679,7 @@ 
 
     private function addInstallStatus()
     {
-        $config_file = $this->config_path . '/config.yml';
+        $config_file = $this->config_path.'/config.yml';
         $config = Yaml::parse(file_get_contents($config_file));
         $config['eccube_install'] = 1;
         $yml = Yaml::dump($config);
@@ -691,7 +691,7 @@ 
     private function createDatabaseYamlFile($data)
     {
         $fs = new Filesystem();
-        $config_file = $this->config_path . '/database.yml';
+        $config_file = $this->config_path.'/database.yml';
         if ($fs->exists($config_file)) {
             $fs->remove($config_file);
         }
@@ -725,7 +725,7 @@ 
             $content = str_replace(
                 $target,
                 $replace,
-                file_get_contents($this->dist_path . '/database.yml.dist')
+                file_get_contents($this->dist_path.'/database.yml.dist')
             );
 
         } else {
@@ -744,7 +744,7 @@ 
     private function createMailYamlFile($data)
     {
         $fs = new Filesystem();
-        $config_file = $this->config_path . '/mail.yml';
+        $config_file = $this->config_path.'/mail.yml';
         if ($fs->exists($config_file)) {
             $fs->remove($config_file);
         }
@@ -761,7 +761,7 @@ 
         $content = str_replace(
             $target,
             $replace,
-            file_get_contents($this->dist_path . '/mail.yml.dist')
+            file_get_contents($this->dist_path.'/mail.yml.dist')
         );
         $fs->dumpFile($config_file, $content);
 
@@ -771,7 +771,7 @@ 
     private function createPathYamlFile($data, Request $request)
     {
         $fs = new Filesystem();
-        $config_file = $this->config_path . '/path.yml';
+        $config_file = $this->config_path.'/path.yml';
         if ($fs->exists($config_file)) {
             $fs->remove($config_file);
         }
@@ -779,7 +779,7 @@ 
         $ADMIN_ROUTE = $data['admin_dir'];
         $TEMPLATE_CODE = 'default';
         $USER_DATA_ROUTE = 'user_data';
-        $ROOT_DIR = realpath(__DIR__ . '/../../../../');
+        $ROOT_DIR = realpath(__DIR__.'/../../../../');
         $ROOT_URLPATH = $request->getBasePath();
 
         $target = array('${ADMIN_ROUTE}', '${TEMPLATE_CODE}', '${USER_DATA_ROUTE}', '${ROOT_DIR}', '${ROOT_URLPATH}');
@@ -789,7 +789,7 @@ 
         $content = str_replace(
             $target,
             $replace,
-            file_get_contents($this->dist_path . '/path.yml.dist')
+            file_get_contents($this->dist_path.'/path.yml.dist')
         );
         $fs->dumpFile($config_file, $content);
 
@@ -798,7 +798,7 @@ 
 
     private function sendAppData($params)
     {
-        $config_file = $this->config_path . '/database.yml';
+        $config_file = $this->config_path.'/database.yml';
         $db_config = Yaml::parse(file_get_contents($config_file));
 
         $this->setPDO();
@@ -810,7 +810,7 @@ 
         }
 
         if ($db_config['database']['driver'] === 'pdo_mysql') {
-            $db_ver = 'MySQL:' . $version;
+            $db_ver = 'MySQL:'.$version;
         } else {
             $db_ver = $version;
         }
@@ -828,7 +828,7 @@ 
 
         $header = array(
             'Content-Type: application/x-www-form-urlencoded',
-            'Content-Length: ' . strlen($data),
+            'Content-Length: '.strlen($data),
         );
         $context = stream_context_create(
             array(

src/Eccube/Controller/Mypage/MypageController.php

Doc Comments +5 added lines, -6 removed lines

@@ -62,7 +62,7 @@ 
      * @param Application $app
      * @param Request     $request
      *
-     * @return string
+     * @return \Symfony\Component\HttpFoundation\Response
      */
     public function index(Application $app, Request $request)
     {
@@ -89,7 +89,7 @@ 
      * @param Application $app
      * @param Request     $request
      *
-     * @return string
+     * @return \Symfony\Component\HttpFoundation\Response
      */
     public function history(Application $app, Request $request, $id)
     {
@@ -118,7 +118,7 @@ 
      * @param Request     $request
      * @param id     $id
      *
-     * @return string
+     * @return \Symfony\Component\HttpFoundation\RedirectResponse
      */
     public function order(Application $app, Request $request, $id)
     {
@@ -155,7 +155,7 @@ 
      * @param Application $app
      * @param Request     $request
      *
-     * @return string
+     * @return \Symfony\Component\HttpFoundation\Response
      */
     public function favorite(Application $app, Request $request)
     {
@@ -182,9 +182,8 @@ 
 
     /**
      * @param Application $app
-     * @param Request     $request
      *
-     * @return string
+     * @return \Symfony\Component\HttpFoundation\RedirectResponse
      */
     public function delete(Application $app, $id)
     {

src/Eccube/Controller/ShoppingController.php

Doc Comments +1 added lines

@@ -1188,6 +1188,7 @@
 
     /**
      * 非会員でのお客様情報変更時の入力チェック
+     * @param Application $app
      */
     private function customerValidation($app, $data) {
 

Spacing +5 added lines, -5 removed lines

@@ -221,7 +221,7 @@ 
 
             $MailHistory = new MailHistory();
             $MailHistory
-                ->setSubject('[' . $app['eccube.repository.base_info']->get()->getShopName() . '] ' . $MailTemplate->getSubject())
+                ->setSubject('['.$app['eccube.repository.base_info']->get()->getShopName().'] '.$MailTemplate->getSubject())
                 ->setMailBody($body)
                 ->setMailTemplate($MailTemplate)
                 ->setSendDate(new \DateTime())
@@ -634,7 +634,7 @@ 
                     ->setTel03($data['customer_tel03'])
                     ->setZip01($data['customer_zip01'])
                     ->setZip02($data['customer_zip02'])
-                    ->setZipCode($data['customer_zip01'] . $data['customer_zip02'])
+                    ->setZipCode($data['customer_zip01'].$data['customer_zip02'])
                     ->setPref($pref)
                     ->setAddr01($data['customer_addr01'])
                     ->setAddr02($data['customer_addr02'])
@@ -733,7 +733,7 @@ 
                 ->setTel03($data['tel03'])
                 ->setZip01($data['zip01'])
                 ->setZip02($data['zip02'])
-                ->setZipCode($data['zip01'] . $data['zip02'])
+                ->setZipCode($data['zip01'].$data['zip02'])
                 ->setPref($data['pref'])
                 ->setAddr01($data['addr01'])
                 ->setAddr02($data['addr02']);
@@ -752,7 +752,7 @@ 
                 ->setTel03($data['tel03'])
                 ->setZip01($data['zip01'])
                 ->setZip02($data['zip02'])
-                ->setZipCode($data['zip01'] . $data['zip02'])
+                ->setZipCode($data['zip01'].$data['zip02'])
                 ->setPref($data['pref'])
                 ->setAddr01($data['addr01'])
                 ->setAddr02($data['addr02'])
@@ -1070,7 +1070,7 @@ 
 
         $errors[] = $app['validator']->validateValue($data['customer_name02'], array(
             new Assert\NotBlank(),
-            new Assert\Length(array('max' => $app['config']['name_len'], )),
+            new Assert\Length(array('max' => $app['config']['name_len'],)),
             new Assert\Regex(array('pattern' => '/^[^\s ]+$/u', 'message' => 'form.type.name.firstname.nothasspace'))
         ));
 

src/Eccube/Form/DataTransformer/EntityToIdTransformer.php

Doc Comments +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
 
     /**
      * @param ObjectManager $om
-     * @param stging $className
+     * @param string $className
      */
     public function __construct(ObjectManager $om, $className)
     {

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

Doc Comments +3 added lines

@@ -36,6 +36,9 @@
 {
     protected $app;
 
+    /**
+     * @param \Silex\Application $app
+     */
     public function __construct($app)
     {
         $this->app = $app;

Spacing +1 added lines, -1 removed lines

@@ -91,7 +91,7 @@
                 )));
 
         $app = $this->app;
-        $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($app) {
+        $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($app) {
             // モーダルからのPOST時に、金額等をセットする.
             if ('modal' === $app['request']->get('modal')) {
                 $data = $event->getData();

src/Eccube/Form/Type/KanaType.php

Unused Use Statements -2 removed lines

@@ -25,9 +25,7 @@
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Form\FormEvents;
 use Symfony\Component\Validator\Constraints as Assert;
-use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**

src/Eccube/Repository/MemberRepository.php

Doc Comments +1 added lines, -1 removed lines

@@ -130,7 +130,7 @@
     /**
      * @param  \Eccube\Entity\Member $Member
      *
-     * @return void
+     * @return boolean
      */
     public function up(\Eccube\Entity\Member $Member)
     {

src/Eccube/Repository/TaxRuleRepository.php

Doc Comments +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
      * @param  int|null|\Eccube\Entity\ProductClass   $ProductClass 商品規格
      * @param  int|null|\Eccube\Entity\Master\Pref    $Pref         都道府県
      * @param  int|null|\Eccube\Entity\Master\Country $Country      国
-     * @return \Eccube\Entity\TaxRule                 税設定情報
+     * @return integer                 税設定情報
      *
      * @throws NoResultException
      */

src/Eccube/Service/CartService.php

Doc Comments +1 added lines, -1 removed lines

@@ -201,7 +201,7 @@
     }
 
     /**
-     * @param  \Eccube\Entity\ProductClass|integer $ProductClass
+     * @param  string $ProductClass
      * @param  integer $quantity
      * @return \Eccube\Service\CartService
      * @throws CartException