EC-CUBE / ec-cube

src/Eccube/Controller/AbstractController.php

Doc Comments +6 added lines

@@ -59,11 +59,17 @@
      */
     protected $formFactory;
 
+    /**
+     * @param \Eccube\Application $app
+     */
     protected function getSecurity($app)
     {
         return $this->tokenStorage;
     }
 
+    /**
+     * @param \Eccube\Application $app
+     */
     protected function isTokenValid($app)
     {
         $csrf = $this->csrfTokenManager;

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

Doc Comments +11 added lines

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

Spacing +5 added lines, -5 removed lines

@@ -64,7 +64,7 @@ 
     private $error = null;
     private $encode = '';
 
-    public function __construct(){
+    public function __construct() {
         $this->encode = self::UTF;
         if ('\\' === DIRECTORY_SEPARATOR) {
             $this->encode = self::SJIS;
@@ -113,7 +113,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 [
             'form' => $form->createView(),
@@ -174,7 +174,7 @@ 
                 $nowDir = $this->checkDir($request->get('now_dir'), $topDir)
                     ? $this->normalizePath($request->get('now_dir'))
                     : $topDir;
-                $fs->mkdir($nowDir . '/' . $filename);
+                $fs->mkdir($nowDir.'/'.$filename);
             }
         }
     }
@@ -259,7 +259,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 {
@@ -310,7 +310,7 @@ 
     private function getFileList($app, $nowDir)
     {
         $topDir = $this->appConfig['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/NonMemberShoppingController.php

Doc Comments +1 added lines, -1 removed lines

@@ -474,7 +474,7 @@
      *
      * @param Application $app
      * @param array $data リクエストパラメータ
-     * @return array
+     * @return \Symfony\Component\Validator\ConstraintViolationListInterface[]
      */
     protected function customerValidation(Application $app, array $data)
     {

src/Eccube/Form/Type/Front/CustomerAddressType.php

Doc Comments -1 removed lines

@@ -59,7 +59,6 @@
     protected $app;
 
     /**
-     * @param array $config
      */
     public function __construct()
     {

src/Eccube/Form/Type/SearchProductBlockType.php

Doc Comments -1 removed lines

@@ -48,7 +48,6 @@
     /**
      * SearchProductType constructor.
      *
-     * @param Application $app
      */
     public function __construct()
     {

src/Eccube/Repository/BlockRepository.php

Doc Comments +2 added lines, -2 removed lines

@@ -49,7 +49,7 @@ 
      * @deprecated 呼び出し元で制御する
      * @param $block_id
      * @param $DeviceType
-     * @return array|\Eccube\Entity\Block
+     * @return Block|null
      */
     public function findOrCreate($block_id, $DeviceType)
     {
@@ -111,7 +111,7 @@ 
      * ブロック一覧の取得.
      *
      * @param  \Eccube\Entity\Master\DeviceType $DeviceType
-     * @return array
+     * @return null|\Symfony\Component\HttpFoundation\Request
      */
     public function getList($DeviceType)
     {

Spacing +1 added lines, -1 removed lines

@@ -197,7 +197,7 @@
             $this->appConfig['block_default_realdir'],
         );
         foreach ($readPaths as $readPath) {
-            $filePath = $readPath . '/' . $fileName . '.twig';
+            $filePath = $readPath.'/'.$fileName.'.twig';
             $fs = new Filesystem();
             if ($fs->exists($filePath)) {
                 return array(

src/Eccube/Service/ShoppingService.php

Doc Comments +4 added lines, -4 removed lines

@@ -220,7 +220,7 @@ 
     /**
      * 非会員情報を取得
      *
-     * @param $sesisonKey
+     * @param string $sesisonKey
      * @return $Customer|null
      */
     public function getNonMember($sesisonKey)
@@ -252,7 +252,7 @@ 
     /**
      * 受注情報を作成
      *
-     * @param $Customer
+     * @param null|Customer $Customer
      * @return \Eccube\Entity\Order
      */
     public function createOrder($Customer)
@@ -281,7 +281,7 @@ 
      * 仮受注情報作成
      *
      * @param $Customer
-     * @param $preOrderId
+     * @param string $preOrderId
      * @return mixed
      * @throws \Doctrine\ORM\NoResultException
      * @throws \Doctrine\ORM\NonUniqueResultException
@@ -1403,7 +1403,7 @@ 
      * 受注メール送信を行う
      *
      * @param Order $Order
-     * @return MailHistory
+     * @return null|\Symfony\Component\HttpFoundation\Request
      */
     public function sendOrderMail(Order $Order)
     {

Spacing +1 added lines, -1 removed lines

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

src/Eccube/Controller/ShoppingController.php

Spacing +1 added lines, -1 removed lines

@@ -817,7 +817,7 @@
                 if ($dispatcher instanceof Response
                     && ($dispatcher->isRedirection() || $dispatcher->getContent())
                 ) { // $paymentMethod->apply() が Response を返した場合は画面遷移
-                    return $dispatcher;                // 画面遷移したいパターンが複数ある場合はどうする？ 引数で制御？
+                    return $dispatcher; // 画面遷移したいパターンが複数ある場合はどうする？ 引数で制御？
                 }
                 $PaymentResult = $paymentService->doCheckout($paymentMethod); // 決済実行
                 if (!$PaymentResult->isSuccess()) {

src/Eccube/Controller/ProductController.php

Spacing +1 added lines, -1 removed lines

@@ -194,7 +194,7 @@
             );
             $addCartForm = $builder->getForm();
 
-            if ($request->getMethod() === 'POST' && (string)$Product->getId() === $request->get('product_id')) {
+            if ($request->getMethod() === 'POST' && (string) $Product->getId() === $request->get('product_id')) {
                 $addCartForm->handleRequest($request);
 
                 if ($addCartForm->isValid()) {

Unused Use Statements -1 removed lines

@@ -27,7 +27,6 @@
 use Doctrine\ORM\EntityManager;
 use Eccube\Annotation\Inject;
 use Eccube\Application;
-use Eccube\Common\Constant;
 use Eccube\Entity\BaseInfo;
 use Eccube\Entity\Master\ProductStatus;
 use Eccube\Entity\Product;