EC-CUBE / ec-cube

src/Eccube/Form/Type/Install/Step4Type.php

Spacing +2 added lines, -2 removed lines

@@ -91,7 +91,7 @@ 
                     new Assert\NotBlank(),
                 ),
             ))
-            ->addEventListener(FormEvents::POST_SUBMIT, function ($event) {
+            ->addEventListener(FormEvents::POST_SUBMIT, function($event) {
                 $form = $event->getForm();
                 $data = $form->getData();
                 try {
@@ -108,7 +108,7 @@ 
                     $conn = \Doctrine\DBAL\DriverManager::getConnection($connectionParams, $config);
                     $conn->connect();
                 } catch (\Exception $e) {
-                    $form['database']->addError(new FormError('データベースに接続できませんでした。' . $e->getMessage()));
+                    $form['database']->addError(new FormError('データベースに接続できませんでした。'.$e->getMessage()));
                 }
             });
     }

src/Eccube/Controller/Admin/AdminController.php

Spacing +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
     {
         // install.phpのチェック.
         if (isset($app['config']['eccube_install']) && $app['config']['eccube_install'] == 1) {
-            $file = $app['config']['root_dir'] . '/html/install.php';
+            $file = $app['config']['root_dir'].'/html/install.php';
             if (file_exists($file)) {
                 $app->addWarning('admin.install.warning', 'admin');
             }

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

Spacing +4 added lines, -4 removed lines

@@ -83,7 +83,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 $app->render('Content/file.twig', array(
             'form' => $form->createView(),
@@ -138,7 +138,7 @@ 
                 $nowDir = $this->checkDir($request->get('now_dir'), $topDir)
                     ? $this->normalizePath($request->get('now_dir'))
                     : $topDir;
-                $fs->mkdir($nowDir . '/' . $filename);
+                $fs->mkdir($nowDir.'/'.$filename);
             }
         }
 
@@ -217,7 +217,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 {
@@ -268,7 +268,7 @@ 
     private function getFileList($app, $nowDir)
     {
         $topDir = $app['config']['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/Form/Type/Admin/SecurityType.php

Spacing +2 added lines, -2 removed lines

@@ -70,7 +70,7 @@ 
                 '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();
 
@@ -82,7 +82,7 @@ 
                         )
                     );
                     if ($errors->count() != 0) {
-                        $form['admin_allow_host']->addError(new FormError($ip . 'はIPv4アドレスではありません。'));
+                        $form['admin_allow_host']->addError(new FormError($ip.'はIPv4アドレスではありません。'));
                     }
                 }
             })

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

Spacing +6 added lines, -6 removed lines

@@ -141,7 +141,7 @@ 
                 'format' => 'yyyy-MM-dd',
                 'required' => false,
             ))
-            ->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) use ($BaseInfo) {
+            ->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $event) use ($BaseInfo) {
                 if ($BaseInfo->getOptionMultipleShipping() == Constant::ENABLED) {
                     $form = $event->getForm();
                     $form->add('ShipmentItems', 'collection', array(
@@ -152,7 +152,7 @@ 
                     ));
                 }
             })
-            ->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 */
@@ -172,7 +172,7 @@ 
                     'empty_value' => '指定なし',
                     'empty_data' => null,
                     'required' => false,
-                    'query_builder' => function (EntityRepository $er) use ($Delivery) {
+                    'query_builder' => function(EntityRepository $er) use ($Delivery) {
                         return $er->createQueryBuilder('dt')
                             ->where('dt.Delivery = :Delivery')
                             ->setParameter('Delivery', $Delivery);
@@ -180,7 +180,7 @@ 
                 ));
 
             })
-            ->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($app) {
+            ->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($app) {
                 $data = $event->getData();
                 $form = $event->getForm();
                 if (!$data) {
@@ -201,14 +201,14 @@ 
                     'empty_value' => '指定なし',
                     'empty_data' => null,
                     'required' => false,
-                    'query_builder' => function (EntityRepository $er) use ($Delivery) {
+                    'query_builder' => function(EntityRepository $er) use ($Delivery) {
                         return $er->createQueryBuilder('dt')
                             ->where('dt.Delivery = :Delivery')
                             ->setParameter('Delivery', $Delivery);
                     },
                 ));
             })
-            ->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) use ($BaseInfo) {
+            ->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) use ($BaseInfo) {
                 if ($BaseInfo->getOptionMultipleShipping() == Constant::ENABLED) {
                     $form = $event->getForm();
                     $shipmentItems = $form['ShipmentItems']->getData();

src/Eccube/Form/Type/Install/Step3Type.php

Spacing +2 added lines, -2 removed lines

@@ -141,7 +141,7 @@ 
                 'help' => 'メーラーバックエンドがSMTPかつSMTP-AUTH使用時のみ指定',
                 'required' => false,
             ))
-            ->addEventListener(FormEvents::POST_SUBMIT, function ($event) use ($app) {
+            ->addEventListener(FormEvents::POST_SUBMIT, function($event) use ($app) {
                 $form = $event->getForm();
                 $data = $form->getData();
 
@@ -153,7 +153,7 @@ 
                         )
                     );
                     if ($errors->count() != 0) {
-                        $form['admin_allow_hosts']->addError(new FormError($ip . 'はIPv4アドレスではありません。'));
+                        $form['admin_allow_hosts']->addError(new FormError($ip.'はIPv4アドレスではありません。'));
                     }
                 }
             })

src/Eccube/Repository/PluginEventHandlerRepository.php

Spacing +26 added lines, -26 removed lines

@@ -41,8 +41,8 @@ 
         $qb = $this->createQueryBuilder('e')
             ->innerJoin('e.Plugin', 'p')
             ->andWhere('e.del_flg = 0 ')
