EC-CUBE / ec-cube

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

Spacing +6 added lines, -10 removed lines

@@ -178,7 +178,7 @@ 
         $app = $this->app;
         // XXX price を priceIncTax にセットし直す
         // OrderItem::getTotalPrice でもやっているので、どこか一箇所にまとめたい
-        $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) use ($app) {
+        $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) use ($app) {
                 /** @var \Eccube\Entity\OrderItem $OrderItem */
                 $OrderItem = $event->getData();
                 $TaxDisplayType = $OrderItem->getTaxDisplayType();
@@ -196,7 +196,7 @@ 
 
                 $event->setData($OrderItem);
         });
-        $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($app) {
+        $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($app) {
             // モーダルからのPOST時に、金額等をセットする.
             if ('modal' === $this->requestStack->getCurrentRequest()->get('modal')) {
                 $data = $event->getData();
@@ -266,17 +266,13 @@ 
                                 $data['product_name'] = $Product->getName();
                                 $data['product_code'] = $ProductClass->getCode();
                                 $data['class_name1'] = $ProductClass->hasClassCategory1() ?
-                                    $ProductClass->getClassCategory1()->getClassName() :
-                                    null;
+                                    $ProductClass->getClassCategory1()->getClassName() : null;
                                 $data['class_name2'] = $ProductClass->hasClassCategory2() ?
-                                    $ProductClass->getClassCategory2()->getClassName() :
-                                    null;
+                                    $ProductClass->getClassCategory2()->getClassName() : null;
                                 $data['class_category_name1'] = $ProductClass->hasClassCategory1() ?
-                                    $ProductClass->getClassCategory1()->getName() :
-                                    null;
+                                    $ProductClass->getClassCategory1()->getName() : null;
                                 $data['class_category_name2'] = $ProductClass->hasClassCategory2() ?
-                                    $ProductClass->getClassCategory2()->getName() :
-                                    null;
+                                    $ProductClass->getClassCategory2()->getName() : null;
                                 $data['price'] = $ProductClass->getPrice02();
                                 $data['quantity'] = empty($data['quantity']) ? 1 : $data['quantity'];
                                 $data['tax_type'] = TaxType::TAXATION;

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

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
                 'label' => false,
                 'class' => 'Eccube\Entity\Page',
                 'choice_label' => 'name',
-                'query_builder' => function (EntityRepository $er) {
+                'query_builder' => function(EntityRepository $er) {
                     return $er
                         ->createQueryBuilder('l')
                         ->where('l.id <> 0')

eccube_install.php

Spacing +5 added lines, -5 removed lines

@@ -400,15 +400,15 @@
     foreach ($finder as $content) {
         $permission = $content->getPerms();
         // see also http://www.php.net/fileperms
-        if (!($permission & 0x0010) || !($permission & 0x0002)) {
+        if (!($permission&0x0010) || !($permission&0x0002)) {
             $realPath = $content->getRealPath();
             if ($verbose) {
                 out(sprintf('%s %s to ', $realPath, substr(sprintf('%o', $permission), -4)), 'info', false);
             }
-            $permission = !($permission & 0x0020) ? $permission += 040 : $permission; // g+r
-            $permission = !($permission & 0x0010) ? $permission += 020 : $permission; // g+w
-            $permission = !($permission & 0x0004) ? $permission += 04 : $permission;  // o+r
-            $permission = !($permission & 0x0002) ? $permission += 02 : $permission;  // o+w
+            $permission = !($permission&0x0020) ? $permission += 040 : $permission; // g+r
+            $permission = !($permission&0x0010) ? $permission += 020 : $permission; // g+w
+            $permission = !($permission&0x0004) ? $permission += 04 : $permission; // o+r
+            $permission = !($permission&0x0002) ? $permission += 02 : $permission; // o+w
             $result = chmod($realPath, $permission);
             if ($verbose) {
                 if ($result) {

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

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アドレスではありません。'));
                     }
                 }
             })

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

index.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 $loader = require __DIR__.'/autoload.php';
 
 ini_set('display_errors', 'Off');
-error_reporting(E_ALL & ~E_DEPRECATED & ~E_STRICT);
+error_reporting(E_ALL&~E_DEPRECATED&~E_STRICT);
 
 // see http://silex.sensiolabs.org/doc/web_servers.html#php-5-4
 $filename = __DIR__.preg_replace('#(\?.*)$#', '', $_SERVER['REQUEST_URI']);

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/ServiceProvider/EccubePluginServiceProvider.php

Spacing +14 added lines, -14 removed lines

@@ -26,7 +26,7 @@ 
     public function register(Container $app)
     {
         // EventDispatcher
-        $app['eccube.event.dispatcher'] = function () use ($app) {
+        $app['eccube.event.dispatcher'] = function() use ($app) {
             return $app['dispatcher'];
         };
 
@@ -35,7 +35,7 @@ 
 
         $enabledPlugins = $app['orm.em']->getRepository('Eccube\Entity\Plugin')->findAllEnabled();
 
-        $app['eccube.routers.plugin'] = function ($app) use ($enabledPlugins) {
+        $app['eccube.routers.plugin'] = function($app) use ($enabledPlugins) {
             $pluginDirs = array_map(function($plugin) use ($app) {
                 return $app['config']['root_dir'].'/app/Plugin/'.$plugin->getCode();
             }, $enabledPlugins);
@@ -62,7 +62,7 @@ 
             $config = $pluginConfig['config'];
 
             if (isset($config['const'])) {
-                $app->extend('config', function ($eccubeConfig) use ($config) {
+                $app->extend('config', function($eccubeConfig) use ($config) {
                     $eccubeConfig[$config['code']] = array(
                         'const' => $config['const'],
                     );
@@ -84,7 +84,7 @@ 
     public function initPluginEventDispatcher(Application $app)
     {
         // hook point
-        $app->on(KernelEvents::REQUEST, function (GetResponseEvent $event) use ($app) {
+        $app->on(KernelEvents::REQUEST, function(GetResponseEvent $event) use ($app) {
             if (!$event->isMasterRequest()) {
                 return;
             }
@@ -92,7 +92,7 @@ 
             $app['eccube.event.dispatcher']->dispatch($hookpoint, $event);
         }, Application::EARLY_EVENT);
 
-        $app->on(KernelEvents::REQUEST, function (GetResponseEvent $event) use ($app) {
+        $app->on(KernelEvents::REQUEST, function(GetResponseEvent $event) use ($app) {
             if (!$event->isMasterRequest()) {
                 return;
             }
@@ -101,7 +101,7 @@ 
             $app['eccube.event.dispatcher']->dispatch($hookpoint, $event);
         });
 
-        $app->on(KernelEvents::RESPONSE, function (FilterResponseEvent $event) use ($app) {
+        $app->on(KernelEvents::RESPONSE, function(FilterResponseEvent $event) use ($app) {
             if (!$event->isMasterRequest()) {
                 return;
             }
@@ -110,7 +110,7 @@ 
             $app['eccube.event.dispatcher']->dispatch($hookpoint, $event);
         });
 
-        $app->on(KernelEvents::RESPONSE, function (FilterResponseEvent $event) use ($app) {
+        $app->on(KernelEvents::RESPONSE, function(FilterResponseEvent $event) use ($app) {
             if (!$event->isMasterRequest()) {
                 return;
             }
@@ -118,13 +118,13 @@ 
             $app['eccube.event.dispatcher']->dispatch($hookpoint, $event);
         }, Application::LATE_EVENT);
 
-        $app->on(KernelEvents::TERMINATE, function (PostResponseEvent $event) use ($app) {
+        $app->on(KernelEvents::TERMINATE, function(PostResponseEvent $event) use ($app) {
             $route = $event->getRequest()->attributes->get('_route');
             $hookpoint = "eccube.event.controller.$route.finish";
             $app['eccube.event.dispatcher']->dispatch($hookpoint, $event);
         });
 
-        $app->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function (\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) {
+        $app->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function(\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) {
             if (!$event->isMasterRequest()) {
                 return;
             }
@@ -133,7 +133,7 @@ 
         });
 
         // Request Event
-        $app->on(\Symfony\Component\HttpKernel\KernelEvents::REQUEST, function (\Symfony\Component\HttpKernel\Event\GetResponseEvent $event) use ($app) {
+        $app->on(\Symfony\Component\HttpKernel\KernelEvents::REQUEST, function(\Symfony\Component\HttpKernel\Event\GetResponseEvent $event) use ($app) {
 
             if (!$event->isMasterRequest()) {
                 return;
@@ -164,7 +164,7 @@ 
         }, 30); // Routing(32)が解決し, 認証判定(8)が実行される前のタイミング.
 
         // Controller Event
-        $app->on(\Symfony\Component\HttpKernel\KernelEvents::CONTROLLER, function (\Symfony\Component\HttpKernel\Event\FilterControllerEvent $event) use ($app) {
+        $app->on(\Symfony\Component\HttpKernel\KernelEvents::CONTROLLER, function(\Symfony\Component\HttpKernel\Event\FilterControllerEvent $event) use ($app) {
 
             if (!$event->isMasterRequest()) {
                 return;
@@ -193,7 +193,7 @@ 
         });
 
         // Response Event
-        $app->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function (\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) {
+        $app->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function(\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) {
             if (!$event->isMasterRequest()) {
                 return;
             }
@@ -222,7 +222,7 @@ 
         });
 
         // Exception Event
-        $app->on(\Symfony\Component\HttpKernel\KernelEvents::EXCEPTION, function (\Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent $event) use ($app) {
+        $app->on(\Symfony\Component\HttpKernel\KernelEvents::EXCEPTION, function(\Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent $event) use ($app) {
 
             if (!$event->isMasterRequest()) {
                 return;
@@ -252,7 +252,7 @@ 
         });
 
         // Terminate Event
-        $app->on(\Symfony\Component\HttpKernel\KernelEvents::TERMINATE, function (\Symfony\Component\HttpKernel\Event\PostResponseEvent $event) use ($app) {
+        $app->on(\Symfony\Component\HttpKernel\KernelEvents::TERMINATE, function(\Symfony\Component\HttpKernel\Event\PostResponseEvent $event) use ($app) {
 
             $route = $event->getRequest()->attributes->get('_route');
 

src/Eccube/Resource/config/path.php

Spacing +2 added lines, -2 removed lines

@@ -1,8 +1,8 @@
 <?php return [
   'root_dir' => '%ROOT_DIR%',
   'root_urlpath' => env('ECCUBE_ROOT_URLPATH', null),
-  'template_code' => env('ECCUBE_TEMPLATE_CODE','default'),
-  'admin_route' => env('ECCUBE_ADMIN_ROUTE','admin'),
+  'template_code' => env('ECCUBE_TEMPLATE_CODE', 'default'),
+  'admin_route' => env('ECCUBE_ADMIN_ROUTE', 'admin'),
   'user_data_route' => env('ECCUBE_USER_DATA_ROUTE', 'user_data'),
   'public_path' => env('ECCUBE_ROOT_URLPATH', null).'/html',
   'public_path_realdir' => '%ROOT_DIR%/html',