EC-CUBE / ec-cube

src/Eccube/Controller/EntryController.php

Spacing +1 added lines, -1 removed lines

@@ -88,7 +88,7 @@
                             ->setCompanyName($Customer->getCompanyName())
                             ->setZip01($Customer->getZip01())
                             ->setZip02($Customer->getZip02())
-                            ->setZipcode($Customer->getZip01() . $Customer->getZip02())
+                            ->setZipcode($Customer->getZip01().$Customer->getZip02())
                             ->setPref($Customer->getPref())
                             ->setAddr01($Customer->getAddr01())
                             ->setAddr02($Customer->getAddr02())

src/Eccube/Controller/ForgotController.php

Spacing +3 added lines, -3 removed lines

@@ -52,7 +52,7 @@ 
                     // リセットキーの発行・有効期限の設定
                     $Customer
                         ->setResetKey($app['eccube.repository.customer']->getUniqueResetKey($app))
-                        ->setResetExpire(new \DateTime('+' . $app['config']['customer_reset_expire'] .' min'));
+                        ->setResetExpire(new \DateTime('+'.$app['config']['customer_reset_expire'].' min'));
 
                     // リセットキーを更新
                     $app['orm.em']->persist($Customer);
@@ -66,7 +66,7 @@ 
 
                     // ログ出力
                     $app['monolog']->addInfo(
-                            'send reset password mail to:'  . "{$Customer->getId()} {$Customer->getEmail()} {$request->getClientIp()}"
+                            'send reset password mail to:'."{$Customer->getId()} {$Customer->getEmail()} {$request->getClientIp()}"
                         );
                 }
 
@@ -122,7 +122,7 @@ 
 
             // ログ出力
             $app['monolog']->addInfo(
-                    'reset password complete:' . "{$Customer->getId()} {$Customer->getEmail()} {$request->getClientIp()}"
+                    'reset password complete:'."{$Customer->getId()} {$Customer->getEmail()} {$request->getClientIp()}"
                 );
 
         } else {

src/Eccube/Controller/Install/InstallController.php

Spacing +33 added lines, -33 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)
@@ -207,7 +207,7 @@ 
                 $host = $request->getSchemeAndHttpHost();
                 $basePath = $request->getBasePath();
                 $params = array(
-                    'http_url' => $host . $basePath,
+                    'http_url' => $host.$basePath,
                     'shop_name' => $sessionData['shop_name'],
                 );
 
@@ -228,13 +228,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($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,
@@ -254,17 +254,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');
             }
         }
 
@@ -282,7 +282,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
@@ -293,7 +293,7 @@ 
 
     private function setPDO()
     {
-        $config_file = $this->config_path . '/database.yml';
+        $config_file = $this->config_path.'/database.yml';
         $config = Yaml::parse($config_file);
 
         try {
@@ -328,7 +328,7 @@ 
      */
     private function getEntityManager()
     {
-        $config_file = $this->config_path . '/database.yml';
+        $config_file = $this->config_path.'/database.yml';
         $database = Yaml::parse($config_file);
 
         $this->app->register(new \Silex\Provider\DoctrineServiceProvider(), array(
@@ -336,15 +336,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',
                         ),
                     ),
 
@@ -372,11 +372,11 @@ 
     {
         $this->resetNatTimer();
 
-        $config_file = $this->config_path . '/database.yml';
+        $config_file = $this->config_path.'/database.yml';
         $database = Yaml::parse($config_file);
         $config['database'] = $database['database'];
 
-        $config_file = $this->config_path . '/config.yml';
+        $config_file = $this->config_path.'/config.yml';
         $baseConfig = Yaml::parse($config_file);
         $config['config'] = $baseConfig;
 
@@ -435,7 +435,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);
 
@@ -459,7 +459,7 @@ 
     private function getProtectedDirs()
     {
         $protectedDirs = array();
-        $base = __DIR__ . '/../../../..';
+        $base = __DIR__.'/../../../..';
         $dirs = array(
             '/html',
             '/app',
@@ -472,7 +472,7 @@ 
         );
 
         foreach ($dirs as $dir) {
-            if (!is_writable($base . $dir)) {
+            if (!is_writable($base.$dir)) {
                 $protectedDirs[] = $dir;
             }
         }
@@ -483,7 +483,7 @@ 
     private function createConfigYamlFile($data)
     {
         $fs = new Filesystem();
-        $config_file = $this->config_path . '/config.yml';
+        $config_file = $this->config_path.'/config.yml';
         if ($fs->exists($config_file)) {
             $fs->remove($config_file);
         }
@@ -503,7 +503,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);
 
@@ -517,7 +517,7 @@ 
 
     private function addInstallStatus()
     {
-        $config_file = $this->config_path . '/config.yml';
+        $config_file = $this->config_path.'/config.yml';
         $config = Yaml::parse($config_file);
         $config['eccube_install'] = 1;
         $yml = Yaml::dump($config);
@@ -529,7 +529,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);
         }
@@ -562,7 +562,7 @@ 
         $content = str_replace(
             $target,
             $replace,
-            file_get_contents($this->dist_path . '/database.yml.dist')
+            file_get_contents($this->dist_path.'/database.yml.dist')
         );
 
         $fs->dumpFile($config_file, $content);
@@ -573,7 +573,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);
         }
@@ -590,7 +590,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);
 
@@ -600,7 +600,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);
         }
