|
|
668dacbab6
|
Merge pull request #2622 branch 'ext-codestyle-fix' of https://github.com/AlexGx/yii2 into code-style
* '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
|
2014-03-07 21:34:23 +01:00 |
|
