mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2025-09-05 19:12:42 +00:00
Renaming base url config keys and methods for better uniformity.
This commit is contained in:
parent
b22b39f158
commit
61bf8df454
15 changed files with 69 additions and 69 deletions
|
@ -600,8 +600,8 @@ class HelperTest extends CakeTestCase {
|
|||
public function testAssetTimestamp() {
|
||||
Configure::write('Foo.bar', 'test');
|
||||
Configure::write('Asset.timestamp', false);
|
||||
$result = $this->Helper->assetTimestamp(Configure::read('App.cssURL') . 'cake.generic.css');
|
||||
$this->assertEquals(Configure::read('App.cssURL') . 'cake.generic.css', $result);
|
||||
$result = $this->Helper->assetTimestamp(Configure::read('App.cssBaseUrl') . 'cake.generic.css');
|
||||
$this->assertEquals(Configure::read('App.cssBaseUrl') . 'cake.generic.css', $result);
|
||||
|
||||
Configure::write('Asset.timestamp', true);
|
||||
Configure::write('debug', 0);
|
||||
|
@ -609,25 +609,25 @@ class HelperTest extends CakeTestCase {
|
|||
$result = $this->Helper->assetTimestamp('/%3Cb%3E/cake.generic.css');
|
||||
$this->assertEquals('/%3Cb%3E/cake.generic.css', $result);
|
||||
|
||||
$result = $this->Helper->assetTimestamp(Configure::read('App.cssURL') . 'cake.generic.css');
|
||||
$this->assertEquals(Configure::read('App.cssURL') . 'cake.generic.css', $result);
|
||||
$result = $this->Helper->assetTimestamp(Configure::read('App.cssBaseUrl') . 'cake.generic.css');
|
||||
$this->assertEquals(Configure::read('App.cssBaseUrl') . 'cake.generic.css', $result);
|
||||
|
||||
Configure::write('Asset.timestamp', true);
|
||||
Configure::write('debug', 2);
|
||||
$result = $this->Helper->assetTimestamp(Configure::read('App.cssURL') . 'cake.generic.css');
|
||||
$this->assertRegExp('/' . preg_quote(Configure::read('App.cssURL') . 'cake.generic.css?', '/') . '[0-9]+/', $result);
|
||||
$result = $this->Helper->assetTimestamp(Configure::read('App.cssBaseUrl') . 'cake.generic.css');
|
||||
$this->assertRegExp('/' . preg_quote(Configure::read('App.cssBaseUrl') . 'cake.generic.css?', '/') . '[0-9]+/', $result);
|
||||
|
||||
Configure::write('Asset.timestamp', 'force');
|
||||
Configure::write('debug', 0);
|
||||
$result = $this->Helper->assetTimestamp(Configure::read('App.cssURL') . 'cake.generic.css');
|
||||
$this->assertRegExp('/' . preg_quote(Configure::read('App.cssURL') . 'cake.generic.css?', '/') . '[0-9]+/', $result);
|
||||
$result = $this->Helper->assetTimestamp(Configure::read('App.cssBaseUrl') . 'cake.generic.css');
|
||||
$this->assertRegExp('/' . preg_quote(Configure::read('App.cssBaseUrl') . 'cake.generic.css?', '/') . '[0-9]+/', $result);
|
||||
|
||||
$result = $this->Helper->assetTimestamp(Configure::read('App.cssURL') . 'cake.generic.css?someparam');
|
||||
$this->assertEquals(Configure::read('App.cssURL') . 'cake.generic.css?someparam', $result);
|
||||
$result = $this->Helper->assetTimestamp(Configure::read('App.cssBaseUrl') . 'cake.generic.css?someparam');
|
||||
$this->assertEquals(Configure::read('App.cssBaseUrl') . 'cake.generic.css?someparam', $result);
|
||||
|
||||
$this->Helper->request->webroot = '/some/dir/';
|
||||
$result = $this->Helper->assetTimestamp('/some/dir/' . Configure::read('App.cssURL') . 'cake.generic.css');
|
||||
$this->assertRegExp('/' . preg_quote(Configure::read('App.cssURL') . 'cake.generic.css?', '/') . '[0-9]+/', $result);
|
||||
$result = $this->Helper->assetTimestamp('/some/dir/' . Configure::read('App.cssBaseUrl') . 'cake.generic.css');
|
||||
$this->assertRegExp('/' . preg_quote(Configure::read('App.cssBaseUrl') . 'cake.generic.css?', '/') . '[0-9]+/', $result);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -644,13 +644,13 @@ class HelperTest extends CakeTestCase {
|
|||
),
|
||||
array('fullBase' => true)
|
||||
);
|
||||
$this->assertEquals(Router::baseURL() . '/js/post.js', $result);
|
||||
$this->assertEquals(Router::fullBaseUrl() . '/js/post.js', $result);
|
||||
|
||||
$result = $this->Helper->assetUrl('foo.jpg', array('pathPrefix' => 'img/'));
|
||||
$this->assertEquals('img/foo.jpg', $result);
|
||||
|
||||
$result = $this->Helper->assetUrl('foo.jpg', array('fullBase' => true));
|
||||
$this->assertEquals(Router::baseURL() . '/foo.jpg', $result);
|
||||
$this->assertEquals(Router::fullBaseUrl() . '/foo.jpg', $result);
|
||||
|
||||
$result = $this->Helper->assetUrl('style', array('ext' => '.css'));
|
||||
$this->assertEquals('style.css', $result);
|
||||
|
@ -708,8 +708,8 @@ class HelperTest extends CakeTestCase {
|
|||
$this->Helper->webroot = '';
|
||||
Configure::write('Asset.timestamp', 'force');
|
||||
|
||||
$result = $this->Helper->assetUrl('cake.generic.css', array('pathPrefix' => Configure::read('App.cssURL')));
|
||||
$this->assertRegExp('/' . preg_quote(Configure::read('App.cssURL') . 'cake.generic.css?', '/') . '[0-9]+/', $result);
|
||||
$result = $this->Helper->assetUrl('cake.generic.css', array('pathPrefix' => Configure::read('App.cssBaseUrl')));
|
||||
$this->assertRegExp('/' . preg_quote(Configure::read('App.cssBaseUrl') . 'cake.generic.css?', '/') . '[0-9]+/', $result);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue