adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Making basics.test.php testDebug more symlink friendly. Adding deprecated tag to global 'uses' method

Browse source
This commit is contained in:
jperras 2009-07-23 16:51:25 -04:00
parent 61c2c3009d
commit d70900c540
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cake/basics.php
View file

@ -84,6 +84,7 @@ if (!function_exists('clone')) {
* </code> * </code>
* *
* @param string $name Filename without the .php part * @param string $name Filename without the .php part
* @deprecated
*/ */
function uses() { function uses() {
$args = func_get_args(); $args = func_get_args();

8
cake/tests/cases/basics.test.php
View file

@ -111,10 +111,10 @@ class BasicsTest extends CakeTestCase {
$_SERVER['HTTPS'] = 'off'; $_SERVER['HTTPS'] = 'off';
$this->assertFalse(env('HTTPS')); $this->assertFalse(env('HTTPS'));
$_SERVER['HTTPS'] = false; $_SERVER['HTTPS'] = false;
$this->assertFalse(env('HTTPS')); $this->assertFalse(env('HTTPS'));
$_SERVER['HTTPS'] = ''; $_SERVER['HTTPS'] = '';
$this->assertFalse(env('HTTPS')); $this->assertFalse(env('HTTPS'));
@ -564,7 +564,7 @@ class BasicsTest extends CakeTestCase {
ob_start(); ob_start();
debug('this-is-a-test'); debug('this-is-a-test');
$result = ob_get_clean(); $result = ob_get_clean();
$pattern = '/.*\>(cake(\/|\\\)tests(\/|\\\)cases(\/|\\\)basics\.test\.php|'; $pattern = '/.*\>(.+?cake(\/|\\\)tests(\/|\\\)cases(\/|\\\)basics\.test\.php|';
$pattern .= preg_quote(substr(__FILE__, 1), '/') . ')'; $pattern .= preg_quote(substr(__FILE__, 1), '/') . ')';
$pattern .= '.*line.*' . (__LINE__ - 4) . '.*this-is-a-test.*/s'; $pattern .= '.*line.*' . (__LINE__ - 4) . '.*this-is-a-test.*/s';
$this->assertPattern($pattern, $result); $this->assertPattern($pattern, $result);
@ -572,7 +572,7 @@ class BasicsTest extends CakeTestCase {
ob_start(); ob_start();
debug('<div>this-is-a-test</div>', true); debug('<div>this-is-a-test</div>', true);
$result = ob_get_clean(); $result = ob_get_clean();
$pattern = '/.*\>(cake(\/|\\\)tests(\/|\\\)cases(\/|\\\)basics\.test\.php|'; $pattern = '/.*\>(.+?cake(\/|\\\)tests(\/|\\\)cases(\/|\\\)basics\.test\.php|';
$pattern .= preg_quote(substr(__FILE__, 1), '/') . ')'; $pattern .= preg_quote(substr(__FILE__, 1), '/') . ')';
$pattern .= '.*line.*' . (__LINE__ - 4) . '.*&lt;div&gt;this-is-a-test&lt;\/div&gt;.*/s'; $pattern .= '.*line.*' . (__LINE__ - 4) . '.*&lt;div&gt;this-is-a-test&lt;\/div&gt;.*/s';
$this->assertPattern($pattern, $result); $this->assertPattern($pattern, $result);