EC-CUBE / ec-cube

src/Eccube/Resource/config/database.php

Indentation +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php return [
-  'database' => 
-  [
+    'database' => 
+    [
     'driver' => '${DBDRIVER}',
     'host' => '${DBSERVER}',
     'dbname' => '${DBNAME}',
@@ -10,7 +10,7 @@ 
     'charset' => 'utf8',
     'defaultTableOptions' => 
     [
-      'collate' => 'utf8_general_ci',
+        'collate' => 'utf8_general_ci',
+    ],
     ],
-  ],
 ];

src/Eccube/Resource/config/doctrine_cache.php

Indentation +25 added lines, -25 removed lines

@@ -1,39 +1,39 @@
 <?php return [
-  'doctrine_cache' => 
-  [
+    'doctrine_cache' => 
+    [
     'metadata_cache' => 
     [
-      'driver' => 'array',
-      'path' => NULL,
-      'host' => NULL,
-      'port' => NULL,
-      'password' => NULL,
+        'driver' => 'array',
+        'path' => NULL,
+        'host' => NULL,
+        'port' => NULL,
+        'password' => NULL,
     ],
     'query_cache' => 
     [
-      'driver' => 'array',
-      'path' => NULL,
-      'host' => NULL,
-      'port' => NULL,
-      'password' => NULL,
+        'driver' => 'array',
+        'path' => NULL,
+        'host' => NULL,
+        'port' => NULL,
+        'password' => NULL,
     ],
     'result_cache' => 
     [
-      'driver' => 'array',
-      'path' => NULL,
-      'host' => NULL,
-      'port' => NULL,
-      'password' => NULL,
-      'lifetime' => 3600,
-      'clear_cache' => true,
+        'driver' => 'array',
+        'path' => NULL,
+        'host' => NULL,
+        'port' => NULL,
+        'password' => NULL,
+        'lifetime' => 3600,
+        'clear_cache' => true,
     ],
     'hydration_cache' => 
     [
-      'driver' => 'array',
-      'path' => NULL,
-      'host' => NULL,
-      'port' => NULL,
-      'password' => NULL,
+        'driver' => 'array',
+        'path' => NULL,
+        'host' => NULL,
+        'port' => NULL,
+        'password' => NULL,
+    ],
     ],
-  ],
 ];

src/Eccube/Resource/config/path.php

Indentation +35 added lines, -35 removed lines

