fix Coding Style

EC-CUBE · May 5, 2015 · 38443b3 · 38443b3
1 parent e3db2dd
commit 38443b3
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 23 deletions.
diff --git a/tests/Eccube/Tests/Web/AbstractWebTestCase.php b/tests/Eccube/Tests/Web/AbstractWebTestCase.php
@@ -8,8 +8,8 @@
 abstract class AbstractWebTestCase extends WebTestCase
 {
 
-    protected $client = NULL;
-    static protected $server = NULL;
+    protected $client = null;
+    protected static $server = null;
 
     public function setUp()
     {
@@ -33,7 +33,7 @@ public function tearDown()
 
     public static function tearDownAfterClass()
     {
-        self::$server = NULL;
+        self::$server = null;
     }
 
     /**

diff --git a/tests/Eccube/Tests/Web/Admin/Basis/TaxRuleControllerTest.php b/tests/Eccube/Tests/Web/Admin/Basis/TaxRuleControllerTest.php
@@ -10,15 +10,13 @@ class TaxRuleControllerTest extends AbstractAdminWebTestCase
     public function test_routeing_AdminBasisTax_index()
     {
 
-
         $this->client->request('GET', $this->app['url_generator']->generate('admin_basis_tax_rule'));
         $this->assertTrue($this->client->getResponse()->isSuccessful());
     }
 
     public function test_routeing_AdminBasisTax_edit()
     {
 
-
         $this->client->request('GET', $this->app['url_generator']
             ->generate('admin_basis_tax_rule_edit', array('tax_rule_id' => 0))
         );
@@ -28,7 +26,6 @@ public function test_routeing_AdminBasisTax_edit()
     public function test_routeing_AdminBasisTax_delete()
     {
 
-
         $redirectUrl = $this->app['url_generator']->generate('admin_basis_tax_rule');
 
         $this->client->request('GET', $this->app['url_generator']

diff --git a/tests/Eccube/Tests/Web/Admin/Content/BlockControllerTest.php b/tests/Eccube/Tests/Web/Admin/Content/BlockControllerTest.php
@@ -10,7 +10,6 @@ class BlockControllerTest extends AbstractAdminWebTestCase
     public function test_routeing_AdminContentBlock_index()
     {
 
-
         $this->client->request('GET', $this->app['url_generator']->generate('admin_content_block'));
         $this->assertTrue($this->client->getResponse()->isSuccessful());
     }
@@ -20,8 +19,6 @@ public function test_routeing_AdminContentBlock_edit()
         // TODO: テンプレートファイルの参照等がconstant.yml.distで定まらずCIで落ちるためスキップ
         self::markTestSkipped();
 
-
-
         $this->client->request('GET',
             $this->app['url_generator']
                 ->generate('admin_content_block_edit',
@@ -34,8 +31,6 @@ public function test_routeing_AdminContentBlock_editWithDevice()
         // TODO: テンプレートファイルの参照等がconstant.yml.distで定まらずCIで落ちるためスキップ
         self::markTestSkipped();
 
-
-
         $this->client->request('GET',
             $this->app['url_generator']
                 ->generate('admin_content_block_edit_withDevice',
@@ -46,7 +41,6 @@ public function test_routeing_AdminContentBlock_editWithDevice()
     public function test_routeing_AdminContentBlock_delete()
     {
 
-
         $redirectUrl = $this->app['url_generator']->generate('admin_content_block');
 
         $this->client->request('GET',
@@ -62,7 +56,6 @@ public function test_routeing_AdminContentBlock_delete()
     public function test_routeing_AdminContentBlock_deleteWithDevice()
     {
 
-
         $redirectUrl = $this->app['url_generator']->generate('admin_content_block');
 
         $this->client->request('GET',

diff --git a/tests/Eccube/Tests/Web/Admin/Content/PageControllerTest.php b/tests/Eccube/Tests/Web/Admin/Content/PageControllerTest.php
@@ -10,7 +10,6 @@ class PageControllerTest extends AbstractAdminWebTestCase
     public function test_routeing_AdminContentPage_index()
     {
 
-
         $this->client->request('GET', $this->app['url_generator']->generate('admin_content_page'));
         $this->assertTrue($this->client->getResponse()->isSuccessful());
     }
@@ -20,8 +19,6 @@ public function test_routeing_AdminContentPage_edit()
         // TODO: テンプレートファイルの参照等がconstant.yml.distで定まらずCIで落ちるためスキップ
         self::markTestSkipped();
 
-
-
         $this->client->request('GET',
             $this->app['url_generator']
                 ->generate('admin_content_page_edit',
@@ -34,8 +31,6 @@ public function test_routeing_AdminContentPage_editWithDevice()
         // TODO: テンプレートファイルの参照等がconstant.yml.distで定まらずCIで落ちるためスキップ
         self::markTestSkipped();
 
-
-
         $this->client->request('GET',
             $this->app['url_generator']
                 ->generate('admin_content_page_edit_withDevice',
@@ -46,7 +41,6 @@ public function test_routeing_AdminContentPage_editWithDevice()
     public function test_routeing_AdminContentPage_delete()
     {
 
-
         $redirectUrl = $this->app['url_generator']->generate('admin_content_page');
 
         $this->client->request('GET',
@@ -62,7 +56,6 @@ public function test_routeing_AdminContentPage_delete()
     public function test_routeing_AdminContentPage_deleteWithDevice()
     {
 
-
         $redirectUrl = $this->app['url_generator']->generate('admin_content_page');
 
         $this->client->request('GET',

diff --git a/tests/Eccube/Tests/Web/Admin/Order/EditControllerTest.php b/tests/Eccube/Tests/Web/Admin/Order/EditControllerTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace Eccube\Tests\Web\Order;
+namespace Eccube\Tests\Web\Admin\Order;
 
 use Eccube\Tests\Web\Admin\AbstractAdminWebTestCase;
 

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -3,4 +3,4 @@
 $loader = require __DIR__ . '/../vendor/autoload.php';
 require_once __DIR__ . '/../app/config/eccube/config.php';
 
-$loader->add('Eccube\Tests', __DIR__);
+$loader->add('Eccube\Tests', __DIR__);
diff --git a/tests/ruleset.xml b/tests/ruleset.xml
@@ -33,4 +33,4 @@
  <rule ref="Internal.NoCodeFound">
   <severity>0</severity>
  </rule>
-</ruleset> 
+</ruleset>