Browse Source

fixed removal of empty lines in array in phpdoc controller

batch-query-test
Carsten Brandt 9 years ago
parent
commit
d82bf74f41
  1. 9
      build/controllers/PhpDocController.php
  2. 5
      framework/helpers/BaseConsole.php

9
build/controllers/PhpDocController.php

@ -288,6 +288,7 @@ class PhpDocController extends Controller
$propertiesOnly = false; $propertiesOnly = false;
// remove blank lines between properties // remove blank lines between properties
$skip = true; $skip = true;
$level = 0;
foreach($lines as $i => $line) { foreach($lines as $i => $line) {
if (strpos($line, 'class ') !== false) { if (strpos($line, 'class ') !== false) {
$skip = false; $skip = false;
@ -295,8 +296,16 @@ class PhpDocController extends Controller
if ($skip) { if ($skip) {
continue; continue;
} }
// keep spaces in multi line arrays
if (strpos($line, '*') === false && strncmp(trim($line), "'SQLSTATE[", 10) !== 0) {
$level += substr_count($line, '[') - substr_count($line, ']');
}
if (trim($line) === '') { if (trim($line) === '') {
if ($level == 0) {
unset($lines[$i]); unset($lines[$i]);
}
} elseif (ltrim($line)[0] !== '*' && strpos($line, 'function ') !== false) { } elseif (ltrim($line)[0] !== '*' && strpos($line, 'function ') !== false) {
break; break;
} elseif (trim($line) === '}') { } elseif (trim($line) === '}') {

5
framework/helpers/BaseConsole.php

@ -19,6 +19,7 @@ use yii\console\Markdown;
*/ */
class BaseConsole class BaseConsole
{ {
// foreground color control codes
const FG_BLACK = 30; const FG_BLACK = 30;
const FG_RED = 31; const FG_RED = 31;
const FG_GREEN = 32; const FG_GREEN = 32;
@ -27,7 +28,7 @@ class BaseConsole
const FG_PURPLE = 35; const FG_PURPLE = 35;
const FG_CYAN = 36; const FG_CYAN = 36;
const FG_GREY = 37; const FG_GREY = 37;
// background color control codes
const BG_BLACK = 40; const BG_BLACK = 40;
const BG_RED = 41; const BG_RED = 41;
const BG_GREEN = 42; const BG_GREEN = 42;
@ -36,7 +37,7 @@ class BaseConsole
const BG_PURPLE = 45; const BG_PURPLE = 45;
const BG_CYAN = 46; const BG_CYAN = 46;
const BG_GREY = 47; const BG_GREY = 47;
// fonts style control codes
const RESET = 0; const RESET = 0;
const NORMAL = 0; const NORMAL = 0;
const BOLD = 1; const BOLD = 1;

Loading…
Cancel
Save