EC-CUBE / ec-cube

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()) {

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

Spacing +1 added lines, -1 removed lines

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

src/Eccube/Controller/Admin/AdminController.php

Spacing +3 added lines, -3 removed lines

@@ -122,12 +122,12 @@ 
     {
         // install.phpのチェック.
         if (isset($this->appConfig['eccube_install']) && $this->appConfig['eccube_install'] == 1) {
-            $file = $this->appConfig['root_dir'] . '/html/install.php';
+            $file = $this->appConfig['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 = $this->appConfig['root_dir'] . '/install.php';
+            $fileOnRoot = $this->appConfig['root_dir'].'/install.php';
             if (file_exists($fileOnRoot)) {
                 $message = $app->trans('admin.install.warning', array('installphpPath' => 'install.php'));
                 $app->addWarning($message, 'admin');
@@ -375,7 +375,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/Controller/Admin/Customer/CustomerController.php

Spacing +4 added lines, -4 removed lines

@@ -327,7 +327,7 @@ 
         $em->getConfiguration()->setSQLLogger(null);
 
         $response = new StreamedResponse();
-        $response->setCallback(function () use ($app, $request) {
+        $response->setCallback(function() use ($app, $request) {
 
             // CSV種別を元に初期化.
             $this->csvExportService->initCsvType(CsvType::CSV_TYPE_CUSTOMER);
@@ -341,7 +341,7 @@ 
 
             // データ行の出力.
             $this->csvExportService->setExportQueryBuilder($qb);
-            $this->csvExportService->exportData(function ($entity, $csvService) use ($app, $request) {
+            $this->csvExportService->exportData(function($entity, $csvService) use ($app, $request) {
 
                 $Csvs = $csvService->getCsvs();
 
@@ -376,9 +376,9 @@ 
         });
 
         $now = new \DateTime();
-        $filename = 'customer_' . $now->format('YmdHis') . '.csv';
+        $filename = 'customer_'.$now->format('YmdHis').'.csv';
         $response->headers->set('Content-Type', 'application/octet-stream');
-        $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename);
+        $response->headers->set('Content-Disposition', 'attachment; filename='.$filename);
 
         $response->send();