Skip to content

Commit

Permalink
Fix coding standards.
Browse files Browse the repository at this point in the history
  • Loading branch information
@markstory
markstory committed Jul 2, 2013
1 parent 9a08aea commit 521c293
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions lib/Cake/Test/Case/Network/CakeRequestTest.php
View file
Expand Up @@ -1237,7 +1237,7 @@ public function testBaseUrlwithModRewriteAlias() {
*/ */
public function testBaseUrlWithModRewriteAndIndexPhp() { public function testBaseUrlWithModRewriteAndIndexPhp() {
$_SERVER['REQUEST_URI'] = '/cakephp/app/webroot/index.php'; $_SERVER['REQUEST_URI'] = '/cakephp/app/webroot/index.php';
$_SERVER['PHP_SELF'] = '/cakephp/app/webroot/index.php'; $_SERVER['PHP_SELF'] = '/cakephp/app/webroot/index.php';
unset($_SERVER['PATH_INFO']); unset($_SERVER['PATH_INFO']);
$request = new CakeRequest(); $request = new CakeRequest();


Expand All @@ -1247,8 +1247,8 @@ public function testBaseUrlWithModRewriteAndIndexPhp() {
$this->assertEquals('/cakephp/', $request->here); $this->assertEquals('/cakephp/', $request->here);


$_SERVER['REQUEST_URI'] = '/cakephp/app/webroot/index.php/'; $_SERVER['REQUEST_URI'] = '/cakephp/app/webroot/index.php/';
$_SERVER['PHP_SELF'] = '/cakephp/app/webroot/index.php/'; $_SERVER['PHP_SELF'] = '/cakephp/app/webroot/index.php/';
$_SERVER['PATH_INFO'] = '/'; $_SERVER['PATH_INFO'] = '/';
$request = new CakeRequest(); $request = new CakeRequest();


$this->assertEquals('/cakephp', $request->base); $this->assertEquals('/cakephp', $request->base);
Expand All @@ -1257,8 +1257,8 @@ public function testBaseUrlWithModRewriteAndIndexPhp() {
$this->assertEquals('/cakephp/', $request->here); $this->assertEquals('/cakephp/', $request->here);


$_SERVER['REQUEST_URI'] = '/cakephp/app/webroot/index.php/apples'; $_SERVER['REQUEST_URI'] = '/cakephp/app/webroot/index.php/apples';
$_SERVER['PHP_SELF'] = '/cakephp/app/webroot/index.php/apples'; $_SERVER['PHP_SELF'] = '/cakephp/app/webroot/index.php/apples';
$_SERVER['PATH_INFO'] = '/apples'; $_SERVER['PATH_INFO'] = '/apples';
$request = new CakeRequest(); $request = new CakeRequest();


$this->assertEquals('/cakephp', $request->base); $this->assertEquals('/cakephp', $request->base);
Expand All @@ -1267,8 +1267,8 @@ public function testBaseUrlWithModRewriteAndIndexPhp() {
$this->assertEquals('/cakephp/apples', $request->here); $this->assertEquals('/cakephp/apples', $request->here);


$_SERVER['REQUEST_URI'] = '/cakephp/app/webroot/index.php/melons/share/'; $_SERVER['REQUEST_URI'] = '/cakephp/app/webroot/index.php/melons/share/';
$_SERVER['PHP_SELF'] = '/cakephp/app/webroot/index.php/melons/share/'; $_SERVER['PHP_SELF'] = '/cakephp/app/webroot/index.php/melons/share/';
$_SERVER['PATH_INFO'] = '/melons/share/'; $_SERVER['PATH_INFO'] = '/melons/share/';
$request = new CakeRequest(); $request = new CakeRequest();


$this->assertEquals('/cakephp', $request->base); $this->assertEquals('/cakephp', $request->base);
Expand All @@ -1277,8 +1277,8 @@ public function testBaseUrlWithModRewriteAndIndexPhp() {
$this->assertEquals('/cakephp/melons/share/', $request->here); $this->assertEquals('/cakephp/melons/share/', $request->here);


$_SERVER['REQUEST_URI'] = '/cakephp/app/webroot/index.php/bananas/eat/tasty_banana'; $_SERVER['REQUEST_URI'] = '/cakephp/app/webroot/index.php/bananas/eat/tasty_banana';
$_SERVER['PHP_SELF'] = '/cakephp/app/webroot/index.php/bananas/eat/tasty_banana'; $_SERVER['PHP_SELF'] = '/cakephp/app/webroot/index.php/bananas/eat/tasty_banana';
$_SERVER['PATH_INFO'] = '/bananas/eat/tasty_banana'; $_SERVER['PATH_INFO'] = '/bananas/eat/tasty_banana';
$request = new CakeRequest(); $request = new CakeRequest();


$this->assertEquals('/cakephp', $request->base); $this->assertEquals('/cakephp', $request->base);
Expand Down Expand Up @@ -1311,7 +1311,7 @@ public function testBaseUrlWithNoModRewrite() {
$this->assertEquals('posts/index', $request->url); $this->assertEquals('posts/index', $request->url);
} }


/** /**
* Test baseUrl and webroot with baseUrl * Test baseUrl and webroot with baseUrl
* *
* @return void * @return void
Expand Down

2 comments on commit 521c293

@ravage84
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, habit of mine...

@markstory
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No worries.

Please sign in to comment.