From a5531f7419021c5c598aa8d37f985a0bacdc2666 Mon Sep 17 00:00:00 2001 From: euromark Date: Sat, 3 Aug 2013 04:32:39 +0200 Subject: [PATCH] fix casing --- lib/Cake/Routing/Router.php | 4 ++-- lib/Cake/Test/Case/Routing/RouterTest.php | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/Cake/Routing/Router.php b/lib/Cake/Routing/Router.php index 1dccba4d4bb..8e761e3cc9a 100644 --- a/lib/Cake/Routing/Router.php +++ b/lib/Cake/Routing/Router.php @@ -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. * diff --git a/lib/Cake/Test/Case/Routing/RouterTest.php b/lib/Cake/Test/Case/Routing/RouterTest.php index 56dbb5b5915..81f5a5fa413 100644 --- a/lib/Cake/Test/Case/Routing/RouterTest.php +++ b/lib/Cake/Test/Case/Routing/RouterTest.php @@ -49,16 +49,16 @@ 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))); @@ -66,16 +66,16 @@ public function testFullBaseURL() { } /** - * 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')); }