@@ -608,7 +608,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}');
@@ -618,7 +618,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);
 
@@ -627,7 +627,7 @@ 
 
     private function sendAppData($params)
     {
-        $config_file = $this->config_path . '/database.yml';
+        $config_file = $this->config_path.'/database.yml';
         $db_config = Yaml::parse($config_file);
 
         $this->setPDO();
@@ -639,7 +639,7 @@ 
         }
 
         if ($db_config['database']['driver'] === 'pdo_mysql') {
-            $db_ver = 'MySQL:' . $version;
+            $db_ver = 'MySQL:'.$version;
         } else {
             $db_ver = $version;
         }
@@ -657,7 +657,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/DeliveryController.php

Spacing +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
 
         // 遷移が正しくない場合、デフォルトであるマイページの配送先追加の画面を設定する
         if (!in_array($parentPage, $allowdParents)) {
-            $parentPage  = $app->url('mypage_delivery');
+            $parentPage = $app->url('mypage_delivery');
         }
 
         /* @var $form \Symfony\Component\Form\FormInterface */

src/Eccube/Controller/Mypage/WithdrawController.php

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
                         // 会員削除
                         $email = $Customer->getEmail();
                         // メールアドレスにダミーをセット
-                        $Customer->setEmail(Str::random(60) . '@dummy.dummy');
+                        $Customer->setEmail(Str::random(60).'@dummy.dummy');
                         $Customer->setDelFlg(Constant::ENABLED);
 
                         $app['orm.em']->flush();

src/Eccube/Controller/ShoppingController.php

Spacing +10 added lines, -10 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())
@@ -493,7 +493,7 @@ 
                 ->setFax03($CustomerAddress->getFax03())
                 ->setZip01($CustomerAddress->getZip01())
                 ->setZip02($CustomerAddress->getZip02())
-                ->setZipCode($CustomerAddress->getZip01() . $CustomerAddress->getZip02())
+                ->setZipCode($CustomerAddress->getZip01().$CustomerAddress->getZip02())
                 ->setPref($CustomerAddress->getPref())
                 ->setAddr01($CustomerAddress->getAddr01())
                 ->setAddr02($CustomerAddress->getAddr02());
@@ -619,7 +619,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'])
@@ -640,7 +640,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']);
@@ -706,7 +706,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'])
@@ -812,7 +812,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']);
@@ -831,7 +831,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'])
@@ -1055,7 +1055,7 @@ 
                                 ->setFax03($CustomerAddress->getFax03())
                                 ->setZip01($CustomerAddress->getZip01())
                                 ->setZip02($CustomerAddress->getZip02())
-                                ->setZipCode($CustomerAddress->getZip01() . $CustomerAddress->getZip02())
+                                ->setZipCode($CustomerAddress->getZip01().$CustomerAddress->getZip02())
                                 ->setPref($CustomerAddress->getPref())
                                 ->setAddr01($CustomerAddress->getAddr01())
                                 ->setAddr02($CustomerAddress->getAddr02())
@@ -1153,7 +1153,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'])
@@ -1202,7 +1202,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/Controller/UserDataController.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
         $paths[] = $app['config']['user_data_realdir'];
         $app['twig.loader']->addLoader(new \Twig_Loader_Filesystem($paths));
 
-        $file = $PageLayout->getFileName() . '.twig';
+        $file = $PageLayout->getFileName().'.twig';
 
         return $app['twig']->render($file);
     }

src/Eccube/Doctrine/Filter/NoStockHiddenFilter.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
     public function addFilterConstraint(ClassMetadata $targetEntity, $targetTableAlias)
     {
         if ($targetEntity->reflClass->getName() === 'Eccube\Entity\ProductClass') {
-            return $targetTableAlias . '.stock >= 1 OR ' . $targetTableAlias . '.stock_unlimited = 1';
+            return $targetTableAlias.'.stock >= 1 OR '.$targetTableAlias.'.stock_unlimited = 1';
         } else {
             return "";
         }

src/Eccube/Doctrine/Filter/OrderStatusFilter.php

Spacing +2 added lines, -2 removed lines

@@ -33,12 +33,12 @@
     {
         // 決済処理中/購入処理中を除く.
         if ($targetEntity->reflClass->getName() === 'Eccube\Entity\Order') {
-            return $targetTableAlias . '.status <> 7 AND ' . $targetTableAlias . '.status <> 8';
+            return $targetTableAlias.'.status <> 7 AND '.$targetTableAlias.'.status <> 8';
         }
 
         // 決済処理中/購入処理中を除く.
         if ($targetEntity->reflClass->getName() === 'Eccube\Entity\Master\OrderStatus') {
-            return $targetTableAlias . '.id <> 7 AND ' . $targetTableAlias . '.id <> 8';
+            return $targetTableAlias.'.id <> 7 AND '.$targetTableAlias.'.id <> 8';
         }
 
         return '';