EC-CUBE / ec-cube

src/Eccube/Service/ShoppingService.php

Doc Comments +1 added lines, -1 removed lines

@@ -137,7 +137,7 @@
      * 仮受注情報作成
      *
      * @param $Customer
-     * @param $preOrderId
+     * @param string $preOrderId
      * @return mixed
      * @throws \Doctrine\ORM\NoResultException
      * @throws \Doctrine\ORM\NonUniqueResultException

Spacing +6 added lines, -6 removed lines

@@ -270,7 +270,7 @@ 
             ->setFax03($Customer->getFax03())
             ->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())
@@ -409,7 +409,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());
@@ -428,7 +428,7 @@ 
                 ->setFax03($Customer->getFax03())
                 ->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());
@@ -913,10 +913,10 @@ 
 
         // 配送日数が設定されている
         if ($deliveryDateFlag) {
-            $period = new \DatePeriod (
-                new \DateTime($minDate . ' day'),
+            $period = new \DatePeriod(
+                new \DateTime($minDate.' day'),
                 new \DateInterval('P1D'),
-                new \DateTime($minDate + $this->app['config']['deliv_date_end_max'] . ' day')
+                new \DateTime($minDate + $this->app['config']['deliv_date_end_max'].' day')
             );
 
             foreach ($period as $day) {

html/index.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 require __DIR__.'/../autoload.php';
 
 ini_set('display_errors', 'Off');
-error_reporting(E_ALL & ~E_DEPRECATED & ~E_STRICT);
+error_reporting(E_ALL&~E_DEPRECATED&~E_STRICT);
 
 $app = new Eccube\Application();
 

html/index_dev.php

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
 
 // load config dev
 $conf = $app['config'];
-$app['config'] = $app->share(function () use ($conf) {
+$app['config'] = $app->share(function() use ($conf) {
     $confarray = array();
     $config_dev_file = __DIR__.'/../app/config/eccube/config_dev.yml';
     if (file_exists($config_dev_file)) {

html/install.php

Spacing +2 added lines, -2 removed lines

@@ -26,11 +26,11 @@
     apc_clear_cache();
 }
 
-require __DIR__ . '/../autoload.php';
+require __DIR__.'/../autoload.php';
 
 $app = new Eccube\InstallApplication();
 $app['debug'] = true;
-$app->before(function (\Symfony\Component\HttpFoundation\Request $request, \Silex\Application $app) {
+$app->before(function(\Symfony\Component\HttpFoundation\Request $request, \Silex\Application $app) {
     if (!$request->getSession()->isStarted()) {
         $request->getSession()->start();
     }

src/Eccube/Application/ApplicationTrait.php

Spacing +7 added lines, -7 removed lines

@@ -19,32 +19,32 @@ 
      */
     public function addSuccess($message, $namespace = 'front')
     {
-        $this['session']->getFlashBag()->add('eccube.' . $namespace . '.success', $message);
+        $this['session']->getFlashBag()->add('eccube.'.$namespace.'.success', $message);
     }
 
     public function addError($message, $namespace = 'front')
     {
-        $this['session']->getFlashBag()->add('eccube.' . $namespace . '.error', $message);
+        $this['session']->getFlashBag()->add('eccube.'.$namespace.'.error', $message);
     }
 
     public function addDanger($message, $namespace = 'front')
     {
-        $this['session']->getFlashBag()->add('eccube.' . $namespace . '.danger', $message);
+        $this['session']->getFlashBag()->add('eccube.'.$namespace.'.danger', $message);
     }
 
     public function addWarning($message, $namespace = 'front')
     {
-        $this['session']->getFlashBag()->add('eccube.' . $namespace . '.warning', $message);
+        $this['session']->getFlashBag()->add('eccube.'.$namespace.'.warning', $message);
     }
 
     public function addInfo($message, $namespace = 'front')
     {
-        $this['session']->getFlashBag()->add('eccube.' . $namespace . '.info', $message);
+        $this['session']->getFlashBag()->add('eccube.'.$namespace.'.info', $message);
     }
 
     public function addRequestError($message, $namespace = 'front')
     {
-        $this['session']->getFlashBag()->set('eccube.' . $namespace . '.request.error', $message);
+        $this['session']->getFlashBag()->set('eccube.'.$namespace.'.request.error', $message);
     }
 
     public function clearMessage()
@@ -210,7 +210,7 @@ 
         $twig = $this['twig'];
 
         if ($response instanceof StreamedResponse) {
-            $response->setCallback(function () use ($twig, $view, $parameters) {
+            $response->setCallback(function() use ($twig, $view, $parameters) {
                 $twig->display($view, $parameters);
             });
         } else {

src/Eccube/ConsoleApplication.php

Spacing +7 added lines, -7 removed lines

@@ -37,7 +37,7 @@ 
 
         // load databtase config
         $config = array();
-        $file = __DIR__ . '/../../app/config/eccube/database.yml';
+        $file = __DIR__.'/../../app/config/eccube/database.yml';
         if (file_exists($file)) {
             $config = Yaml::parse($file);
         }
@@ -50,15 +50,15 @@ 
         $app->register(new \Saxulum\DoctrineOrmManagerRegistry\Silex\Provider\DoctrineOrmManagerRegistryProvider());
 
         $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',
                         ),
                     ),
                 ),
@@ -71,16 +71,16 @@ 
             array(
                 'console.name' => 'EC-CUBE',
                 'console.version' => '3.0.0',
-                'console.project_directory' => __DIR__ . "/.."
+                'console.project_directory' => __DIR__."/.."
             )
         );
 
         $app->register(new \Dbtlr\MigrationProvider\Provider\MigrationServiceProvider(), array(
-            'db.migrations.path' => __DIR__ . '/Resource/doctrine/migration',
+            'db.migrations.path' => __DIR__.'/Resource/doctrine/migration',
         ));
 
         $app->register(new \Silex\Provider\MonologServiceProvider(), array(
-            'monolog.logfile' => __DIR__ . '/../../app/log/miglation.log',
+            'monolog.logfile' => __DIR__.'/../../app/log/miglation.log',
         ));
     }
 }

src/Eccube/Controller/AbstractController.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
     protected function getBoundForm(Application $app, $type)
     {
         $form = $app['form.factory']
-            ->createBuilder($app['eccube.form.type.' . $type], $app['eccube.entity.' . $type])
+            ->createBuilder($app['eccube.form.type.'.$type], $app['eccube.entity.'.$type])
             ->getForm();
         $form->handleRequest($app['request']);
 

src/Eccube/Controller/Admin/Content/CssController.php

Spacing +2 added lines, -2 removed lines

@@ -47,7 +47,7 @@ 
             if ($form->isValid()) {
                 $data = $form->getData();
                 $fs = new Filesystem();
-                $fs->dumpFile($this->getCssDir($app) . $data['file_name'], $data['content']);
+                $fs->dumpFile($this->getCssDir($app).$data['file_name'], $data['content']);
                 $app['session']->getFlashBag()->add('admin.content.css.complete', 'admin.register.complete');
 
                 return $app->redirect($app['url_generator']->generate('admin_content_css'));
@@ -113,6 +113,6 @@ 
 
     protected function getCssDir($app)
     {
-        return $app['config']['user_template_realdir'] . $this->cssDir;
+        return $app['config']['user_template_realdir'].$this->cssDir;
     }
 }

src/Eccube/Controller/Admin/Content/LayoutController.php

Spacing +9 added lines, -9 removed lines

@@ -89,20 +89,20 @@ 
                 $max = count($Blocks);
                 for ($i = 0; $i < $max; $i++) {
                     // block_id が取得できない場合は INSERT しない
-                    if (!isset($data['id_' . $i])) {
+                    if (!isset($data['id_'.$i])) {
                         continue;
                     }
                     // 未使用は INSERT しない
-                    if ($data['target_id_' . $i] == \Eccube\Entity\PageLayout::TARGET_ID_UNUSED) {
+                    if ($data['target_id_'.$i] == \Eccube\Entity\PageLayout::TARGET_ID_UNUSED) {
                         continue;
                     }
                     // 他のページに anywhere が存在する場合は INSERT しない
-                    $anywhere = (isset($data['anywhere_' . $i]) && $data['anywhere_' . $i] == 1) ? 1 : 0;
-                    if (isset($data['anywhere_' . $i]) && $data['anywhere_' . $i] == 1) {
+                    $anywhere = (isset($data['anywhere_'.$i]) && $data['anywhere_'.$i] == 1) ? 1 : 0;
+                    if (isset($data['anywhere_'.$i]) && $data['anywhere_'.$i] == 1) {
                         $Other = $app['orm.em']->getRepository('Eccube\Entity\BlockPosition')
                             ->findBy(array(
                                 'anywhere' => 1,
-                                'block_id' => $data['id_' . $i],
+                                'block_id' => $data['id_'.$i],
                             ));
                         if (count($Other) > 0) {
                             continue;
@@ -112,14 +112,14 @@ 
                     $BlockPosition = new \Eccube\Entity\BlockPosition();
                     $Block = $app['orm.em']->getRepository('Eccube\Entity\Block')
                         ->findOneBy(array(
-                            'id' => $data['id_' . $i],
+                            'id' => $data['id_'.$i],
                             'DeviceType' => $DeviceType,
                         ));
                     $BlockPosition
                         ->setPageId($id)
-                        ->setBlockId($data['id_' . $i])
-                        ->setBlockRow($data['top_' . $i])
-                        ->setTargetId($data['target_id_' . $i])
+                        ->setBlockId($data['id_'.$i])
+                        ->setBlockRow($data['top_'.$i])
+                        ->setTargetId($data['target_id_'.$i])
                         ->setBlock($Block)
                         ->setPageLayout($TargetPageLayout)
                         ->setAnywhere($anywhere);