Skip to content

Commit

Permalink
fix casing
Browse files Browse the repository at this point in the history
  • Loading branch information
euromark committed Aug 3, 2013
1 parent bbd46c9 commit a5531f7
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions lib/Cake/Routing/Router.php
Expand Up @@ -905,11 +905,11 @@ public static function url($url = null, $full = false) {
/**
* Sets the full base url that will be used as a prefix for generating
* fully qualified URLs for this application. If not parameters are passed,
* the currently configured value is returned
* the currently configured value is returned.
*
* ## Note:
*
* If you change during runtime the configuration value ``App.fullBaseURL``
* If you change the configuration value ``App.fullBaseUrl`` during runtime
* and expect the router to produce links using the new setting, you are
* required to call this method passing such value again.
*
Expand Down
14 changes: 7 additions & 7 deletions lib/Cake/Test/Case/Routing/RouterTest.php
Expand Up @@ -49,33 +49,33 @@ public function setUp() {
public function tearDown() {
parent::tearDown();
CakePlugin::unload();
Router::fullbaseURL('');
Router::fullBaseUrl('');
Configure::write('App.fullBaseUrl', 'http://localhost');
}

/**
* testFullBaseURL method
* testFullBaseUrl method
*
* @return void
*/
public function testFullBaseURL() {
public function testFullBaseUrl() {
$this->assertRegExp('/^http(s)?:\/\//', Router::url('/', true));
$this->assertRegExp('/^http(s)?:\/\//', Router::url(null, true));
$this->assertRegExp('/^http(s)?:\/\//', Router::url(array('full_base' => true)));
$this->assertSame(FULL_BASE_URL . '/', Router::url(array('full_base' => true)));
}

/**
* Tests that the base URL can be changed at runtime
* Tests that the base URL can be changed at runtime.
*
* @return void
*/
public function testBaseURL() {
public function testBaseUrl() {
$this->assertEquals(FULL_BASE_URL, Router::fullBaseUrl());
Router::fullbaseURL('http://example.com');
Router::fullBaseUrl('http://example.com');
$this->assertEquals('http://example.com/', Router::url('/', true));
$this->assertEquals('http://example.com', Configure::read('App.fullBaseUrl'));
Router::fullbaseURL('https://example.com');
Router::fullBaseUrl('https://example.com');
$this->assertEquals('https://example.com/', Router::url('/', true));
$this->assertEquals('https://example.com', Configure::read('App.fullBaseUrl'));
}
Expand Down

1 comment on commit a5531f7

@ADmad
Copy link
Member

@ADmad ADmad commented on a5531f7 Aug 3, 2013

Choose a reason for hiding this comment

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

Thanks, search / replace failed on me 😛

Please sign in to comment.