-            ->Orderby('e.event','ASC')
-            ->addOrderby('e.priority','DESC');
+            ->Orderby('e.event', 'ASC')
+            ->addOrderby('e.priority', 'DESC');
         ;
 
         return $qb->getQuery()->getResult();
@@ -50,62 +50,62 @@ 
 
     public function getPriorityRange($type)
     {
-        if (PluginEventHandler::EVENT_HANDLER_TYPE_FIRST==$type) {
-            $range_start=PluginEventHandler::EVENT_PRIORITY_FIRST_START;
-            $range_end=PluginEventHandler::EVENT_PRIORITY_FIRST_END;
-        } elseif (PluginEventHandler::EVENT_HANDLER_TYPE_LAST==$type) {
-            $range_start=PluginEventHandler::EVENT_PRIORITY_LAST_START;
-            $range_end=PluginEventHandler::EVENT_PRIORITY_LAST_END;
+        if (PluginEventHandler::EVENT_HANDLER_TYPE_FIRST == $type) {
+            $range_start = PluginEventHandler::EVENT_PRIORITY_FIRST_START;
+            $range_end = PluginEventHandler::EVENT_PRIORITY_FIRST_END;
+        } elseif (PluginEventHandler::EVENT_HANDLER_TYPE_LAST == $type) {
+            $range_start = PluginEventHandler::EVENT_PRIORITY_LAST_START;
+            $range_end = PluginEventHandler::EVENT_PRIORITY_LAST_END;
         } else {
-            $range_start=PluginEventHandler::EVENT_PRIORITY_NORMAL_START;
-            $range_end=PluginEventHandler::EVENT_PRIORITY_NORMAL_END;
+            $range_start = PluginEventHandler::EVENT_PRIORITY_NORMAL_START;
+            $range_end = PluginEventHandler::EVENT_PRIORITY_NORMAL_END;
         }
-        return array($range_start,$range_end);
+        return array($range_start, $range_end);
     }
 
-    public function calcNewPriority($event , $type)
+    public function calcNewPriority($event, $type)
     {
-        list($range_start,$range_end) = $this->getPriorityRange($type);
+        list($range_start, $range_end) = $this->getPriorityRange($type);
 
         $qb = $this->createQueryBuilder('e');
         $qb->andWhere("e.priority >= $range_end ")
            ->andWhere("e.priority <= $range_start ")
            ->andWhere('e.event = :event')
-           ->setParameter('event',$event)
+           ->setParameter('event', $event)
            ->setMaxResults(1)
-           ->orderBy('e.priority','ASC');
+           ->orderBy('e.priority', 'ASC');
 
-        $result=$qb->getQuery()->getResult();
+        $result = $qb->getQuery()->getResult();
         if (count($result)) {
-            return $result[0]->getPriority() -1;
+            return $result[0]->getPriority() - 1;
         } else {
             return $range_start;
         }
     }
 
-    public function upPriority($pluginEventHandler,$up=true)
+    public function upPriority($pluginEventHandler, $up = true)
     {
-        list($range_start,$range_end) = $this->getPriorityRange($pluginEventHandler->getHandlerType());
+        list($range_start, $range_end) = $this->getPriorityRange($pluginEventHandler->getHandlerType());
 
         $qb = $this->createQueryBuilder('e');
 
         $qb->andWhere("e.priority >= $range_end ")
            ->andWhere("e.priority <= $range_start ")
            ->andWhere("e.del_flg = 0 ")
-           ->andWhere('e.priority '.($up ?  '>' : '<' ).' :pri')
+           ->andWhere('e.priority '.($up ? '>' : '<').' :pri')
            ->andWhere('e.event = :event')
-           ->setParameter('event',$pluginEventHandler->getEvent())
-           ->setParameter('pri',  $pluginEventHandler->getPriority()  )
+           ->setParameter('event', $pluginEventHandler->getEvent())
+           ->setParameter('pri', $pluginEventHandler->getPriority())
            ->setMaxResults(1)
-           ->orderBy('e.priority', ($up ? 'ASC':'DESC' )  );
+           ->orderBy('e.priority', ($up ? 'ASC' : 'DESC'));
 
-        $result=$qb->getQuery()->getResult();
+        $result = $qb->getQuery()->getResult();
 
         if (count($result)) {
-            $em =$this->getEntityManager();
+            $em = $this->getEntityManager();
             $em->getConnection()->beginTransaction();
             // 2個のentityのprioriryを入れ替える
-            $tmp=$pluginEventHandler->getPriority();
+            $tmp = $pluginEventHandler->getPriority();
             $pluginEventHandler->setPriority($result[0]->getPriority());
             $result[0]->setPriority($tmp);
             $em->persist($result[0]);

src/Eccube/Resource/doctrine/migration/Version20150806220909.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
     public function up(Schema $schema)
     {
         // this up() migration is auto-generated, please modify it to your needs
-        $t=$schema->getTable('dtb_product_class');
+        $t = $schema->getTable('dtb_product_class');
         if (!$t->hasColumn('stock_unlimited') && $t->hasColumn('stock_unlimited_tmp')) {
             $t->addColumn('stock_unlimited', 'smallint', array('NotNull'=>true, 'Default'=>0));
         }

src/Eccube/Resource/doctrine/migration/Version20150806222639.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
     public function up(Schema $schema)
     {
         // this up() migration is auto-generated, please modify it to your needs
-        $t=$schema->getTable('dtb_product_class');
+        $t = $schema->getTable('dtb_product_class');
         if ($t->hasColumn('stock_unlimited_tmp')) {
             $this->addSql('update dtb_product_class set stock_unlimited = stock_unlimited_tmp;');
             $t->dropColumn('stock_unlimited_tmp');