@@ -1,38 +1,38 @@
 <?php return [
-   // duplicated
-  'root' => '${ROOT_URLPATH}/',
-  'admin_dir' => '${ADMIN_ROUTE}/',
-  'tpl' => '${ROOT_PUBLIC_URLPATH}/user_data/packages/default/',
-  'admin_tpl' => '${ROOT_PUBLIC_URLPATH}/user_data/packages/admin/',
-  'image_path' => '${ROOT_PUBLIC_URLPATH}/upload/save_image/',
+    // duplicated
+    'root' => '${ROOT_URLPATH}/',
+    'admin_dir' => '${ADMIN_ROUTE}/',
+    'tpl' => '${ROOT_PUBLIC_URLPATH}/user_data/packages/default/',
+    'admin_tpl' => '${ROOT_PUBLIC_URLPATH}/user_data/packages/admin/',
+    'image_path' => '${ROOT_PUBLIC_URLPATH}/upload/save_image/',
 
-  'root_dir' => '${ROOT_DIR}',
-  'root_urlpath' => '${ROOT_URLPATH}',
-  'template_code' => '${TEMPLATE_CODE}',
-  'admin_route' => '${ADMIN_ROUTE}',
-  'user_data_route' => '${USER_DATA_ROUTE}',
-  'public_path' => '/html',
-  'public_path_realdir' => '${ROOT_DIR}/html',
-  'image_save_realdir' => '${ROOT_DIR}/html/upload/save_image',
-  'image_temp_realdir' => '${ROOT_DIR}/html/upload/temp_image',
-  'user_data_realdir' => '${ROOT_DIR}/html/user_data',
-  'block_default_realdir' => '${ROOT_DIR}/src/Eccube/Resource/template/default/Block',
-  'block_realdir' => '${ROOT_DIR}/app/template/${TEMPLATE_CODE}/Block',
-  'template_default_realdir' => '${ROOT_DIR}/src/Eccube/Resource/template/default',
-  'template_default_html_realdir' => '${ROOT_DIR}/html/template/default',
-  'template_admin_realdir' => '${ROOT_DIR}/src/Eccube/Resource/template/admin',
-  'template_admin_html_realdir' => '${ROOT_DIR}/html/template/admin',
-  'template_realdir' => '${ROOT_DIR}/app/template/${TEMPLATE_CODE}',
-  'template_html_realdir' => '${ROOT_DIR}/html/template/${TEMPLATE_CODE}',
-  'template_temp_realdir' => '${ROOT_DIR}/app/cache/eccube/template',
-  'csv_temp_realdir' => '${ROOT_DIR}/app/cache/eccube/csv',
-  'plugin_realdir' => '${ROOT_DIR}/app/Plugin',
-  'plugin_temp_realdir' => '${ROOT_DIR}/app/cache/plugin',
-  'plugin_html_realdir' => '${ROOT_DIR}/html/plugin',
-  'admin_urlpath' => '${ROOT_PUBLIC_URLPATH}/template/admin',
-  'front_urlpath' => '${ROOT_PUBLIC_URLPATH}/template/${TEMPLATE_CODE}',
-  'image_save_urlpath' => '${ROOT_PUBLIC_URLPATH}/upload/save_image',
-  'image_temp_urlpath' => '${ROOT_PUBLIC_URLPATH}/upload/temp_image',
-  'user_data_urlpath' => '${ROOT_PUBLIC_URLPATH}/user_data',
-  'plugin_urlpath' => '${ROOT_PUBLIC_URLPATH}/plugin',
+    'root_dir' => '${ROOT_DIR}',
+    'root_urlpath' => '${ROOT_URLPATH}',
+    'template_code' => '${TEMPLATE_CODE}',
+    'admin_route' => '${ADMIN_ROUTE}',
+    'user_data_route' => '${USER_DATA_ROUTE}',
+    'public_path' => '/html',
+    'public_path_realdir' => '${ROOT_DIR}/html',
+    'image_save_realdir' => '${ROOT_DIR}/html/upload/save_image',
+    'image_temp_realdir' => '${ROOT_DIR}/html/upload/temp_image',
+    'user_data_realdir' => '${ROOT_DIR}/html/user_data',
+    'block_default_realdir' => '${ROOT_DIR}/src/Eccube/Resource/template/default/Block',
+    'block_realdir' => '${ROOT_DIR}/app/template/${TEMPLATE_CODE}/Block',
+    'template_default_realdir' => '${ROOT_DIR}/src/Eccube/Resource/template/default',
+    'template_default_html_realdir' => '${ROOT_DIR}/html/template/default',
+    'template_admin_realdir' => '${ROOT_DIR}/src/Eccube/Resource/template/admin',
+    'template_admin_html_realdir' => '${ROOT_DIR}/html/template/admin',
+    'template_realdir' => '${ROOT_DIR}/app/template/${TEMPLATE_CODE}',
+    'template_html_realdir' => '${ROOT_DIR}/html/template/${TEMPLATE_CODE}',
+    'template_temp_realdir' => '${ROOT_DIR}/app/cache/eccube/template',
+    'csv_temp_realdir' => '${ROOT_DIR}/app/cache/eccube/csv',
+    'plugin_realdir' => '${ROOT_DIR}/app/Plugin',
+    'plugin_temp_realdir' => '${ROOT_DIR}/app/cache/plugin',
+    'plugin_html_realdir' => '${ROOT_DIR}/html/plugin',
+    'admin_urlpath' => '${ROOT_PUBLIC_URLPATH}/template/admin',
+    'front_urlpath' => '${ROOT_PUBLIC_URLPATH}/template/${TEMPLATE_CODE}',
+    'image_save_urlpath' => '${ROOT_PUBLIC_URLPATH}/upload/save_image',
+    'image_temp_urlpath' => '${ROOT_PUBLIC_URLPATH}/upload/temp_image',
+    'user_data_urlpath' => '${ROOT_PUBLIC_URLPATH}/user_data',
+    'plugin_urlpath' => '${ROOT_PUBLIC_URLPATH}/plugin',
 ];

