EC-CUBE / ec-cube

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

Doc Comments +11 added lines

@@ -230,6 +230,10 @@ 
         return $str;
     }
 
+    /**
+     * @param string $topDir
+     * @param Request $request
+     */
     private function getTree($topDir, $request)
     {
         $finder = Finder::create()->in($topDir)
@@ -267,6 +271,10 @@ 
         return $tree;
     }
 
+    /**
+     * @param Application $app
+     * @param string $nowDir
+     */
     private function getFileList($app, $nowDir)
     {
         $topDir = $app['config']['user_data_realdir'];
@@ -326,6 +334,9 @@ 
         return (strpos($targetDir, $topDir) === 0);
     }
 
+    /**
+     * @return string
+     */
     private function convertStrFromServer($target)
     {
         if ($this->encode == self::SJIS) {

Spacing +5 added lines, -5 removed lines

@@ -39,7 +39,7 @@ 
     private $error = null;
     private $encode = '';
 
-    public function __construct(){
+    public function __construct() {
         $this->encode = self::UTF;
         if ('\\' === DIRECTORY_SEPARATOR) {
             $this->encode = self::SJIS;
@@ -84,7 +84,7 @@ 
         $arrFileList = $this->getFileList($app, $nowDir);
 
         $javascript = $this->getJsArrayList($tree);
-        $onload = "eccube.fileManager.viewFileTree('tree', arrTree, '" . $nowDir . "', 'tree_select_file', 'tree_status', 'move');";
+        $onload = "eccube.fileManager.viewFileTree('tree', arrTree, '".$nowDir."', 'tree_select_file', 'tree_status', 'move');";
 
         return $app->render('Content/file.twig', array(
             'form' => $form->createView(),
@@ -141,7 +141,7 @@ 
                 $nowDir = $this->checkDir($request->get('now_dir'), $topDir)
                     ? $this->normalizePath($request->get('now_dir'))
                     : $topDir;
-                $fs->mkdir($nowDir . '/' . $filename);
+                $fs->mkdir($nowDir.'/'.$filename);
             }
         }
     }
@@ -219,7 +219,7 @@ 
     {
         $str = "arrTree = new Array();\n";
         foreach ($tree as $key => $val) {
-            $str .= 'arrTree[' . $key . "] = new Array(" . $key . ", '" . $val['type'] . "', '" . $val['path'] . "', " . $val['rank'] . ',';
+            $str .= 'arrTree['.$key."] = new Array(".$key.", '".$val['type']."', '".$val['path']."', ".$val['rank'].',';
             if ($val['open']) {
                 $str .= "true);\n";
             } else {
@@ -270,7 +270,7 @@ 
     private function getFileList($app, $nowDir)
     {
         $topDir = $app['config']['user_data_realdir'];
-        $filter = function (\SplFileInfo $file) use ($topDir) {
+        $filter = function(\SplFileInfo $file) use ($topDir) {
             $acceptPath = realpath($topDir);
             $targetPath = $file->getRealPath();
             return (strpos($targetPath, $acceptPath) === 0);

src/Eccube/Controller/Admin/Order/MailController.php

Doc Comments +3 added lines

@@ -259,6 +259,9 @@
     }
 
 
+    /**
+     * @param Application $app
+     */
     private function createBody($app, $header, $footer, $Order)
     {
         return $app->renderView('Mail/order.twig', array(

Spacing +2 added lines, -2 removed lines

@@ -336,10 +336,10 @@
                 }
             }
         } else {
-            $filter = function ($v) {
+            $filter = function($v) {
                 return preg_match('/^ids\d+$/', $v);
             };
-            $map = function ($v) {
+            $map = function($v) {
                 return preg_replace('/[^\d+]/', '', $v);
             };
             $keys = array_keys($request->query->all());

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/CsvImportService.php

Unused Use Statements -2 removed lines

@@ -23,8 +23,6 @@
 
 namespace Eccube\Service;
 
-use Eccube\Application;
-
 
 /**
  * Copyright (C) 2012-2014 David de Boer <david@ddeboer.nl>

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/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 +1 added lines, -1 removed lines

@@ -920,7 +920,7 @@
 
         // 配送日数が設定されている
         if ($deliveryDateFlag) {
-            $period = new \DatePeriod (
+            $period = new \DatePeriod(
                 new \DateTime($minDate.' day'),
                 new \DateInterval('P1D'),
                 new \DateTime($minDate + $this->app['config']['deliv_date_end_max'].' day')

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);

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

Spacing +1 added lines, -1 removed lines

@@ -95,7 +95,7 @@
         $num = $app['eccube.repository.product_class']->createQueryBuilder('pc')
             ->select('count(pc.id)')
             ->where('pc.ClassCategory1 = :id OR pc.ClassCategory2 = :id')
-            ->setParameter('id',$id)
+            ->setParameter('id', $id)
             ->getQuery()
             ->getSingleScalarResult();
         if ($num > 0) {

src/Eccube/Controller/BlockController.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
 
         if ($app['eccube.layout']) {
             foreach ($app['eccube.layout']->getBlocPositions() as $blocPositions) {
-                if ($blocPositions->getTargetId() == constant("Eccube\Entity\BlocPosition::" . $position)) {
+                if ($blocPositions->getTargetId() == constant("Eccube\Entity\BlocPosition::".$position)) {
                     $blocks[] = $blocPositions->getBloc();
                 }
             }