EC-CUBE / ec-cube

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

Indentation +2 added lines, -2 removed lines

@@ -77,8 +77,8 @@
                     new Assert\NotBlank(),
                     new Assert\Length(array('max' => $this->appConfig['stext_len'])),
                     new Assert\Regex(array(
-                       'pattern' => "/^[0-9a-zA-Z]+$/",
-                   )),
+                        'pattern' => "/^[0-9a-zA-Z]+$/",
+                    )),
                 ),
             ))
             ->add('admin_allow_hosts', TextareaType::class, array(

Spacing +3 added lines, -3 removed lines

@@ -92,19 +92,19 @@
                 'label' => 'SSLを強制',
                 'required' => false,
             ))
-            ->addEventListener(FormEvents::POST_SUBMIT, function ($event) use($app) {
+            ->addEventListener(FormEvents::POST_SUBMIT, function($event) use($app) {
                 $form = $event->getForm();
                 $data = $form->getData();
 
                 $ips = preg_split("/\R/", $data['admin_allow_hosts'], null, PREG_SPLIT_NO_EMPTY);
 
-                foreach($ips as $ip) {
+                foreach ($ips as $ip) {
                     $errors = $this->recursiveValidator->validate($ip, array(
                             new Assert\Ip(),
                         )
                     );
                     if ($errors->count() != 0) {
-                        $form['admin_allow_hosts']->addError(new FormError($ip . 'はIPv4アドレスではありません。'));
+                        $form['admin_allow_hosts']->addError(new FormError($ip.'はIPv4アドレスではありません。'));
                     }
                 }
             })

src/Eccube/Resource/config/path.php

Indentation +29 added lines, -29 removed lines

@@ -1,31 +1,31 @@
 <?php return [
-  'root_dir' => '%ROOT_DIR%',
-  'root_urlpath' => env('ROOT_URLPATH', null),
-  'template_code' => env('TEMPLATE_CODE','default'),
-  'admin_route' => env('ADMIN_ROUTE','admin'),
-  'user_data_route' => env('USER_DATA_ROUTE', 'user_data'),
-  '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/default/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/default',
-  'template_html_realdir' => '%ROOT_DIR%/html/template/default',
-  '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' => '/html/template/admin',
-  'front_urlpath' => '/html/template/default',
-  'image_save_urlpath' => '/html/upload/save_image',
-  'image_temp_urlpath' => '/html/upload/temp_image',
-  'user_data_urlpath' => '/html/user_data',
-  'plugin_urlpath' => '/html/plugin',
+    'root_dir' => '%ROOT_DIR%',
+    'root_urlpath' => env('ROOT_URLPATH', null),
+    'template_code' => env('TEMPLATE_CODE','default'),
+    'admin_route' => env('ADMIN_ROUTE','admin'),
+    'user_data_route' => env('USER_DATA_ROUTE', 'user_data'),
+    '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/default/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/default',
+    'template_html_realdir' => '%ROOT_DIR%/html/template/default',
+    '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' => '/html/template/admin',
+    'front_urlpath' => '/html/template/default',
+    'image_save_urlpath' => '/html/upload/save_image',
+    'image_temp_urlpath' => '/html/upload/temp_image',
+    'user_data_urlpath' => '/html/user_data',
+    'plugin_urlpath' => '/html/plugin',
 ];

Spacing +2 added lines, -2 removed lines

@@ -1,8 +1,8 @@
 <?php return [
   'root_dir' => '%ROOT_DIR%',
   'root_urlpath' => env('ROOT_URLPATH', null),
-  'template_code' => env('TEMPLATE_CODE','default'),
-  'admin_route' => env('ADMIN_ROUTE','admin'),
+  'template_code' => env('TEMPLATE_CODE', 'default'),
+  'admin_route' => env('ADMIN_ROUTE', 'admin'),
   'user_data_route' => env('USER_DATA_ROUTE', 'user_data'),
   'public_path' => '/html',
   'public_path_realdir' => '%ROOT_DIR%/html',

src/Eccube/Resource/config/log.php

Indentation +14 added lines, -14 removed lines

@@ -1,6 +1,6 @@ 
 <?php return [
-  'log' => 
-  [
+    'log' => 
+    [
     'suffix' => null,
     'filename' => 'site',
     'delimiter' => '_',
@@ -13,8 +13,8 @@ 
     'log_format' => '[%datetime%] %channel%.%level_name% [%session_id%] [%uid%] [%user_id%] [%class%:%function%:%line%] - %message% %context% %extra% [%method%, %url%, %ip%, %referrer%, %user_agent%]',
     'channel' => 
     [
-      'monolog' => 
-      [
+        'monolog' => 
+        [
         'name' => 'eccube',
         'filename' => 'site',
         'delimiter' => '_',
@@ -25,9 +25,9 @@ 
         'max_files' => 90,
         'log_dateformat' => 'Y-m-d H:i:s,u',
         'log_format' => '[%datetime%] %channel%.%level_name% [%session_id%] [%uid%] [%user_id%] [%class%:%function%:%line%] - %message% %context% %extra% [%method%, %url%, %ip%, %referrer%, %user_agent%]',
-      ],
-      'front' => 
-      [
+        ],
+        'front' => 
+        [
         'name' => 'front',
         'filename' => 'front_site',
         'delimiter' => '_',
@@ -38,9 +38,9 @@ 
         'max_files' => 90,
         'log_dateformat' => 'Y-m-d H:i:s,u',
         'log_format' => '[%datetime%] %channel%.%level_name% [%session_id%] [%uid%] [%user_id%] [%class%:%function%:%line%] - %message% %context% %extra% [%method%, %url%, %ip%, %referrer%, %user_agent%]',
-      ],
-      'admin' => 
-      [
+        ],
+        'admin' => 
+        [
         'name' => 'admin',
         'filename' => 'admin_site',
         'delimiter' => '_',
@@ -51,12 +51,12 @@ 
         'max_files' => 90,
         'log_dateformat' => 'Y-m-d H:i:s,u',
         'log_format' => '[%datetime%] %channel%.%level_name% [%session_id%] [%uid%] [%user_id%] [%class%:%function%:%line%] - %message% %context% %extra% [%method%, %url%, %ip%, %referrer%, %user_agent%]',
-      ],
+        ],
     ],
     'exclude_keys' => 
     [
-      'password',
-      'app',
+        'password',
+        'app',
+    ],
     ],
-  ],
 ];

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,
+    ],
     ],
-  ],
 ];

