EC-CUBE / ec-cube

src/Eccube/Controller/Admin/Customer/CustomerEditController.php

Spacing +1 added lines, -1 removed lines

@@ -88,7 +88,7 @@
                         ->setCompanyName($Customer->getCompanyName())
                         ->setZip01($Customer->getZip01())
                         ->setZip02($Customer->getZip02())
-                        ->setZipcode($Customer->getZip01() . $Customer->getZip02())
+                        ->setZipcode($Customer->getZip01().$Customer->getZip02())
                         ->setPref($Customer->getPref())
                         ->setAddr01($Customer->getAddr01())
                         ->setAddr02($Customer->getAddr02())

src/Eccube/Controller/Admin/Product/ProductClassController.php

Indentation +1 added lines, -1 removed lines

@@ -138,7 +138,7 @@
                                 'allow_add' => true,
                                 'allow_delete' => true,
                                 'data' => $ProductClasses,
-                             ));
+                                ));
 
                         $event = new EventArgs(
                             array(

Spacing +1 added lines, -1 removed lines

@@ -106,7 +106,7 @@
                     $class2Valied = $this->isValiedCategory($ClassName2);
 
                     // 規格が選択されていないか、選択された状態で分類が保有されていれば、画面表示
-                    if($class1Valied && $class2Valied){
+                    if ($class1Valied && $class2Valied) {
                         $hasClassCategoryFlg = true;
                     }
 

Doc Comments +5 added lines

@@ -529,6 +529,9 @@ 
     /**
      * 登録、更新時のエラー画面表示
      *
+     * @param Application $app
+     * @param boolean $not_product_class
+     * @param \Symfony\Component\Form\FormInterface $classForm
      */
     protected function render($app, $Product, $ProductClass, $not_product_class, $classForm, $error = null)
     {
@@ -580,6 +583,7 @@ 
 
     /**
      * 規格1と規格2を組み合わせた商品規格を作成
+     * @param Application $app
      */
     private function createProductClasses($app, Product $Product, ClassName $ClassName1 = null, ClassName $ClassName2 = null)
     {
@@ -667,6 +671,7 @@ 
      *
      * @param $productClassDest コピー先となる商品規格
      * @param $productClassOrig コピー元となる商品規格
+     * @param Application $app
      */
     private function setDefualtProductClass($app, $productClassDest, $productClassOrig) {
         $productClassDest->setDeliveryDate($productClassOrig->getDeliveryDate());

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

Spacing +3 added lines, -3 removed lines

@@ -113,13 +113,13 @@ 
                 // ファイル生成・更新
                 $tplDir = $app['config']['block_realdir'];
 
-                $filePath = $tplDir . '/' . $Block->getFileName() . '.twig';
+                $filePath = $tplDir.'/'.$Block->getFileName().'.twig';
 
                 $fs = new Filesystem();
                 $fs->dumpFile($filePath, $form->get('block_html')->getData());
                 // 更新でファイル名を変更した場合、以前のファイルを削除
                 if ($Block->getFileName() != $previous_filename && !is_null($previous_filename)) {
-                    $oldFilePath = $tplDir . '/' . $previous_filename . '.twig';
+                    $oldFilePath = $tplDir.'/'.$previous_filename.'.twig';
                     if ($fs->exists($oldFilePath)) {
                         $fs->remove($oldFilePath);
                     }
@@ -171,7 +171,7 @@ 
         // テンプレートが変更されていた場合、DBからはブロック削除されるがtwigファイルは残る
         if ($Block->getDeletableFlg() > 0) {
             $tplDir = $app['config']['block_realdir'];
-            $file = $tplDir . '/' . $Block->getFileName() . '.twig';
+            $file = $tplDir.'/'.$Block->getFileName().'.twig';
             $fs = new Filesystem();
             if ($fs->exists($file)) {
                 $fs->remove($file);

src/Eccube/Controller/Admin/Setting/System/SecurityController.php

Spacing +1 added lines, -1 removed lines

@@ -102,7 +102,7 @@
             if (count($allowHost) > 0) {
                 $form->get('admin_allow_host')->setData(Str::convertLineFeed(implode("\n", $allowHost)));
             }
-            $form->get('force_ssl')->setData((bool)$app['config']['force_ssl']);
+            $form->get('force_ssl')->setData((bool) $app['config']['force_ssl']);
         }
 
         return $app->render('Setting/System/security.twig', array(

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

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 
         // path.ymlの更新
         $app = Application::getInstance();
-        $file = $app['config']['root_dir'] . '/app/config/eccube/path.yml';
+        $file = $app['config']['root_dir'].'/app/config/eccube/path.yml';
         $config = Yaml::parse(file_get_contents($file));
 
         if (!array_key_exists('public_path', $config)) {

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

Unused Use Statements -1 removed lines

@@ -27,7 +27,6 @@
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Validator\Constraints as Assert;
 
 class SearchProductType extends AbstractType
 {

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

Spacing +1 added lines, -1 removed lines

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

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

Doc Comments +3 added lines

@@ -36,6 +36,9 @@
 {
     protected $app;
 
+    /**
+     * @param \Silex\Application $app
+     */
     public function __construct($app)
     {
         $this->app = $app;

Unused Use Statements -2 removed lines

@@ -25,8 +25,6 @@
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Form\FormError;
-use Symfony\Component\Form\FormEvents;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 use Symfony\Component\Security\Core\Validator\Constraints\UserPassword;
 use Symfony\Component\Validator\Constraints as Assert;

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

Spacing +8 added lines, -10 removed lines

@@ -234,13 +234,13 @@ 
                     '\Eccube\Entity\Customer'
                 )));
 
-        $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($BaseInfo) {
+        $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($BaseInfo) {
 
             $data = $event->getData();
             $orderDetails = &$data['OrderDetails'];
 
             // 数量0フィルター
-            $quantityFilter = function ($v) {
+            $quantityFilter = function($v) {
                 return !(isset($v['quantity']) && preg_match('/^0+$/', trim($v['quantity'])));
             };
 
@@ -249,10 +249,9 @@ 
                 $shippings = &$data['Shippings'];
 
                 // 数量を抽出
-                $getQuantity = function ($v) {
+                $getQuantity = function($v) {
                     return (isset($v['quantity']) && preg_match('/^\d+$/', trim($v['quantity']))) ?
-                        trim($v['quantity']) :
-                        0;
+                        trim($v['quantity']) : 0;
                 };
 
                 foreach ($shippings as &$shipping) {
@@ -268,7 +267,7 @@ 
                         $orderDetail['quantity'] = 0;
 
                         // 受注詳細と同じ商品規格のみ抽出
-                        $productClassFilter = function ($v) use ($orderDetail) {
+                        $productClassFilter = function($v) use ($orderDetail) {
                             return $orderDetail['ProductClass'] === $v['ProductClass'];
                         };
 
@@ -277,10 +276,9 @@ 
                             if (!empty($shipping['ShipmentItems'])) {
 
                                 // 同じ商品規格の受注詳細の価格を適用
-                                $applyPrice = function (&$v) use ($orderDetail) {
+                                $applyPrice = function(&$v) use ($orderDetail) {
                                     $v['price'] = ($v['ProductClass'] === $orderDetail['ProductClass']) ?
-                                        $orderDetail['price'] :
-                                        $v['price'];
+                                        $orderDetail['price'] : $v['price'];
                                 };
                                 array_walk($shipping['ShipmentItems'], $applyPrice);
 
@@ -300,7 +298,7 @@ 
 
             $event->setData($data);
         });
-        $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
+        $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) {
             $form = $event->getForm();
             $orderDetails = $form['OrderDetails']->getData();
             if (empty($orderDetails) || count($orderDetails) < 1) {