src/Eccube/Resource/config/session_handler.php

Indentation +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php return [
-  'session_handler' =>
-  [
+    'session_handler' =>
+    [
     // PHP/PHP拡張のセッションハンドラを利用する場合, trueに設定します。
     'enabled' => false,
 
@@ -15,5 +15,5 @@ 
     // memcachedの設定例
     //'save_handler' => 'redis',
     //'save_path' => '127.0.0.1:6379',
-  ],
+    ],
 ];

src/Eccube/Controller/Admin/Setting/Shop/DeliveryController.php

Unused Use Statements -1 removed lines

@@ -28,7 +28,6 @@
 use Eccube\Annotation\Component;
 use Eccube\Annotation\Inject;
 use Eccube\Application;
-use Eccube\Common\Constant;
 use Eccube\Controller\AbstractController;
 use Eccube\Entity\Delivery;
 use Eccube\Event\EccubeEvents;

src/Eccube/Controller/Mypage/WithdrawController.php

Unused Use Statements -2 removed lines

@@ -28,14 +28,12 @@
 use Eccube\Annotation\Component;
 use Eccube\Annotation\Inject;
 use Eccube\Application;
-use Eccube\Common\Constant;
 use Eccube\Controller\AbstractController;
 use Eccube\Entity\Master\CustomerStatus;
 use Eccube\Event\EccubeEvents;
 use Eccube\Event\EventArgs;
 use Eccube\Repository\Master\CustomerStatusRepository;
 use Eccube\Service\MailService;
-use Eccube\Util\Str;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 use Symfony\Component\EventDispatcher\EventDispatcher;

src/Eccube/Service/OrderHelper.php

Unused Use Statements -1 removed lines

@@ -6,7 +6,6 @@
 use Doctrine\ORM\EntityManager;
 use Eccube\Annotation\Inject;
 use Eccube\Annotation\Service;
-use Eccube\Common\Constant;
 use Eccube\Entity\CartItem;
 use Eccube\Entity\Customer;
 use Eccube\Entity\CustomerAddress;

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

Spacing +9 added lines, -9 removed lines

@@ -303,7 +303,7 @@ 
         log_info('受注削除開始', array($Order->getId()));
 
         // 出荷に紐付いている明細がある場合は削除できない.
-        $hasShipping = $Order->getItems()->exists(function ($k, $v) {
+        $hasShipping = $Order->getItems()->exists(function($k, $v) {
             return false === is_null($v->getShipping());
         });
         if ($hasShipping) {
@@ -361,7 +361,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_ORDER);
@@ -375,7 +375,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();
 
@@ -416,9 +416,9 @@ 
         });
 
         $now = new \DateTime();
-        $filename = 'order_' . $now->format('YmdHis') . '.csv';
+        $filename = 'order_'.$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();
 
         log_info('受注CSV出力ファイル名', array($filename));
@@ -445,7 +445,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_SHIPPING);
@@ -459,7 +459,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();
 
@@ -509,9 +509,9 @@ 
         });
 
         $now = new \DateTime();
-        $filename = 'shipping_' . $now->format('YmdHis') . '.csv';
+        $filename = 'shipping_'.$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();
 
         log_info('配送CSV出力ファイル名', array($filename));

src/Eccube/Di/Scanner/FormExtensionScanner.php

Doc Comments +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 {
     /**
      * FormExtensionAutoWiring constructor.
-     * @param array|string[] $scanDirs
+     * @param string[] $scanDirs
      */
     public function __construct($scanDirs)
     {