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

Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading

Browse source
This commit is contained in:
José Lorenzo Rodríguez 2011-02-22 00:13:57 -04:30
commit 688e914381
2 changed files with 64 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lib/Cake/Network/CakeRequest.php
View file

@ -189,18 +189,18 @@ class CakeRequest implements ArrayAccess {
* @return string URI The CakePHP request path that is being accessed. * @return string URI The CakePHP request path that is being accessed.
*/ */
protected function _url() { protected function _url() {
$pathInfo = env('PATH_INFO'); if (!empty($_SERVER['PATH_INFO'])) {
if (!empty($pathInfo)) { return $_SERVER['PATH_INFO'];
return $pathInfo; } elseif (isset($_SERVER['REQUEST_URI'])) {
} $uri = $_SERVER['REQUEST_URI'];
foreach (array('PHP_SELF', 'REQUEST_URI', 'HTTP_X_REWRITE_URL', 'argv') as $var) { } elseif (isset($_SERVER['PHP_SELF']) && isset($_SERVER['SCRIPT_NAME'])) {
if ($uri = env($var)) { $uri = str_replace($_SERVER['SCRIPT_NAME'], '', $_SERVER['PHP_SELF']);
if ($var == 'argv') { } elseif (isset($_SERVER['HTTP_X_REWRITE_URL'])) {
$uri = $url[0]; $uri = $_SERVER['HTTP_X_REWRITE_URL'];
} } elseif ($var = env('argv')) {
break; $uri = $var[0];
}
} }
$base = $this->base; $base = $this->base;
if (strpos($uri, $base) === 0) { if (strpos($uri, $base) === 0) {

58
lib/Cake/tests/cases/libs/cake_request.test.php
View file

@ -1173,7 +1173,7 @@ class CakeRequestTestCase extends CakeTestCase {
), ),
), ),
array( array(
'Apache - No rewrite, document root set above top level cake dir, requesting root', 'Apache - No rewrite, document root set above top level cake dir, reques root, no PATH_INFO',
array( array(
'App' => array( 'App' => array(
'base' => false, 'base' => false,
@ -1185,9 +1185,8 @@ class CakeRequestTestCase extends CakeTestCase {
'SERVER_NAME' => 'localhost', 'SERVER_NAME' => 'localhost',
'DOCUMENT_ROOT' => '/Library/WebServer/Documents', 'DOCUMENT_ROOT' => '/Library/WebServer/Documents',
'SCRIPT_FILENAME' => '/Library/WebServer/Documents/site/index.php', 'SCRIPT_FILENAME' => '/Library/WebServer/Documents/site/index.php',
'REQUEST_URI' => '/site/index.php/', 'REQUEST_URI' => '/site/index.php/',
'SCRIPT_NAME' => '/site/index.php', 'SCRIPT_NAME' => '/site/index.php',
'PATH_INFO' => '',
'PHP_SELF' => '/site/index.php/', 'PHP_SELF' => '/site/index.php/',
), ),
), ),
@ -1224,7 +1223,56 @@ class CakeRequestTestCase extends CakeTestCase {
'base' => '/site/index.php', 'base' => '/site/index.php',
'webroot' => '/site/app/webroot/', 'webroot' => '/site/app/webroot/',
), ),
) ),
array(
'Apache - w/rewrite, document root set above top level cake dir, request root, no PATH_INFO',
array(
'App' => array(
'base' => false,
'baseUrl' => false,
'dir' => 'app',
'webroot' => 'webroot'
),
'SERVER' => array(
'SERVER_NAME' => 'localhost',
'DOCUMENT_ROOT' => '/Library/WebServer/Documents',
'SCRIPT_FILENAME' => '/Library/WebServer/Documents/site/index.php',
'REQUEST_URI' => '/site/',
'SCRIPT_NAME' => '/site/app/webroot/index.php',
'PHP_SELF' => '/site/app/webroot/index.php',
),
),
array(
'url' => '',
'base' => '/site',
'webroot' => '/site/',
),
),
array(
'Apache - w/rewrite, document root above top level cake dir, request root, no PATH_INFO/REQUEST_URI',
array(
'App' => array(
'base' => false,
'baseUrl' => false,
'dir' => 'app',
'webroot' => 'webroot'
),
'SERVER' => array(
'SERVER_NAME' => 'localhost',
'DOCUMENT_ROOT' => '/Library/WebServer/Documents',
'SCRIPT_FILENAME' => '/Library/WebServer/Documents/site/index.php',
'SCRIPT_NAME' => '/site/app/webroot/index.php',
'PHP_SELF' => '/site/app/webroot/index.php',
'PATH_INFO' => null,
'REQUEST_URI' => null,
),
),
array(
'url' => '',
'base' => '/site',
'webroot' => '/site/',
),
),
); );
} }
@ -1240,7 +1288,7 @@ class CakeRequestTestCase extends CakeTestCase {
$request = new CakeRequest(); $request = new CakeRequest();
$this->assertEquals($expected['url'], $request->url, "url error"); $this->assertEquals($expected['url'], $request->url, "url error");
$this->assertEquals($expected['base'], $request->base, "base error"); $this->assertEquals($expected['base'], $request->base, "base error");
$this->assertEquals($expected['webroot'],$request->webroot, "webroot error"); $this->assertEquals($expected['webroot'], $request->webroot, "webroot error");
if (isset($expected['urlParams'])) { if (isset($expected['urlParams'])) {
$this->assertEqual($_GET, $expected['urlParams'], "GET param mismatch"); $this->assertEqual($_GET, $expected['urlParams'], "GET param mismatch");
} }