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

Merge pull request #2622 branch 'ext-codestyle-fix' of https://github.com/AlexGx/yii2 into code-style

Browse Source 
* 'ext-codestyle-fix' of https://github.com/AlexGx/yii2:
  fix php5.4 array syntax
  many phpcs fixes
  fix phpDoc LuaScriptBuilder build @throws

Conflicts:
	extensions/apidoc/commands/RenderController.php
	extensions/apidoc/models/BaseDoc.php
	extensions/apidoc/templates/BaseRenderer.php
	extensions/apidoc/templates/bootstrap/Renderer.php
	extensions/apidoc/templates/bootstrap/layouts/guide.php
	extensions/apidoc/templates/bootstrap/layouts/main.php
	extensions/apidoc/templates/html/Renderer.php
	extensions/apidoc/templates/offline/Renderer.php
	extensions/apidoc/templates/offline/assets/AssetBundle.php
	extensions/apidoc/templates/offline/views/index.php
This commit is contained in:
Carsten Brandt
2014-03-07 21:34:23 +01:00
parent e2aacad8aa c906d43343
commit 668dacbab6
110 changed files with 280 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/apidoc/apidoc
View File

@@ -15,7 +15,7 @@ $composerAutoload = [
__DIR__ . '/../../autoload.php', // script is installed as a composer binary
];
$vendorPath = null;
foreach($composerAutoload as $autoload) {
foreach ($composerAutoload as $autoload) {
if (file_exists($autoload)) {
require($autoload);
$vendorPath = dirname($autoload);
@@ -27,7 +27,7 @@ $yiiDirs = [
__DIR__ . '/vendor/yiisoft/yii2', // standalone with "composer install" run
__DIR__ . '/../../yiisoft/yii2', // script is installed as a composer binary
];
foreach($yiiDirs as $dir) {
foreach ($yiiDirs as $dir) {
if (file_exists($dir . '/Yii.php')) {
require($dir . '/Yii.php');
break;