EC-CUBE / ec-cube

src/Eccube/Resource/doctrine/migration/Version20160413151321.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 
         // path.ymlの更新
         $app = Application::getInstance();
-        $file = $app['config']['root_dir'] . '/app/config/eccube/path.yml';
+        $file = $app['config']['root_dir'].'/app/config/eccube/path.yml';
         $config = Yaml::parse(file_get_contents($file));
 
         if (!array_key_exists('public_path', $config)) {

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

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
                 }
                 if ($dir == 'doctrine') {
                     // doctrineが指定された場合は, cache driver経由で削除.
-                    $config =  $app['orm.em']->getConfiguration();
+                    $config = $app['orm.em']->getConfiguration();
                     $this->deleteDoctrineCache($config->getMetadataCacheImpl());
                     $this->deleteDoctrineCache($config->getQueryCacheImpl());
                     $this->deleteDoctrineCache($config->getResultCacheImpl());

src/Eccube/Controller/Admin/Product/ProductClassController.php

Spacing +1 added lines, -1 removed lines

@@ -106,7 +106,7 @@
                     $class2Valied = $this->isValiedCategory($ClassName2);
 
                     // 規格が選択されていないか、選択された状態で分類が保有されていれば、画面表示
-                    if($class1Valied && $class2Valied){
+                    if ($class1Valied && $class2Valied) {
                         $hasClassCategoryFlg = true;
                     }
 

src/Eccube/Controller/Admin/AdminController.php

Spacing +3 added lines, -3 removed lines

@@ -65,12 +65,12 @@ 
     {
         // install.phpのチェック.
         if (isset($app['config']['eccube_install']) && $app['config']['eccube_install'] == 1) {
-            $file = $app['config']['root_dir'] . '/html/install.php';
+            $file = $app['config']['root_dir'].'/html/install.php';
             if (file_exists($file)) {
                 $message = $app->trans('admin.install.warning', array('installphpPath' => 'html/install.php'));
                 $app->addWarning($message, 'admin');
             }
-            $fileOnRoot = $app['config']['root_dir'] . '/install.php';
+            $fileOnRoot = $app['config']['root_dir'].'/install.php';
             if (file_exists($fileOnRoot)) {
                 $message = $app->trans('admin.install.warning', array('installphpPath' => 'install.php'));
                 $app->addWarning($message, 'admin');
@@ -311,7 +311,7 @@ 
                     t1.status
                 ORDER BY
                     t1.status';
-        $rsm = new ResultSetMapping();;
+        $rsm = new ResultSetMapping(); ;
         $rsm->addScalarResult('status', 'status');
         $rsm->addScalarResult('count', 'count');
         $query = $em->createNativeQuery($sql, $rsm);

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

Spacing +5 added lines, -9 removed lines

@@ -97,7 +97,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();
@@ -112,17 +112,13 @@ 
                     $data['product_name'] = $Product->getName();
                     $data['product_code'] = $ProductClass->getCode();
                     $data['class_name1'] = $ProductClass->hasClassCategory1() ?
-                        $ProductClass->getClassCategory1()->getClassName() :
-                        null;
+                        $ProductClass->getClassCategory1()->getClassName() : null;
                     $data['class_name2'] = $ProductClass->hasClassCategory2() ?
-                        $ProductClass->getClassCategory2()->getClassName() :
-                        null;
+                        $ProductClass->getClassCategory2()->getClassName() : null;
                     $data['class_category_name1'] = $ProductClass->hasClassCategory1() ?
-                        $ProductClass->getClassCategory1()->getName() :
-                        null;
+                        $ProductClass->getClassCategory1()->getName() : null;
                     $data['class_category_name2'] = $ProductClass->hasClassCategory2() ?
-                        $ProductClass->getClassCategory2()->getName() :
-                        null;
+                        $ProductClass->getClassCategory2()->getName() : null;
                     $data['price'] = $ProductClass->getPrice02();
                     $data['quantity'] = empty($data['quantity']) ? 1 : $data['quantity'];
                     $event->setData($data);

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

Spacing +1 added lines, -1 removed lines

@@ -128,7 +128,7 @@
                 $entityName = str_replace('-', '\\', $data['masterdata_name']);
                 $entity = new $entityName();
                 $rank = 0;
-                $ids = array_map(function ($v) {return $v['id'];}, $data['data']);
+                $ids = array_map(function($v) {return $v['id']; }, $data['data']);
                 foreach ($data['data'] as $key => $value) {
                     if ($value['id'] !== null && $value['name'] !== null) {
                         $entity->setId($value['id']);

src/Eccube/Service/CsvImportService.php

Spacing +5 added lines, -5 removed lines

@@ -117,9 +117,9 @@ 
 
         $this->file = $file;
         $this->file->setFlags(
-            \SplFileObject::READ_CSV |
-            \SplFileObject::SKIP_EMPTY |
-            \SplFileObject::READ_AHEAD |
+            \SplFileObject::READ_CSV|
+            \SplFileObject::SKIP_EMPTY|
+            \SplFileObject::READ_AHEAD|
             \SplFileObject::DROP_NEW_LINE
         );
         $this->file->setCsvControl(
@@ -362,7 +362,7 @@ 
             if ($count > 1) {
                 $incrementedHeaders[] = $header;
                 for ($i = 1; $i < $count; $i++) {
-                    $incrementedHeaders[] = $header . $i;
+                    $incrementedHeaders[] = $header.$i;
                 }
             } else {
                 $incrementedHeaders[] = $header;
@@ -413,7 +413,7 @@ 
     protected function convertEncodingRows($row) {
         if ('\\' === DIRECTORY_SEPARATOR && PHP_VERSION_ID >= 70000) {
             foreach ($row as &$col) {
-                $col = mb_convert_encoding($col , 'UTF-8', 'SJIS-win');
+                $col = mb_convert_encoding($col, 'UTF-8', 'SJIS-win');
             }
         }
         return $row;

src/Eccube/Doctrine/ORM/Query/Extract.php

Spacing +1 added lines, -1 removed lines

@@ -108,7 +108,7 @@
         if ($driver == 'pdo_sqlite') {
             return sprintf("CAST(STRFTIME('%s', %s) AS INTEGER)", $this->formats[$this->field], $this->source->dispatch($sqlWalker));
         } else {
-            return sprintf('EXTRACT(%s FROM %s %s)', $this->field, (string)$this->type, $this->source->dispatch($sqlWalker));
+            return sprintf('EXTRACT(%s FROM %s %s)', $this->field, (string) $this->type, $this->source->dispatch($sqlWalker));
         }
     }
 }
\ No newline at end of file

src/Eccube/Repository/Master/OrderStatusRepository.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
 
         foreach ($criteria as $col => $val) {
             $qb->andWhere($qb->expr()->notIn('o.'.$col, ':'.$col))
-                ->setParameter($col, (array)$val);
+                ->setParameter($col, (array) $val);
         }
 
         if (is_array($orderBy)) {