install.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
     apc_clear_cache();
 }
 
-require __DIR__ . '/autoload.php';
+require __DIR__.'/autoload.php';
 
 set_time_limit(0);
 ini_set('memory_limit', -1);

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

Spacing +6 added lines, -6 removed lines

@@ -207,7 +207,7 @@ 
                 'allow_delete' => true,
                 'prototype' => true,
             ))
-            ->addEventListener(FormEvents::POST_SET_DATA, function (FormEvent $event) {
+            ->addEventListener(FormEvents::POST_SET_DATA, function(FormEvent $event) {
                 /** @var \Eccube\Entity\Shipping $data */
                 $data = $event->getData();
                 /** @var \Symfony\Component\Form\Form $form */
@@ -228,7 +228,7 @@ 
                     'placeholder' => '指定なし',
                     'required' => false,
                     'data' => $DeliveryTime,
-                    'query_builder' => function (EntityRepository $er) use ($Delivery) {
+                    'query_builder' => function(EntityRepository $er) use ($Delivery) {
                         $qb = $er->createQueryBuilder('dt');
                         if ($Delivery) {
                             $qb
@@ -240,7 +240,7 @@ 
                     'mapped' => false,
                 ));
             })
-            ->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) {
+            ->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) {
                 $data = $event->getData();
                 $form = $event->getForm();
 
@@ -261,7 +261,7 @@ 
                     'choice_label' => 'delivery_time',
                     'placeholder' => '指定なし',
                     'required' => false,
-                    'query_builder' => function (EntityRepository $er) use ($Delivery) {
+                    'query_builder' => function(EntityRepository $er) use ($Delivery) {
                         $qb = $er->createQueryBuilder('dt');
                         if ($Delivery) {
                             $qb
@@ -273,7 +273,7 @@ 
                     'mapped' => false,
                 ));
             })
-            ->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
+            ->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) {
                 $form = $event->getForm();
                 $OrderItems = $form['OrderItems']->getData();
 
@@ -282,7 +282,7 @@ 
                     $form['shipping_delivery_date']->addError(new FormError('商品が追加されていません。'));
                 }
             })
-            ->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
+            ->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) {
                 $form = $event->getForm();
                 $Shipping = $event->getData();
                 $Delivery = $Shipping->getDelivery();

src/Eccube/Service/EntityProxyService.php

Doc Comments +1 added lines, -1 removed lines

@@ -170,7 +170,7 @@
 
     /**
      * @param $trait
-     * @param $generator
+     * @param ClassGenerator $generator
      */
     private function removePropertiesFromProxy($trait, $generator)
     {

Spacing +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
 
             foreach ($traits as $trait) {
                 $this->removePropertiesFromProxy($trait, $generator);
-                $generator->addTrait('\\' . $trait);
+                $generator->addTrait('\\'.$trait);
             }
 
             // extendしたクラスが相対パスになるので

src/Eccube/Service/SchemaService.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
 
     public function updateSchema($generatedFiles, $proxiesDirectory)
     {
-        $outputDir = sys_get_temp_dir() . '/proxy_' . Str::random(12);
+        $outputDir = sys_get_temp_dir().'/proxy_'.Str::random(12);
         mkdir($outputDir);
 
         try {