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

Merge branch 'master' into codeception-test-adjustments

Browse Source 
Conflicts:
	.travis.yml
This commit is contained in:
Alexander Makarov
2014-08-15 19:13:58 +04:00
parent 7eb403bf45 cc1247f399
commit 386b63b47c
28 changed files with 449 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/apidoc/models/BaseDoc.php
View File

@ -121,7 +121,7 @@ class BaseDoc extends Object
//
// public function getSourceCode()
// {
// $lines = file(YII_PATH . $this->sourcePath);
// $lines = file(YII2_PATH . $this->sourcePath);
// return implode("", array_slice($lines, $this->startLine - 1, $this->endLine - $this->startLine + 1));
// }