Commit 1982efbd by AlexGx

many phpcs fixes

parent a94b2778
...@@ -15,7 +15,7 @@ $composerAutoload = [ ...@@ -15,7 +15,7 @@ $composerAutoload = [
__DIR__ . '/../../autoload.php', // script is installed as a composer binary __DIR__ . '/../../autoload.php', // script is installed as a composer binary
]; ];
$vendorPath = null; $vendorPath = null;
foreach($composerAutoload as $autoload) { foreach ($composerAutoload as $autoload) {
if (file_exists($autoload)) { if (file_exists($autoload)) {
require($autoload); require($autoload);
$vendorPath = dirname($autoload); $vendorPath = dirname($autoload);
...@@ -27,7 +27,7 @@ $yiiDirs = [ ...@@ -27,7 +27,7 @@ $yiiDirs = [
__DIR__ . '/vendor/yiisoft/yii2', // standalone with "composer install" run __DIR__ . '/vendor/yiisoft/yii2', // standalone with "composer install" run
__DIR__ . '/../../yiisoft/yii2', // script is installed as a composer binary __DIR__ . '/../../yiisoft/yii2', // script is installed as a composer binary
]; ];
foreach($yiiDirs as $dir) { foreach ($yiiDirs as $dir) {
if (file_exists($dir . '/Yii.php')) { if (file_exists($dir . '/Yii.php')) {
require($dir . '/Yii.php'); require($dir . '/Yii.php');
break; break;
......
...@@ -58,8 +58,8 @@ class RenderController extends Controller ...@@ -58,8 +58,8 @@ class RenderController extends Controller
$this->stdout('Searching files to process... '); $this->stdout('Searching files to process... ');
$files = []; $files = [];
foreach($sourceDirs as $source) { foreach ($sourceDirs as $source) {
foreach($this->findFiles($source) as $fileName) { foreach ($this->findFiles($source) as $fileName) {
$files[$fileName] = $fileName; $files[$fileName] = $fileName;
} }
} }
...@@ -80,7 +80,7 @@ class RenderController extends Controller ...@@ -80,7 +80,7 @@ class RenderController extends Controller
$this->stdout('done.' . PHP_EOL, Console::FG_GREEN); $this->stdout('done.' . PHP_EOL, Console::FG_GREEN);
$this->stdout('Checking for updated files... '); $this->stdout('Checking for updated files... ');
foreach($context->files as $file => $sha) { foreach ($context->files as $file => $sha) {
if (sha1_file($file) === $sha) { if (sha1_file($file) === $sha) {
unset($files[$file]); unset($files[$file]);
} }
...@@ -92,7 +92,7 @@ class RenderController extends Controller ...@@ -92,7 +92,7 @@ class RenderController extends Controller
$this->stdout($fileCount . ' file' . ($fileCount == 1 ? '' : 's') . ' to update.' . PHP_EOL); $this->stdout($fileCount . ' file' . ($fileCount == 1 ? '' : 's') . ' to update.' . PHP_EOL);
Console::startProgress(0, $fileCount, 'Processing files... ', false); Console::startProgress(0, $fileCount, 'Processing files... ', false);
$done = 0; $done = 0;
foreach($files as $file) { foreach ($files as $file) {
$context->addFile($file); $context->addFile($file);
Console::updateProgress(++$done, $fileCount); Console::updateProgress(++$done, $fileCount);
} }
......
...@@ -70,7 +70,7 @@ class ApiMarkdown extends GithubMarkdown ...@@ -70,7 +70,7 @@ class ApiMarkdown extends GithubMarkdown
if (!empty($language)) { if (!empty($language)) {
$block['language'] = $language; $block['language'] = $language;
} }
for($i = $current + 1, $count = count($lines); $i < $count; $i++) { for ($i = $current + 1, $count = count($lines); $i < $count; $i++) {
if (rtrim($line = $lines[$i]) !== $fence) { if (rtrim($line = $lines[$i]) !== $fence) {
$block['content'][] = $line; $block['content'][] = $line;
} else { } else {
......
...@@ -76,7 +76,7 @@ class BaseDoc extends Object ...@@ -76,7 +76,7 @@ class BaseDoc extends Object
$this->phpDocContext = $docblock->getContext(); $this->phpDocContext = $docblock->getContext();
$this->tags = $docblock->getTags(); $this->tags = $docblock->getTags();
foreach($this->tags as $i => $tag) { foreach ($this->tags as $i => $tag) {
if ($tag instanceof SinceTag) { if ($tag instanceof SinceTag) {
$this->since = $tag->getVersion(); $this->since = $tag->getVersion();
unset($this->tags[$i]); unset($this->tags[$i]);
...@@ -104,13 +104,14 @@ class BaseDoc extends Object ...@@ -104,13 +104,14 @@ class BaseDoc extends Object
$this->endLine = $reflection->getEndLine(); $this->endLine = $reflection->getEndLine();
} }
public function getSourceUrl($baseUrl, $line=null) public function getSourceUrl($baseUrl, $line = null)
{ {
if($line === null) if ($line === null) {
return $baseUrl . $this->sourcePath; return $baseUrl . $this->sourcePath;
else } else {
return $baseUrl . $this->sourcePath . '#' . $line; return $baseUrl . $this->sourcePath . '#' . $line;
} }
}
public function getSourceCode() public function getSourceCode()
{ {
......
...@@ -45,12 +45,12 @@ class ClassDoc extends TypeDoc ...@@ -45,12 +45,12 @@ class ClassDoc extends TypeDoc
if (($subject = parent::findSubject($subjectName)) !== null) { if (($subject = parent::findSubject($subjectName)) !== null) {
return $subject; return $subject;
} }
foreach($this->events as $name => $event) { foreach ($this->events as $name => $event) {
if ($subjectName == $name) { if ($subjectName == $name) {
return $event; return $event;
} }
} }
foreach($this->constants as $name => $constant) { foreach ($this->constants as $name => $constant) {
if ($subjectName == $name) { if ($subjectName == $name) {
return $constant; return $constant;
} }
...@@ -64,7 +64,7 @@ class ClassDoc extends TypeDoc ...@@ -64,7 +64,7 @@ class ClassDoc extends TypeDoc
public function getNativeEvents() public function getNativeEvents()
{ {
$events = []; $events = [];
foreach($this->events as $name => $event) { foreach ($this->events as $name => $event) {
if ($event->definedBy != $this->name) { if ($event->definedBy != $this->name) {
continue; continue;
} }
...@@ -93,13 +93,13 @@ class ClassDoc extends TypeDoc ...@@ -93,13 +93,13 @@ class ClassDoc extends TypeDoc
$this->isAbstract = $reflector->isAbstract(); $this->isAbstract = $reflector->isAbstract();
$this->isFinal = $reflector->isFinal(); $this->isFinal = $reflector->isFinal();
foreach($reflector->getInterfaces() as $interface) { foreach ($reflector->getInterfaces() as $interface) {
$this->interfaces[] = ltrim($interface, '\\'); $this->interfaces[] = ltrim($interface, '\\');
} }
foreach($reflector->getTraits() as $trait) { foreach ($reflector->getTraits() as $trait) {
$this->traits[] = ltrim($trait, '\\'); $this->traits[] = ltrim($trait, '\\');
} }
foreach($reflector->getConstants() as $constantReflector) { foreach ($reflector->getConstants() as $constantReflector) {
$docblock = $constantReflector->getDocBlock(); $docblock = $constantReflector->getDocBlock();
if ($docblock !== null && count($docblock->getTagsByName('event')) > 0) { if ($docblock !== null && count($docblock->getTagsByName('event')) > 0) {
$event = new EventDoc($constantReflector); $event = new EventDoc($constantReflector);
......
...@@ -57,15 +57,15 @@ class Context extends Component ...@@ -57,15 +57,15 @@ class Context extends Component
$reflection = new FileReflector($fileName, true); $reflection = new FileReflector($fileName, true);
$reflection->process(); $reflection->process();
foreach($reflection->getClasses() as $class) { foreach ($reflection->getClasses() as $class) {
$class = new ClassDoc($class, $this, ['sourceFile' => $fileName]); $class = new ClassDoc($class, $this, ['sourceFile' => $fileName]);
$this->classes[$class->name] = $class; $this->classes[$class->name] = $class;
} }
foreach($reflection->getInterfaces() as $interface) { foreach ($reflection->getInterfaces() as $interface) {
$interface = new InterfaceDoc($interface, $this, ['sourceFile' => $fileName]); $interface = new InterfaceDoc($interface, $this, ['sourceFile' => $fileName]);
$this->interfaces[$interface->name] = $interface; $this->interfaces[$interface->name] = $interface;
} }
foreach($reflection->getTraits() as $trait) { foreach ($reflection->getTraits() as $trait) {
$trait = new TraitDoc($trait, $this, ['sourceFile' => $fileName]); $trait = new TraitDoc($trait, $this, ['sourceFile' => $fileName]);
$this->traits[$trait->name] = $trait; $this->traits[$trait->name] = $trait;
} }
...@@ -74,7 +74,7 @@ class Context extends Component ...@@ -74,7 +74,7 @@ class Context extends Component
public function updateReferences() public function updateReferences()
{ {
// update all subclass references // update all subclass references
foreach($this->classes as $class) { foreach ($this->classes as $class) {
$className = $class->name; $className = $class->name;
while (isset($this->classes[$class->parentClass])) { while (isset($this->classes[$class->parentClass])) {
$class = $this->classes[$class->parentClass]; $class = $this->classes[$class->parentClass];
...@@ -82,12 +82,12 @@ class Context extends Component ...@@ -82,12 +82,12 @@ class Context extends Component
} }
} }
// update interfaces of subclasses // update interfaces of subclasses
foreach($this->classes as $class) { foreach ($this->classes as $class) {
$this->updateSubclassInferfacesTraits($class); $this->updateSubclassInferfacesTraits($class);
} }
// update implementedBy and usedBy for interfaces and traits // update implementedBy and usedBy for interfaces and traits
foreach($this->classes as $class) { foreach ($this->classes as $class) {
foreach($class->traits as $trait) { foreach ($class->traits as $trait) {
if (isset($this->traits[$trait])) { if (isset($this->traits[$trait])) {
$trait = $this->traits[$trait]; $trait = $this->traits[$trait];
$trait->usedBy[] = $class->name; $trait->usedBy[] = $class->name;
...@@ -95,12 +95,12 @@ class Context extends Component ...@@ -95,12 +95,12 @@ class Context extends Component
$class->methods = array_merge($trait->methods, $class->methods); $class->methods = array_merge($trait->methods, $class->methods);
} }
} }
foreach($class->interfaces as $interface) { foreach ($class->interfaces as $interface) {
if (isset($this->interfaces[$interface])) { if (isset($this->interfaces[$interface])) {
$this->interfaces[$interface]->implementedBy[] = $class->name; $this->interfaces[$interface]->implementedBy[] = $class->name;
if ($class->isAbstract) { if ($class->isAbstract) {
// add not implemented interface methods // add not implemented interface methods
foreach($this->interfaces[$interface]->methods as $method) { foreach ($this->interfaces[$interface]->methods as $method) {
if (!isset($class->methods[$method->name])) { if (!isset($class->methods[$method->name])) {
$class->methods[$method->name] = $method; $class->methods[$method->name] = $method;
} }
...@@ -110,11 +110,11 @@ class Context extends Component ...@@ -110,11 +110,11 @@ class Context extends Component
} }
} }
// inherit properties, methods, contants and events to subclasses // inherit properties, methods, contants and events to subclasses
foreach($this->classes as $class) { foreach ($this->classes as $class) {
$this->updateSubclassInheritance($class); $this->updateSubclassInheritance($class);
} }
// add properties from getters and setters // add properties from getters and setters
foreach($this->classes as $class) { foreach ($this->classes as $class) {
$this->handlePropertyFeature($class); $this->handlePropertyFeature($class);
} }
...@@ -127,7 +127,7 @@ class Context extends Component ...@@ -127,7 +127,7 @@ class Context extends Component
*/ */
protected function updateSubclassInferfacesTraits($class) protected function updateSubclassInferfacesTraits($class)
{ {
foreach($class->subclasses as $subclass) { foreach ($class->subclasses as $subclass) {
$subclass = $this->classes[$subclass]; $subclass = $this->classes[$subclass];
$subclass->interfaces = array_unique(array_merge($subclass->interfaces, $class->interfaces)); $subclass->interfaces = array_unique(array_merge($subclass->interfaces, $class->interfaces));
$subclass->traits = array_unique(array_merge($subclass->traits, $class->traits)); $subclass->traits = array_unique(array_merge($subclass->traits, $class->traits));
...@@ -141,7 +141,7 @@ class Context extends Component ...@@ -141,7 +141,7 @@ class Context extends Component
*/ */
protected function updateSubclassInheritance($class) protected function updateSubclassInheritance($class)
{ {
foreach($class->subclasses as $subclass) { foreach ($class->subclasses as $subclass) {
$subclass = $this->classes[$subclass]; $subclass = $this->classes[$subclass];
$subclass->events = array_merge($class->events, $subclass->events); $subclass->events = array_merge($class->events, $subclass->events);
$subclass->constants = array_merge($class->constants, $subclass->constants); $subclass->constants = array_merge($class->constants, $subclass->constants);
...@@ -160,7 +160,7 @@ class Context extends Component ...@@ -160,7 +160,7 @@ class Context extends Component
if (!$this->isSubclassOf($class, 'yii\base\Object')) { if (!$this->isSubclassOf($class, 'yii\base\Object')) {
return; return;
} }
foreach($class->getPublicMethods() as $name => $method) { foreach ($class->getPublicMethods() as $name => $method) {
if ($method->isStatic) { if ($method->isStatic) {
continue; continue;
} }
...@@ -232,7 +232,7 @@ class Context extends Component ...@@ -232,7 +232,7 @@ class Context extends Component
*/ */
private function paramsOptional($method, $number = 0) private function paramsOptional($method, $number = 0)
{ {
foreach($method->params as $param) { foreach ($method->params as $param) {
if (!$param->isOptional && $number-- <= 0) { if (!$param->isOptional && $number-- <= 0) {
return false; return false;
} }
...@@ -246,7 +246,7 @@ class Context extends Component ...@@ -246,7 +246,7 @@ class Context extends Component
*/ */
private function getFirstNotOptionalParameter($method) private function getFirstNotOptionalParameter($method)
{ {
foreach($method->params as $param) { foreach ($method->params as $param) {
if (!$param->isOptional) { if (!$param->isOptional) {
return $param; return $param;
} }
...@@ -266,7 +266,7 @@ class Context extends Component ...@@ -266,7 +266,7 @@ class Context extends Component
if ($classA->name == $classB) { if ($classA->name == $classB) {
return true; return true;
} }
while($classA->parentClass !== null && isset($this->classes[$classA->parentClass])) { while ($classA->parentClass !== null && isset($this->classes[$classA->parentClass])) {
$classA = $this->classes[$classA->parentClass]; $classA = $this->classes[$classA->parentClass];
if ($classA->name == $classB) { if ($classA->name == $classB) {
return true; return true;
......
...@@ -34,7 +34,7 @@ class EventDoc extends ConstDoc ...@@ -34,7 +34,7 @@ class EventDoc extends ConstDoc
return; return;
} }
foreach($this->tags as $i => $tag) { foreach ($this->tags as $i => $tag) {
if ($tag->getName() == 'event') { if ($tag->getName() == 'event') {
$eventTag = new ReturnTag('event', $tag->getContent(), $tag->getDocBlock(), $tag->getLocation()); $eventTag = new ReturnTag('event', $tag->getContent(), $tag->getDocBlock(), $tag->getLocation());
$this->type = $eventTag->getType(); $this->type = $eventTag->getType();
......
...@@ -45,12 +45,12 @@ class FunctionDoc extends BaseDoc ...@@ -45,12 +45,12 @@ class FunctionDoc extends BaseDoc
$this->isReturnByReference = $reflector->isByRef(); $this->isReturnByReference = $reflector->isByRef();
foreach($reflector->getArguments() as $arg) { foreach ($reflector->getArguments() as $arg) {
$arg = new ParamDoc($arg, $context, ['sourceFile' => $this->sourceFile]); $arg = new ParamDoc($arg, $context, ['sourceFile' => $this->sourceFile]);
$this->params[$arg->name] = $arg; $this->params[$arg->name] = $arg;
} }
foreach($this->tags as $i => $tag) { foreach ($this->tags as $i => $tag) {
if ($tag instanceof ThrowsTag) { if ($tag instanceof ThrowsTag) {
$this->exceptions[$tag->getType()] = $tag->getDescription(); $this->exceptions[$tag->getType()] = $tag->getDescription();
unset($this->tags[$i]); unset($this->tags[$i]);
......
...@@ -33,11 +33,11 @@ class InterfaceDoc extends TypeDoc ...@@ -33,11 +33,11 @@ class InterfaceDoc extends TypeDoc
return; return;
} }
foreach($reflector->getParentInterfaces() as $interface) { foreach ($reflector->getParentInterfaces() as $interface) {
$this->parentInterfaces[] = ltrim($interface, '\\'); $this->parentInterfaces[] = ltrim($interface, '\\');
} }
foreach($this->methods as $method) { foreach ($this->methods as $method) {
$method->isAbstract = true; $method->isAbstract = true;
} }
......
...@@ -63,7 +63,7 @@ class PropertyDoc extends BaseDoc ...@@ -63,7 +63,7 @@ class PropertyDoc extends BaseDoc
$this->defaultValue = PrettyPrinter::getRepresentationOfValue($reflector->getNode()->default); $this->defaultValue = PrettyPrinter::getRepresentationOfValue($reflector->getNode()->default);
} }
foreach($this->tags as $tag) { foreach ($this->tags as $tag) {
if ($tag instanceof VarTag) { if ($tag instanceof VarTag) {
$this->type = $tag->getType(); $this->type = $tag->getType();
$this->types = $tag->getTypes(); $this->types = $tag->getTypes();
......
...@@ -34,7 +34,7 @@ class TraitDoc extends TypeDoc ...@@ -34,7 +34,7 @@ class TraitDoc extends TypeDoc
return; return;
} }
foreach($reflector->getTraits() as $trait) { foreach ($reflector->getTraits() as $trait) {
$this->traits[] = ltrim($trait, '\\'); $this->traits[] = ltrim($trait, '\\');
} }
} }
......
...@@ -41,7 +41,7 @@ class TypeDoc extends BaseDoc ...@@ -41,7 +41,7 @@ class TypeDoc extends BaseDoc
public function findSubject($subjectName) public function findSubject($subjectName)
{ {
if ($subjectName[0] != '$') { if ($subjectName[0] != '$') {
foreach($this->methods as $name => $method) { foreach ($this->methods as $name => $method) {
if (rtrim($subjectName, '()') == $name) { if (rtrim($subjectName, '()') == $name) {
return $method; return $method;
} }
...@@ -53,7 +53,7 @@ class TypeDoc extends BaseDoc ...@@ -53,7 +53,7 @@ class TypeDoc extends BaseDoc
if ($this->properties === null) { if ($this->properties === null) {
return null; return null;
} }
foreach($this->properties as $name => $property) { foreach ($this->properties as $name => $property) {
if (ltrim($subjectName, '$') == ltrim($name, '$')) { if (ltrim($subjectName, '$') == ltrim($name, '$')) {
return $property; return $property;
} }
...@@ -93,7 +93,7 @@ class TypeDoc extends BaseDoc ...@@ -93,7 +93,7 @@ class TypeDoc extends BaseDoc
private function getFilteredMethods($visibility = null, $definedBy = null) private function getFilteredMethods($visibility = null, $definedBy = null)
{ {
$methods = []; $methods = [];
foreach($this->methods as $name => $method) { foreach ($this->methods as $name => $method) {
if ($visibility !== null && $method->visibility != $visibility) { if ($visibility !== null && $method->visibility != $visibility) {
continue; continue;
} }
...@@ -140,7 +140,7 @@ class TypeDoc extends BaseDoc ...@@ -140,7 +140,7 @@ class TypeDoc extends BaseDoc
return []; return [];
} }
$properties = []; $properties = [];
foreach($this->properties as $name => $property) { foreach ($this->properties as $name => $property) {
if ($visibility !== null && $property->visibility != $visibility) { if ($visibility !== null && $property->visibility != $visibility) {
continue; continue;
} }
...@@ -167,14 +167,14 @@ class TypeDoc extends BaseDoc ...@@ -167,14 +167,14 @@ class TypeDoc extends BaseDoc
return; return;
} }
foreach($this->tags as $i => $tag) { foreach ($this->tags as $i => $tag) {
if ($tag instanceof AuthorTag) { if ($tag instanceof AuthorTag) {
$this->authors[$tag->getAuthorName()] = $tag->getAuthorEmail(); $this->authors[$tag->getAuthorName()] = $tag->getAuthorEmail();
unset($this->tags[$i]); unset($this->tags[$i]);
} }
} }
foreach($reflector->getProperties() as $propertyReflector) { foreach ($reflector->getProperties() as $propertyReflector) {
if ($propertyReflector->getVisibility() != 'private') { if ($propertyReflector->getVisibility() != 'private') {
$property = new PropertyDoc($propertyReflector, $context, ['sourceFile' => $this->sourceFile]); $property = new PropertyDoc($propertyReflector, $context, ['sourceFile' => $this->sourceFile]);
$property->definedBy = $this->name; $property->definedBy = $this->name;
...@@ -182,7 +182,7 @@ class TypeDoc extends BaseDoc ...@@ -182,7 +182,7 @@ class TypeDoc extends BaseDoc
} }
} }
foreach($reflector->getMethods() as $methodReflector) { foreach ($reflector->getMethods() as $methodReflector) {
if ($methodReflector->getVisibility() != 'private') { if ($methodReflector->getVisibility() != 'private') {
$method = new MethodDoc($methodReflector, $context, ['sourceFile' => $this->sourceFile]); $method = new MethodDoc($methodReflector, $context, ['sourceFile' => $this->sourceFile]);
$method->definedBy = $this->name; $method->definedBy = $this->name;
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
*/ */
namespace yii\apidoc\templates\bootstrap; namespace yii\apidoc\templates\bootstrap;
use yii\apidoc\helpers\ApiMarkdown; use yii\apidoc\helpers\ApiMarkdown;
use yii\apidoc\models\Context; use yii\apidoc\models\Context;
use yii\console\Controller; use yii\console\Controller;
...@@ -60,7 +61,7 @@ class Renderer extends \yii\apidoc\templates\html\Renderer ...@@ -60,7 +61,7 @@ class Renderer extends \yii\apidoc\templates\html\Renderer
$types = array_merge($context->classes, $context->interfaces, $context->traits); $types = array_merge($context->classes, $context->interfaces, $context->traits);
$controller->stdout('generating extension index files...'); $controller->stdout('generating extension index files...');
foreach($this->extensions as $ext) { foreach ($this->extensions as $ext) {
$readme = @file_get_contents("https://raw.github.com/yiisoft/yii2-$ext/master/README.md"); $readme = @file_get_contents("https://raw.github.com/yiisoft/yii2-$ext/master/README.md");
$indexFileContent = $this->renderWithLayout($this->indexView, [ $indexFileContent = $this->renderWithLayout($this->indexView, [
'docContext' => $context, 'docContext' => $context,
...@@ -109,13 +110,13 @@ class Renderer extends \yii\apidoc\templates\html\Renderer ...@@ -109,13 +110,13 @@ class Renderer extends \yii\apidoc\templates\html\Renderer
switch ($navClasses) switch ($navClasses)
{ {
case 'app': case 'app':
$types = array_filter($types, function($val) { $types = array_filter($types, function ($val) {
return strncmp($val->name, 'yii\\', 4) !== 0; return strncmp($val->name, 'yii\\', 4) !== 0;
}); });
break; break;
case 'yii': case 'yii':
$self = $this; $self = $this;
$types = array_filter($types, function($val) use ($self) { $types = array_filter($types, function ($val) use ($self) {
if (strlen($val->name) < 5) { if (strlen($val->name) < 5) {
return false; return false;
} }
...@@ -124,7 +125,7 @@ class Renderer extends \yii\apidoc\templates\html\Renderer ...@@ -124,7 +125,7 @@ class Renderer extends \yii\apidoc\templates\html\Renderer
}); });
break; break;
default: default:
$types = array_filter($types, function($val) use ($navClasses) { $types = array_filter($types, function ($val) use ($navClasses) {
return strncmp($val->name, "yii\\$navClasses\\", strlen("yii\\$navClasses\\")) === 0; return strncmp($val->name, "yii\\$navClasses\\", strlen("yii\\$navClasses\\")) === 0;
}); });
} }
...@@ -151,7 +152,7 @@ class Renderer extends \yii\apidoc\templates\html\Renderer ...@@ -151,7 +152,7 @@ class Renderer extends \yii\apidoc\templates\html\Renderer
$done = 0; $done = 0;
$fileData = []; $fileData = [];
$headlines = []; $headlines = [];
foreach($files as $file) { foreach ($files as $file) {
$fileData[$file] = file_get_contents($file); $fileData[$file] = file_get_contents($file);
if (basename($file) == 'index.md') { if (basename($file) == 'index.md') {
continue; // to not add index file to nav continue; // to not add index file to nav
...@@ -163,7 +164,7 @@ class Renderer extends \yii\apidoc\templates\html\Renderer ...@@ -163,7 +164,7 @@ class Renderer extends \yii\apidoc\templates\html\Renderer
} }
} }
foreach($fileData as $file => $content) { foreach ($fileData as $file => $content) {
$output = ApiMarkdown::process($content); // TODO generate links to yiiframework.com by default $output = ApiMarkdown::process($content); // TODO generate links to yiiframework.com by default
$output = $this->fixMarkdownLinks($output); $output = $this->fixMarkdownLinks($output);
if ($this->guideLayout !== false) { if ($this->guideLayout !== false) {
...@@ -191,7 +192,7 @@ class Renderer extends \yii\apidoc\templates\html\Renderer ...@@ -191,7 +192,7 @@ class Renderer extends \yii\apidoc\templates\html\Renderer
public function getGuideReferences() public function getGuideReferences()
{ {
$refs = []; $refs = [];
foreach($this->markDownFiles as $file) { foreach ($this->markDownFiles as $file) {
$refName = 'guide-' . basename($file, '.md'); $refName = 'guide-' . basename($file, '.md');
$refs[$refName] = ['url' => $this->generateGuideFileName($file)]; $refs[$refName] = ['url' => $this->generateGuideFileName($file)];
} }
......
...@@ -151,7 +151,7 @@ class SideNavWidget extends \yii\bootstrap\Widget ...@@ -151,7 +151,7 @@ class SideNavWidget extends \yii\bootstrap\Widget
$label .= ' ' . Html::tag('b', '', ['class' => 'caret']); $label .= ' ' . Html::tag('b', '', ['class' => 'caret']);
if (is_array($items)) { if (is_array($items)) {
if ($active === false) { if ($active === false) {
foreach($items as $subItem) { foreach ($items as $subItem) {
if (isset($subItem['active']) && $subItem['active']) { if (isset($subItem['active']) && $subItem['active']) {
$active = true; $active = true;
} }
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
*/ */
namespace yii\apidoc\templates\bootstrap\assets; namespace yii\apidoc\templates\bootstrap\assets;
use yii\web\View; use yii\web\View;
/** /**
......
...@@ -14,7 +14,7 @@ $this->beginContent('@yii/apidoc/templates/bootstrap/layouts/main.php'); ?> ...@@ -14,7 +14,7 @@ $this->beginContent('@yii/apidoc/templates/bootstrap/layouts/main.php'); ?>
$types = $this->context->getNavTypes(isset($type) ? $type : null, $types); $types = $this->context->getNavTypes(isset($type) ? $type : null, $types);
ksort($types); ksort($types);
$nav = []; $nav = [];
foreach($types as $i=>$class) { foreach ($types as $i => $class) {
$namespace = $class->namespace; $namespace = $class->namespace;
if (empty($namespace)) { if (empty($namespace)) {
$namespace = 'Not namespaced classes'; $namespace = 'Not namespaced classes';
......
...@@ -17,7 +17,7 @@ $this->beginContent('@yii/apidoc/templates/bootstrap/layouts/main.php'); ?> ...@@ -17,7 +17,7 @@ $this->beginContent('@yii/apidoc/templates/bootstrap/layouts/main.php'); ?>
'url' => './guide_index.html', 'url' => './guide_index.html',
'active' => isset($currentFile) && (basename($currentFile) == 'index.md'), 'active' => isset($currentFile) && (basename($currentFile) == 'index.md'),
]; ];
foreach($headlines as $file => $headline) { foreach ($headlines as $file => $headline) {
// if (!isset($nav[$namespace])) { // if (!isset($nav[$namespace])) {
// $nav[$namespace] = [ // $nav[$namespace] = [
// 'label' => $namespace, // 'label' => $namespace,
......
...@@ -46,7 +46,7 @@ $this->beginPage(); ...@@ -46,7 +46,7 @@ $this->beginPage();
'view' => $this, 'view' => $this,
]); ]);
$extItems = []; $extItems = [];
foreach($this->context->extensions as $ext) { foreach ($this->context->extensions as $ext) {
$extItems[] = [ $extItems[] = [
'label' => $ext, 'label' => $ext,
'url' => "./ext_{$ext}_index.html", 'url' => "./ext_{$ext}_index.html",
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
use yii\apidoc\models\ClassDoc; use yii\apidoc\models\ClassDoc;
use yii\apidoc\models\InterfaceDoc; use yii\apidoc\models\InterfaceDoc;
use yii\apidoc\models\TraitDoc; use yii\apidoc\models\TraitDoc;
/** /**
* @var ClassDoc[]|InterfaceDoc[]|TraitDoc[] $types * @var ClassDoc[]|InterfaceDoc[]|TraitDoc[] $types
* @var yii\web\View $this * @var yii\web\View $this
...@@ -26,7 +27,7 @@ if (isset($readme)) { ...@@ -26,7 +27,7 @@ if (isset($readme)) {
</tr> </tr>
<?php <?php
ksort($types); ksort($types);
foreach($types as $i=>$class): foreach($types as $i => $class):
?> ?>
<tr> <tr>
<td><?= $this->context->typeLink($class, $class->name) ?></td> <td><?= $this->context->typeLink($class, $class->name) ?></td>
......
...@@ -105,7 +105,7 @@ abstract class Renderer extends BaseRenderer implements ViewContextInterface ...@@ -105,7 +105,7 @@ abstract class Renderer extends BaseRenderer implements ViewContextInterface
$typeCount = count($types) + 1; $typeCount = count($types) + 1;
Console::startProgress(0, $typeCount, 'Rendering files: ', false); Console::startProgress(0, $typeCount, 'Rendering files: ', false);
$done = 0; $done = 0;
foreach($types as $type) { foreach ($types as $type) {
$fileContent = $this->renderWithLayout($this->typeView, [ $fileContent = $this->renderWithLayout($this->typeView, [
'type' => $type, 'type' => $type,
'docContext' => $context, 'docContext' => $context,
...@@ -147,7 +147,7 @@ abstract class Renderer extends BaseRenderer implements ViewContextInterface ...@@ -147,7 +147,7 @@ abstract class Renderer extends BaseRenderer implements ViewContextInterface
$types = [$types]; $types = [$types];
} }
$links = []; $links = [];
foreach($types as $type) { foreach ($types as $type) {
$postfix = ''; $postfix = '';
if (!is_object($type)) { if (!is_object($type)) {
if (substr($type, -2, 2) == '[]') { if (substr($type, -2, 2) == '[]') {
...@@ -235,7 +235,7 @@ abstract class Renderer extends BaseRenderer implements ViewContextInterface ...@@ -235,7 +235,7 @@ abstract class Renderer extends BaseRenderer implements ViewContextInterface
$parents = []; $parents = [];
$parents[] = $this->typeLink($class); $parents[] = $this->typeLink($class);
while ($class->parentClass !== null) { while ($class->parentClass !== null) {
if(isset($this->context->classes[$class->parentClass])) { if (isset($this->context->classes[$class->parentClass])) {
$class = $this->context->classes[$class->parentClass]; $class = $this->context->classes[$class->parentClass];
$parents[] = $this->typeLink($class); $parents[] = $this->typeLink($class);
} else { } else {
...@@ -254,8 +254,8 @@ abstract class Renderer extends BaseRenderer implements ViewContextInterface ...@@ -254,8 +254,8 @@ abstract class Renderer extends BaseRenderer implements ViewContextInterface
{ {
$interfaces = []; $interfaces = [];
sort($names, SORT_STRING); sort($names, SORT_STRING);
foreach($names as $interface) { foreach ($names as $interface) {
if(isset($this->context->interfaces[$interface])) { if (isset($this->context->interfaces[$interface])) {
$interfaces[] = $this->typeLink($this->context->interfaces[$interface]); $interfaces[] = $this->typeLink($this->context->interfaces[$interface]);
} else { } else {
$interfaces[] = $interface; // TODO link to php.net $interfaces[] = $interface; // TODO link to php.net
...@@ -272,8 +272,8 @@ abstract class Renderer extends BaseRenderer implements ViewContextInterface ...@@ -272,8 +272,8 @@ abstract class Renderer extends BaseRenderer implements ViewContextInterface
{ {
$traits = []; $traits = [];
sort($names, SORT_STRING); sort($names, SORT_STRING);
foreach($names as $trait) { foreach ($names as $trait) {
if(isset($this->context->traits[$trait])) { if (isset($this->context->traits[$trait])) {
$traits[] = $this->typeLink($this->context->traits[$trait]); $traits[] = $this->typeLink($this->context->traits[$trait]);
} else { } else {
$traits[] = $trait; // TODO link to php.net $traits[] = $trait; // TODO link to php.net
...@@ -290,8 +290,8 @@ abstract class Renderer extends BaseRenderer implements ViewContextInterface ...@@ -290,8 +290,8 @@ abstract class Renderer extends BaseRenderer implements ViewContextInterface
{ {
$classes = []; $classes = [];
sort($names, SORT_STRING); sort($names, SORT_STRING);
foreach($names as $class) { foreach ($names as $class) {
if(isset($this->context->classes[$class])) { if (isset($this->context->classes[$class])) {
$classes[] = $this->typeLink($this->context->classes[$class]); $classes[] = $this->typeLink($this->context->classes[$class]);
} else { } else {
$classes[] = $class; // TODO link to php.net $classes[] = $class; // TODO link to php.net
...@@ -326,7 +326,7 @@ abstract class Renderer extends BaseRenderer implements ViewContextInterface ...@@ -326,7 +326,7 @@ abstract class Renderer extends BaseRenderer implements ViewContextInterface
public function renderMethodSignature($method) public function renderMethodSignature($method)
{ {
$params = []; $params = [];
foreach($method->params as $param) { foreach ($method->params as $param) {
$params[] = (empty($param->typeHint) ? '' : $param->typeHint . ' ') $params[] = (empty($param->typeHint) ? '' : $param->typeHint . ' ')
. ($param->isPassedByReference ? '<b>&</b>' : '') . ($param->isPassedByReference ? '<b>&</b>' : '')
. $param->name . $param->name
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
*/ */
$see = []; $see = [];
foreach($object->tags as $tag) { foreach ($object->tags as $tag) {
/** @var $tag phpDocumentor\Reflection\DocBlock\Tag\SeeTag */ /** @var $tag phpDocumentor\Reflection\DocBlock\Tag\SeeTag */
if (get_class($tag) == 'phpDocumentor\Reflection\DocBlock\Tag\SeeTag') { if (get_class($tag) == 'phpDocumentor\Reflection\DocBlock\Tag\SeeTag') {
$ref = $tag->getReference(); $ref = $tag->getReference();
......
...@@ -4,6 +4,7 @@ use yii\apidoc\helpers\ApiMarkdown; ...@@ -4,6 +4,7 @@ use yii\apidoc\helpers\ApiMarkdown;
use yii\apidoc\models\ClassDoc; use yii\apidoc\models\ClassDoc;
use yii\apidoc\models\InterfaceDoc; use yii\apidoc\models\InterfaceDoc;
use yii\apidoc\models\TraitDoc; use yii\apidoc\models\TraitDoc;
/** /**
* @var ClassDoc|InterfaceDoc|TraitDoc $type * @var ClassDoc|InterfaceDoc|TraitDoc $type
* @var yii\web\View $this * @var yii\web\View $this
...@@ -82,8 +83,8 @@ $renderer = $this->context; ...@@ -82,8 +83,8 @@ $renderer = $this->context;
</div> </div>
<a name="properties"></a> <a name="properties"></a>
<?= $this->render('@yii/apidoc/templates/html/views/propertySummary', ['type' => $type,'protected' => false]) ?> <?= $this->render('@yii/apidoc/templates/html/views/propertySummary', ['type' => $type, 'protected' => false]) ?>
<?= $this->render('@yii/apidoc/templates/html/views/propertySummary', ['type' => $type,'protected' => true]) ?> <?= $this->render('@yii/apidoc/templates/html/views/propertySummary', ['type' => $type, 'protected' => true]) ?>
<a name="methods"></a> <a name="methods"></a>
<?= $this->render('@yii/apidoc/templates/html/views/methodSummary', ['type' => $type, 'protected' => false]) ?> <?= $this->render('@yii/apidoc/templates/html/views/methodSummary', ['type' => $type, 'protected' => false]) ?>
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
*/ */
namespace yii\apidoc\templates\offline; namespace yii\apidoc\templates\offline;
use Yii; use Yii;
/** /**
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
*/ */
namespace yii\apidoc\templates\offline\assets; namespace yii\apidoc\templates\offline\assets;
use yii\web\View; use yii\web\View;
/** /**
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
use yii\apidoc\models\ClassDoc; use yii\apidoc\models\ClassDoc;
use yii\apidoc\models\InterfaceDoc; use yii\apidoc\models\InterfaceDoc;
use yii\apidoc\models\TraitDoc; use yii\apidoc\models\TraitDoc;
/** /**
* @var ClassDoc[]|InterfaceDoc[]|TraitDoc[] $types * @var ClassDoc[]|InterfaceDoc[]|TraitDoc[] $types
* @var yii\web\View $this * @var yii\web\View $this
...@@ -22,7 +23,7 @@ use yii\apidoc\models\TraitDoc; ...@@ -22,7 +23,7 @@ use yii\apidoc\models\TraitDoc;
</tr> </tr>
<?php <?php
ksort($types); ksort($types);
foreach($types as $i=>$class): foreach($types as $i => $class):
?> ?>
<tr> <tr>
<td><?= $this->context->typeLink($class, $class->name) ?></td> <td><?= $this->context->typeLink($class, $class->name) ?></td>
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
*/ */
namespace yii\apidoc\templates\online; namespace yii\apidoc\templates\online;
use yii\apidoc\models\Context; use yii\apidoc\models\Context;
use yii\apidoc\models\TypeDoc; use yii\apidoc\models\TypeDoc;
use yii\console\Controller; use yii\console\Controller;
...@@ -37,7 +38,7 @@ class Renderer extends \yii\apidoc\templates\html\Renderer ...@@ -37,7 +38,7 @@ class Renderer extends \yii\apidoc\templates\html\Renderer
$controller->stdout("writing packages file..."); $controller->stdout("writing packages file...");
$packages = []; $packages = [];
$notNamespaced = []; $notNamespaced = [];
foreach(array_merge($context->classes, $context->interfaces, $context->traits) as $type) { foreach (array_merge($context->classes, $context->interfaces, $context->traits) as $type) {
/** @var TypeDoc $type */ /** @var TypeDoc $type */
if (empty($type->namespace)) { if (empty($type->namespace)) {
$notNamespaced[] = str_replace('\\', '-', $type->name); $notNamespaced[] = str_replace('\\', '-', $type->name);
...@@ -47,7 +48,7 @@ class Renderer extends \yii\apidoc\templates\html\Renderer ...@@ -47,7 +48,7 @@ class Renderer extends \yii\apidoc\templates\html\Renderer
} }
ksort($packages); ksort($packages);
$packages = array_merge(['Not namespaced' => $notNamespaced], $packages); $packages = array_merge(['Not namespaced' => $notNamespaced], $packages);
foreach($packages as $name => $classes) { foreach ($packages as $name => $classes) {
sort($packages[$name]); sort($packages[$name]);
} }
file_put_contents($dir . '/packages.txt', serialize($packages)); file_put_contents($dir . '/packages.txt', serialize($packages));
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
use yii\apidoc\models\ClassDoc; use yii\apidoc\models\ClassDoc;
use yii\apidoc\models\InterfaceDoc; use yii\apidoc\models\InterfaceDoc;
use yii\apidoc\models\TraitDoc; use yii\apidoc\models\TraitDoc;
/** /**
* @var ClassDoc[]|InterfaceDoc[]|TraitDoc[] $types * @var ClassDoc[]|InterfaceDoc[]|TraitDoc[] $types
* @var yii\web\View $this * @var yii\web\View $this
...@@ -22,7 +23,7 @@ use yii\apidoc\models\TraitDoc; ...@@ -22,7 +23,7 @@ use yii\apidoc\models\TraitDoc;
</tr> </tr>
<?php <?php
ksort($types); ksort($types);
foreach($types as $i=>$class): foreach($types as $i => $class):
?> ?>
<tr> <tr>
<td><?= $this->context->typeLink($class, $class->name) ?></td> <td><?= $this->context->typeLink($class, $class->name) ?></td>
......
...@@ -175,7 +175,7 @@ class OAuth1 extends BaseOAuth ...@@ -175,7 +175,7 @@ class OAuth1 extends BaseOAuth
} }
case 'POST': { case 'POST': {
$curlOptions[CURLOPT_POST] = true; $curlOptions[CURLOPT_POST] = true;
if (!empty($params)){ if (!empty($params)) {
$curlOptions[CURLOPT_POSTFIELDS] = $params; $curlOptions[CURLOPT_POSTFIELDS] = $params;
} }
$authorizationHeader = $this->composeAuthorizationHeader($params); $authorizationHeader = $this->composeAuthorizationHeader($params);
......
...@@ -58,14 +58,16 @@ class OAuthToken extends Object ...@@ -58,14 +58,16 @@ class OAuthToken extends Object
/** /**
* @param string $expireDurationParamKey expire duration param key. * @param string $expireDurationParamKey expire duration param key.
*/ */
public function setExpireDurationParamKey($expireDurationParamKey) { public function setExpireDurationParamKey($expireDurationParamKey)
{
$this->_expireDurationParamKey = $expireDurationParamKey; $this->_expireDurationParamKey = $expireDurationParamKey;
} }
/** /**
* @return string expire duration param key. * @return string expire duration param key.
*/ */
public function getExpireDurationParamKey() { public function getExpireDurationParamKey()
{
if ($this->_expireDurationParamKey === null) { if ($this->_expireDurationParamKey === null) {
$this->_expireDurationParamKey = $this->defaultExpireDurationParamKey(); $this->_expireDurationParamKey = $this->defaultExpireDurationParamKey();
} }
...@@ -75,14 +77,16 @@ class OAuthToken extends Object ...@@ -75,14 +77,16 @@ class OAuthToken extends Object
/** /**
* @return array * @return array
*/ */
public function getParams() { public function getParams()
{
return $this->_params; return $this->_params;
} }
/** /**
* @param array $params * @param array $params
*/ */
public function setParams(array $params) { public function setParams(array $params)
{
$this->_params = $params; $this->_params = $params;
} }
...@@ -91,7 +95,8 @@ class OAuthToken extends Object ...@@ -91,7 +95,8 @@ class OAuthToken extends Object
* @param string $name param name. * @param string $name param name.
* @param mixed $value param value, * @param mixed $value param value,
*/ */
public function setParam($name, $value) { public function setParam($name, $value)
{
$this->_params[$name] = $value; $this->_params[$name] = $value;
} }
...@@ -100,7 +105,8 @@ class OAuthToken extends Object ...@@ -100,7 +105,8 @@ class OAuthToken extends Object
* @param string $name param name. * @param string $name param name.
* @return mixed param value. * @return mixed param value.
*/ */
public function getParam($name) { public function getParam($name)
{
return isset($this->_params[$name]) ? $this->_params[$name] : null; return isset($this->_params[$name]) ? $this->_params[$name] : null;
} }
...@@ -109,7 +115,8 @@ class OAuthToken extends Object ...@@ -109,7 +115,8 @@ class OAuthToken extends Object
* @param string $token token value. * @param string $token token value.
* @return static self reference. * @return static self reference.
*/ */
public function setToken($token) { public function setToken($token)
{
$this->setParam($this->tokenParamKey, $token); $this->setParam($this->tokenParamKey, $token);
} }
...@@ -117,7 +124,8 @@ class OAuthToken extends Object ...@@ -117,7 +124,8 @@ class OAuthToken extends Object
* Returns token value. * Returns token value.
* @return string token value. * @return string token value.
*/ */
public function getToken() { public function getToken()
{
return $this->getParam($this->tokenParamKey); return $this->getParam($this->tokenParamKey);
} }
...@@ -125,7 +133,8 @@ class OAuthToken extends Object ...@@ -125,7 +133,8 @@ class OAuthToken extends Object
* Sets the token secret value. * Sets the token secret value.
* @param string $tokenSecret token secret. * @param string $tokenSecret token secret.
*/ */
public function setTokenSecret($tokenSecret) { public function setTokenSecret($tokenSecret)
{
$this->setParam($this->tokenSecretParamKey, $tokenSecret); $this->setParam($this->tokenSecretParamKey, $tokenSecret);
} }
...@@ -133,7 +142,8 @@ class OAuthToken extends Object ...@@ -133,7 +142,8 @@ class OAuthToken extends Object
* Returns the token secret value. * Returns the token secret value.
* @return string token secret value. * @return string token secret value.
*/ */
public function getTokenSecret() { public function getTokenSecret()
{
return $this->getParam($this->tokenSecretParamKey); return $this->getParam($this->tokenSecretParamKey);
} }
...@@ -141,7 +151,8 @@ class OAuthToken extends Object ...@@ -141,7 +151,8 @@ class OAuthToken extends Object
* Sets token expire duration. * Sets token expire duration.
* @param string $expireDuration token expiration duration. * @param string $expireDuration token expiration duration.
*/ */
public function setExpireDuration($expireDuration) { public function setExpireDuration($expireDuration)
{
$this->setParam($this->getExpireDurationParamKey(), $expireDuration); $this->setParam($this->getExpireDurationParamKey(), $expireDuration);
} }
...@@ -149,7 +160,8 @@ class OAuthToken extends Object ...@@ -149,7 +160,8 @@ class OAuthToken extends Object
* Returns the token expiration duration. * Returns the token expiration duration.
* @return integer token expiration duration. * @return integer token expiration duration.
*/ */
public function getExpireDuration() { public function getExpireDuration()
{
return $this->getParam($this->getExpireDurationParamKey()); return $this->getParam($this->getExpireDurationParamKey());
} }
...@@ -157,7 +169,8 @@ class OAuthToken extends Object ...@@ -157,7 +169,8 @@ class OAuthToken extends Object
* Fetches default expire duration param key. * Fetches default expire duration param key.
* @return string expire duration param key. * @return string expire duration param key.
*/ */
protected function defaultExpireDurationParamKey() { protected function defaultExpireDurationParamKey()
{
$expireDurationParamKey = 'expires_in'; $expireDurationParamKey = 'expires_in';
foreach ($this->getParams() as $name => $value) { foreach ($this->getParams() as $name => $value) {
if (strpos($name, 'expir') !== false) { if (strpos($name, 'expir') !== false) {
...@@ -172,7 +185,8 @@ class OAuthToken extends Object ...@@ -172,7 +185,8 @@ class OAuthToken extends Object
* Checks if token has expired. * Checks if token has expired.
* @return boolean is token expired. * @return boolean is token expired.
*/ */
public function getIsExpired() { public function getIsExpired()
{
$expirationDuration = $this->getExpireDuration(); $expirationDuration = $this->getExpireDuration();
if (empty($expirationDuration)) { if (empty($expirationDuration)) {
return false; return false;
...@@ -184,7 +198,8 @@ class OAuthToken extends Object ...@@ -184,7 +198,8 @@ class OAuthToken extends Object
* Checks if token is valid. * Checks if token is valid.
* @return boolean is token valid. * @return boolean is token valid.
*/ */
public function getIsValid() { public function getIsValid()
{
$token = $this->getToken(); $token = $this->getToken();
return (!empty($token) && !$this->getIsExpired()); return (!empty($token) && !$this->getIsExpired());
} }
......
...@@ -243,10 +243,10 @@ class OpenId extends BaseClient implements ClientInterface ...@@ -243,10 +243,10 @@ class OpenId extends BaseClient implements ClientInterface
if ($this->verifyPeer !== null) { if ($this->verifyPeer !== null) {
curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, $this->verifyPeer); curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, $this->verifyPeer);
if($this->capath) { if ($this->capath) {
curl_setopt($curl, CURLOPT_CAPATH, $this->capath); curl_setopt($curl, CURLOPT_CAPATH, $this->capath);
} }
if($this->cainfo) { if ($this->cainfo) {
curl_setopt($curl, CURLOPT_CAINFO, $this->cainfo); curl_setopt($curl, CURLOPT_CAINFO, $this->cainfo);
} }
} }
......
...@@ -147,7 +147,8 @@ class LinkedIn extends OAuth2 ...@@ -147,7 +147,8 @@ class LinkedIn extends OAuth2
* Generates the auth state value. * Generates the auth state value.
* @return string auth state value. * @return string auth state value.
*/ */
protected function generateAuthState() { protected function generateAuthState()
{
return sha1(uniqid(get_class($this), true)); return sha1(uniqid(get_class($this), true));
} }
......
...@@ -192,7 +192,7 @@ class Installer extends LibraryInstaller ...@@ -192,7 +192,7 @@ class Installer extends LibraryInstaller
if (!file_exists($yiiDir)) { if (!file_exists($yiiDir)) {
mkdir($yiiDir, 0777, true); mkdir($yiiDir, 0777, true);
} }
foreach(['Yii.php', 'BaseYii.php', 'classes.php'] as $file) { foreach (['Yii.php', 'BaseYii.php', 'classes.php'] as $file) {
file_put_contents($yiiDir . '/' . $file, <<<EOF file_put_contents($yiiDir . '/' . $file, <<<EOF
<?php <?php
/** /**
...@@ -213,7 +213,7 @@ EOF ...@@ -213,7 +213,7 @@ EOF
protected function removeBaseYiiFiles() protected function removeBaseYiiFiles()
{ {
$yiiDir = $this->vendorDir . '/yiisoft/yii2'; $yiiDir = $this->vendorDir . '/yiisoft/yii2';
foreach(['Yii.php', 'BaseYii.php', 'classes.php'] as $file) { foreach (['Yii.php', 'BaseYii.php', 'classes.php'] as $file) {
if (file_exists($yiiDir . '/' . $file)) { if (file_exists($yiiDir . '/' . $file)) {
unlink($yiiDir . '/' . $file); unlink($yiiDir . '/' . $file);
} }
......
...@@ -168,5 +168,4 @@ class LogTarget extends Target ...@@ -168,5 +168,4 @@ class LogTarget extends Target
# / 2 because messages are in couple (begin/end) # / 2 because messages are in couple (begin/end)
return count($profileLogs) / 2; return count($profileLogs) / 2;
} }
} }
...@@ -37,5 +37,4 @@ abstract class Base extends Component implements MatcherInterface ...@@ -37,5 +37,4 @@ abstract class Base extends Component implements MatcherInterface
{ {
return !empty($this->baseValue) || ($this->baseValue === '0'); return !empty($this->baseValue) || ($this->baseValue === '0');
} }
} }
...@@ -175,5 +175,4 @@ class DbPanel extends Panel ...@@ -175,5 +175,4 @@ class DbPanel extends Panel
{ {
return (($this->criticalQueryThreshold !== null) && ($count > $this->criticalQueryThreshold)); return (($this->criticalQueryThreshold !== null) && ($count > $this->criticalQueryThreshold));
} }
} }
...@@ -102,5 +102,4 @@ class MailPanel extends Panel ...@@ -102,5 +102,4 @@ class MailPanel extends Panel
} }
return $attr; return $attr;
} }
} }
...@@ -35,4 +35,3 @@ echo $this->render('panels/config/table', [ ...@@ -35,4 +35,3 @@ echo $this->render('panels/config/table', [
]); ]);
echo $panel->getPhpInfo(); echo $panel->getPhpInfo();
?>
\ No newline at end of file
...@@ -67,4 +67,3 @@ echo GridView::widget([ ...@@ -67,4 +67,3 @@ echo GridView::widget([
] ]
], ],
]); ]);
?>
...@@ -70,4 +70,3 @@ echo GridView::widget([ ...@@ -70,4 +70,3 @@ echo GridView::widget([
], ],
], ],
]); ]);
?>
<?php <?php
use yii\grid\GridView; use yii\grid\GridView;
use yii\helpers\Html; use yii\helpers\Html;
?> ?>
<h1>Performance Profiling</h1> <h1>Performance Profiling</h1>
<p>Total processing time: <b><?= $time ?></b>; Peak memory: <b><?= $memory ?></b>.</p> <p>Total processing time: <b><?= $time ?></b>; Peak memory: <b><?= $memory ?></b>.</p>
...@@ -50,4 +51,3 @@ echo GridView::widget([ ...@@ -50,4 +51,3 @@ echo GridView::widget([
], ],
], ],
]); ]);
?>
...@@ -156,7 +156,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface ...@@ -156,7 +156,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface
} }
$models = $this->createModels($result['hits']['hits']); $models = $this->createModels($result['hits']['hits']);
if ($this->asArray && !$this->indexBy) { if ($this->asArray && !$this->indexBy) {
foreach($models as $key => $model) { foreach ($models as $key => $model) {
if ($pk === '_id') { if ($pk === '_id') {
$model['_source']['_id'] = $model['_id']; $model['_source']['_id'] = $model['_id'];
} }
...@@ -168,7 +168,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface ...@@ -168,7 +168,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface
$this->findWith($this->with, $models); $this->findWith($this->with, $models);
} }
if (!$this->asArray) { if (!$this->asArray) {
foreach($models as $model) { foreach ($models as $model) {
$model->afterFind(); $model->afterFind();
} }
} }
...@@ -226,7 +226,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface ...@@ -226,7 +226,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface
/** @var ActiveRecord $modelClass */ /** @var ActiveRecord $modelClass */
$modelClass = $this->modelClass; $modelClass = $this->modelClass;
$pk = $modelClass::primaryKey()[0]; $pk = $modelClass::primaryKey()[0];
foreach($models as $key => $model) { foreach ($models as $key => $model) {
if ($pk === '_id') { if ($pk === '_id') {
$model['_source']['_id'] = $model['_id']; $model['_source']['_id'] = $model['_id'];
} }
...@@ -238,7 +238,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface ...@@ -238,7 +238,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface
$this->findWith($this->with, $models); $this->findWith($this->with, $models);
} }
if (!$this->asArray) { if (!$this->asArray) {
foreach($models as $model) { foreach ($models as $model) {
$model->afterFind(); $model->afterFind();
} }
} }
......
...@@ -122,7 +122,7 @@ class ActiveRecord extends BaseActiveRecord ...@@ -122,7 +122,7 @@ class ActiveRecord extends BaseActiveRecord
$command = static::getDb()->createCommand(); $command = static::getDb()->createCommand();
$result = $command->mget(static::index(), static::type(), $primaryKeys, $options); $result = $command->mget(static::index(), static::type(), $primaryKeys, $options);
$models = []; $models = [];
foreach($result['docs'] as $doc) { foreach ($result['docs'] as $doc) {
if ($doc['exists']) { if ($doc['exists']) {
$model = static::instantiate($doc); $model = static::instantiate($doc);
static::populateRecord($model, $doc); static::populateRecord($model, $doc);
...@@ -422,7 +422,7 @@ class ActiveRecord extends BaseActiveRecord ...@@ -422,7 +422,7 @@ class ActiveRecord extends BaseActiveRecord
return 0; return 0;
} }
$bulk = ''; $bulk = '';
foreach($primaryKeys as $pk) { foreach ($primaryKeys as $pk) {
$action = Json::encode([ $action = Json::encode([
"update" => [ "update" => [
"_id" => $pk, "_id" => $pk,
...@@ -441,7 +441,7 @@ class ActiveRecord extends BaseActiveRecord ...@@ -441,7 +441,7 @@ class ActiveRecord extends BaseActiveRecord
$response = static::getDb()->post($url, [], $bulk); $response = static::getDb()->post($url, [], $bulk);
$n=0; $n=0;
$errors = []; $errors = [];
foreach($response['items'] as $item) { foreach ($response['items'] as $item) {
if (isset($item['update']['error'])) { if (isset($item['update']['error'])) {
$errors[] = $item['update']; $errors[] = $item['update'];
} elseif ($item['update']['ok']) { } elseif ($item['update']['ok']) {
...@@ -480,7 +480,7 @@ class ActiveRecord extends BaseActiveRecord ...@@ -480,7 +480,7 @@ class ActiveRecord extends BaseActiveRecord
return 0; return 0;
} }
$bulk = ''; $bulk = '';
foreach($primaryKeys as $pk) { foreach ($primaryKeys as $pk) {
$action = Json::encode([ $action = Json::encode([
"update" => [ "update" => [
"_id" => $pk, "_id" => $pk,
...@@ -489,7 +489,7 @@ class ActiveRecord extends BaseActiveRecord ...@@ -489,7 +489,7 @@ class ActiveRecord extends BaseActiveRecord
], ],
]); ]);
$script = ''; $script = '';
foreach($counters as $counter => $value) { foreach ($counters as $counter => $value) {
$script .= "ctx._source.$counter += $counter;\n"; $script .= "ctx._source.$counter += $counter;\n";
} }
$data = Json::encode([ $data = Json::encode([
...@@ -504,7 +504,7 @@ class ActiveRecord extends BaseActiveRecord ...@@ -504,7 +504,7 @@ class ActiveRecord extends BaseActiveRecord
$response = static::getDb()->post($url, [], $bulk); $response = static::getDb()->post($url, [], $bulk);
$n=0; $n=0;
$errors = []; $errors = [];
foreach($response['items'] as $item) { foreach ($response['items'] as $item) {
if (isset($item['update']['error'])) { if (isset($item['update']['error'])) {
$errors[] = $item['update']; $errors[] = $item['update'];
} elseif ($item['update']['ok']) { } elseif ($item['update']['ok']) {
...@@ -543,7 +543,7 @@ class ActiveRecord extends BaseActiveRecord ...@@ -543,7 +543,7 @@ class ActiveRecord extends BaseActiveRecord
return 0; return 0;
} }
$bulk = ''; $bulk = '';
foreach($primaryKeys as $pk) { foreach ($primaryKeys as $pk) {
$bulk .= Json::encode([ $bulk .= Json::encode([
"delete" => [ "delete" => [
"_id" => $pk, "_id" => $pk,
...@@ -558,7 +558,7 @@ class ActiveRecord extends BaseActiveRecord ...@@ -558,7 +558,7 @@ class ActiveRecord extends BaseActiveRecord
$response = static::getDb()->post($url, [], $bulk); $response = static::getDb()->post($url, [], $bulk);
$n=0; $n=0;
$errors = []; $errors = [];
foreach($response['items'] as $item) { foreach ($response['items'] as $item) {
if (isset($item['delete']['error'])) { if (isset($item['delete']['error'])) {
$errors[] = $item['delete']; $errors[] = $item['delete'];
} elseif ($item['delete']['found'] && $item['delete']['ok']) { } elseif ($item['delete']['found'] && $item['delete']['ok']) {
......
...@@ -63,7 +63,7 @@ class Connection extends Component ...@@ -63,7 +63,7 @@ class Connection extends Component
public function init() public function init()
{ {
foreach($this->nodes as $node) { foreach ($this->nodes as $node) {
if (!isset($node['http_address'])) { if (!isset($node['http_address'])) {
throw new InvalidConfigException('Elasticsearch node needs at least a http_address configured.'); throw new InvalidConfigException('Elasticsearch node needs at least a http_address configured.');
} }
...@@ -210,7 +210,7 @@ class Connection extends Component ...@@ -210,7 +210,7 @@ class Connection extends Component
private function createUrl($path, $options = []) private function createUrl($path, $options = [])
{ {
if (!is_string($path)) { if (!is_string($path)) {
$url = implode('/', array_map(function($a) { $url = implode('/', array_map(function ($a) {
return urlencode(is_array($a) ? implode(',', $a) : $a); return urlencode(is_array($a) ? implode(',', $a) : $a);
}, $path)); }, $path));
if (!empty($options)) { if (!empty($options)) {
...@@ -240,12 +240,12 @@ class Connection extends Component ...@@ -240,12 +240,12 @@ class Connection extends Component
// http://www.php.net/manual/en/function.curl-setopt.php#82418 // http://www.php.net/manual/en/function.curl-setopt.php#82418
CURLOPT_HTTPHEADER => ['Expect:'], CURLOPT_HTTPHEADER => ['Expect:'],
CURLOPT_WRITEFUNCTION => function($curl, $data) use (&$body) { CURLOPT_WRITEFUNCTION => function ($curl, $data) use (&$body) {
$body .= $data; $body .= $data;
return mb_strlen($data, '8bit'); return mb_strlen($data, '8bit');
}, },
CURLOPT_HEADERFUNCTION => function($curl, $data) use (&$headers) { CURLOPT_HEADERFUNCTION => function ($curl, $data) use (&$headers) {
foreach(explode("\r\n", $data) as $row) { foreach (explode("\r\n", $data) as $row) {
if (($pos = strpos($row, ':')) !== false) { if (($pos = strpos($row, ':')) !== false) {
$headers[strtolower(substr($row, 0, $pos))] = trim(substr($row, $pos + 1)); $headers[strtolower(substr($row, 0, $pos))] = trim(substr($row, $pos + 1));
} }
......
...@@ -177,7 +177,7 @@ class QueryBuilder extends \yii\base\Object ...@@ -177,7 +177,7 @@ class QueryBuilder extends \yii\base\Object
private function buildHashCondition($condition) private function buildHashCondition($condition)
{ {
$parts = []; $parts = [];
foreach($condition as $attribute => $value) { foreach ($condition as $attribute => $value) {
if ($attribute == '_id') { if ($attribute == '_id') {
if ($value == null) { // there is no null pk if ($value == null) { // there is no null pk
$parts[] = ['script' => ['script' => '0==1']]; $parts[] = ['script' => ['script' => '0==1']];
......
...@@ -13,7 +13,6 @@ use yii\base\InvalidConfigException; ...@@ -13,7 +13,6 @@ use yii\base\InvalidConfigException;
use yii\base\Model; use yii\base\Model;
use yii\web\View; use yii\web\View;
/** /**
* This is the base class for all generator classes. * This is the base class for all generator classes.
* *
......
...@@ -73,7 +73,7 @@ HTML; ...@@ -73,7 +73,7 @@ HTML;
} }
} }
// Added lines only on the right side // Added lines only on the right side
else if ($change['tag'] === 'insert') { elseif ($change['tag'] === 'insert') {
foreach ($change['changed']['lines'] as $no => $line) { foreach ($change['changed']['lines'] as $no => $line) {
$toLine = $change['changed']['offset'] + $no + 1; $toLine = $change['changed']['offset'] + $no + 1;
$html .= <<<HTML $html .= <<<HTML
...@@ -86,7 +86,7 @@ HTML; ...@@ -86,7 +86,7 @@ HTML;
} }
} }
// Show deleted lines only on the left side // Show deleted lines only on the left side
else if ($change['tag'] === 'delete') { elseif ($change['tag'] === 'delete') {
foreach ($change['base']['lines'] as $no => $line) { foreach ($change['base']['lines'] as $no => $line) {
$fromLine = $change['base']['offset'] + $no + 1; $fromLine = $change['base']['offset'] + $no + 1;
$html .= <<<HTML $html .= <<<HTML
...@@ -99,7 +99,7 @@ HTML; ...@@ -99,7 +99,7 @@ HTML;
} }
} }
// Show modified lines on both sides // Show modified lines on both sides
else if ($change['tag'] === 'replace') { elseif ($change['tag'] === 'replace') {
foreach ($change['base']['lines'] as $no => $line) { foreach ($change['base']['lines'] as $no => $line) {
$fromLine = $change['base']['offset'] + $no + 1; $fromLine = $change['base']['offset'] + $no + 1;
$html .= <<<HTML $html .= <<<HTML
......
...@@ -499,5 +499,4 @@ class Generator extends \yii\gii\Generator ...@@ -499,5 +499,4 @@ class Generator extends \yii\gii\Generator
return $model->attributes(); return $model->attributes();
} }
} }
} }
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
*/ */
namespace yii\jui; namespace yii\jui;
use yii\web\AssetBundle; use yii\web\AssetBundle;
/** /**
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
*/ */
namespace yii\jui; namespace yii\jui;
use yii\web\AssetBundle; use yii\web\AssetBundle;
/** /**
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
*/ */
namespace yii\jui; namespace yii\jui;
use yii\web\AssetBundle; use yii\web\AssetBundle;
/** /**
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
*/ */
namespace yii\jui; namespace yii\jui;
use yii\web\AssetBundle; use yii\web\AssetBundle;
/** /**
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
*/ */
namespace yii\jui; namespace yii\jui;
use yii\web\AssetBundle; use yii\web\AssetBundle;
/** /**
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
*/ */
namespace yii\jui; namespace yii\jui;
use yii\web\AssetBundle; use yii\web\AssetBundle;
/** /**
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
*/ */
namespace yii\jui; namespace yii\jui;
use yii\web\AssetBundle; use yii\web\AssetBundle;
/** /**
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
*/ */
namespace yii\jui; namespace yii\jui;
use yii\web\AssetBundle; use yii\web\AssetBundle;
/** /**
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
*/ */
namespace yii\jui; namespace yii\jui;
use yii\web\AssetBundle; use yii\web\AssetBundle;
/** /**
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
*/ */
namespace yii\jui; namespace yii\jui;
use yii\web\AssetBundle; use yii\web\AssetBundle;
/** /**
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
*/ */
namespace yii\jui; namespace yii\jui;
use yii\web\AssetBundle; use yii\web\AssetBundle;
/** /**
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
*/ */
namespace yii\jui; namespace yii\jui;
use yii\web\AssetBundle; use yii\web\AssetBundle;
/** /**
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
*/ */
namespace yii\jui; namespace yii\jui;
use yii\web\AssetBundle; use yii\web\AssetBundle;
/** /**
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
*/ */
namespace yii\jui; namespace yii\jui;
use yii\web\AssetBundle; use yii\web\AssetBundle;
/** /**
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
*/ */
namespace yii\jui; namespace yii\jui;
use yii\web\AssetBundle; use yii\web\AssetBundle;
/** /**
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
*/ */
namespace yii\jui; namespace yii\jui;
use yii\web\AssetBundle; use yii\web\AssetBundle;
/** /**
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
*/ */
namespace yii\jui; namespace yii\jui;
use yii\web\AssetBundle; use yii\web\AssetBundle;
/** /**
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
*/ */
namespace yii\jui; namespace yii\jui;
use yii\web\AssetBundle; use yii\web\AssetBundle;
/** /**
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
*/ */
namespace yii\jui; namespace yii\jui;
use yii\web\AssetBundle; use yii\web\AssetBundle;
/** /**
......
...@@ -111,7 +111,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface ...@@ -111,7 +111,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface
$this->findWith($this->with, $models); $this->findWith($this->with, $models);
} }
if (!$this->asArray) { if (!$this->asArray) {
foreach($models as $model) { foreach ($models as $model) {
$model->afterFind(); $model->afterFind();
} }
} }
......
...@@ -626,7 +626,8 @@ class Collection extends Object ...@@ -626,7 +626,8 @@ class Collection extends Object
* @return array the highest scoring documents, in descending order by score. * @return array the highest scoring documents, in descending order by score.
* @throws Exception on failure. * @throws Exception on failure.
*/ */
public function fullTextSearch($search, $condition = [], $fields = [], $options = []) { public function fullTextSearch($search, $condition = [], $fields = [], $options = [])
{
$command = [ $command = [
'search' => $search 'search' => $search
]; ];
......
...@@ -56,7 +56,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface ...@@ -56,7 +56,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface
$this->findWith($this->with, $models); $this->findWith($this->with, $models);
} }
if (!$this->asArray) { if (!$this->asArray) {
foreach($models as $model) { foreach ($models as $model) {
$model->afterFind(); $model->afterFind();
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment