php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-26 14:26:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed possible problem with realpath and false value

Browse Source 
realpath(false) = current working directory.
This can cause problems with getAlias() which returns false.

see yiisoft/yii#3113
This commit is contained in:
Carsten Brandt
2014-01-28 14:23:47 +01:00
parent 208d5eaca7
commit f93054a486
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
extensions/faker/FixtureController.php
View File

@ -233,8 +233,9 @@ class FixtureController extends \yii\console\controllers\FixtureController
} }
$content = $this->exportFixtures($fixtures); $content = $this->exportFixtures($fixtures);
file_put_contents($fixturePath . '/' . $fixtureFileName, $content); $filePath = realpath($fixturePath . '/' . $fixtureFileName);
$this->stdout("Fixture file was generated under: " . realpath($fixturePath . "/" . $fixtureFileName) . "\n", Console::FG_GREEN); file_put_contents($filePath, $content);
$this->stdout("Fixture file was generated under: $filePath\n", Console::FG_GREEN);
} }
} }
@ -356,9 +357,9 @@ class FixtureController extends \yii\console\controllers\FixtureController
public function confirmGeneration($files) public function confirmGeneration($files)
{ {
$this->stdout("Fixtures will be generated under the path: \n", Console::FG_YELLOW); $this->stdout("Fixtures will be generated under the path: \n", Console::FG_YELLOW);
$this->stdout(realpath(Yii::getAlias($this->fixturePath, false)) . "\n\n", Console::FG_GREEN); $this->stdout(realpath(Yii::getAlias($this->fixturePath)) . "\n\n", Console::FG_GREEN);
$this->stdout("Templates will be taken from path: \n", Console::FG_YELLOW); $this->stdout("Templates will be taken from path: \n", Console::FG_YELLOW);
$this->stdout(realpath(Yii::getAlias($this->templatePath, false)) . "\n\n", Console::FG_GREEN); $this->stdout(realpath(Yii::getAlias($this->templatePath)) . "\n\n", Console::FG_GREEN);
foreach ($files as $index => $fileName) { foreach ($files as $index => $fileName) {
$this->stdout(" " . ($index + 1) . ". " . basename($fileName) . "\n", Console::FG_GREEN); $this->stdout(" " . ($index + 1) . ". " . basename($fileName) . "\n", Console::FG_GREEN);

3
framework/base/Request.php
View File

@ -6,6 +6,7 @@
*/ */
namespace yii\base; namespace yii\base;
use Yii;
/** /**
* Request represents a request that is handled by an [[Application]]. * Request represents a request that is handled by an [[Application]].
@ -72,7 +73,7 @@ abstract class Request extends Component
*/ */
public function setScriptFile($value) public function setScriptFile($value)
{ {
$scriptFile = realpath(\Yii::getAlias($value)); $scriptFile = realpath(Yii::getAlias($value));
if ($scriptFile !== false && is_file($scriptFile)) { if ($scriptFile !== false && is_file($scriptFile)) {
$this->_scriptFile = $scriptFile; $this->_scriptFile = $scriptFile;
} else { } else {

7
framework/web/AssetManager.php
View File

@ -227,8 +227,7 @@ class AssetManager extends Component
return $this->_published[$path]; return $this->_published[$path];
} }
$src = realpath($path); if (!is_string($path) || ($src = realpath($path)) === false) {
if ($src === false) {
throw new InvalidParamException("The file or directory to be published does not exist: $path"); throw new InvalidParamException("The file or directory to be published does not exist: $path");
} }
@ -295,7 +294,7 @@ class AssetManager extends Component
if (isset($this->_published[$path])) { if (isset($this->_published[$path])) {
return $this->_published[$path][0]; return $this->_published[$path][0];
} }
if (($path = realpath($path)) !== false) { if (is_string($path) && ($path = realpath($path)) !== false) {
$base = $this->basePath . DIRECTORY_SEPARATOR; $base = $this->basePath . DIRECTORY_SEPARATOR;
if (is_file($path)) { if (is_file($path)) {
return $base . $this->hash(dirname($path) . filemtime($path)) . DIRECTORY_SEPARATOR . basename($path); return $base . $this->hash(dirname($path) . filemtime($path)) . DIRECTORY_SEPARATOR . basename($path);
@ -319,7 +318,7 @@ class AssetManager extends Component
if (isset($this->_published[$path])) { if (isset($this->_published[$path])) {
return $this->_published[$path][1]; return $this->_published[$path][1];
} }
if (($path = realpath($path)) !== false) { if (is_string($path) && ($path = realpath($path)) !== false) {
if (is_file($path)) { if (is_file($path)) {
return $this->baseUrl . '/' . $this->hash(dirname($path) . filemtime($path)) . '/' . basename($path); return $this->baseUrl . '/' . $this->hash(dirname($path) . filemtime($path)) . '/' . basename($path);
} else { } else {