Skip to content

Y
yii2
Commit a8ef7bab by Carsten Brandt
Options

Merge branch 'code-style'

* code-style: fix php5.4 array syntax many phpcs fixes fix phpDoc LuaScriptBuilder build @throws returned back formatting language files code style. WHILE code style. FOR code style. FOREACH code style. operator IF @param, @var, @property and @return must declare types as boolean, integer, string, array or null short echo tags short array syntax
parents fe48ae0d 1b7e1cd0
Showing with 275 additions and 239 deletions
apps/advanced/common/models/User.php
......@@ -141,7 +141,7 @@ class User extends ActiveRecord implements IdentityInterface
* Validates password
*
* @param string $password password to validate
* @return bool if password provided is valid for current user
* @return boolean if password provided is valid for current user
*/
public function validatePassword($password)
{
......
apps/basic/models/User.php
......@@ -92,7 +92,7 @@ class User extends \yii\base\Object implements \yii\web\IdentityInterface
* Validates password
*
* @param string $password password to validate
* @return bool if password provided is valid for current user
* @return boolean if password provided is valid for current user
*/
public function validatePassword($password)
{
......
build/controllers/PhpDocController.php
......@@ -24,7 +24,7 @@ class PhpDocController extends Controller
public $defaultAction = 'property';
/**
* @var bool whether to update class docs directly. Setting this to false will just output docs
* @var boolean whether to update class docs directly. Setting this to false will just output docs
* for copy and paste.
*/
public $updateFiles = true;
......@@ -314,7 +314,7 @@ class PhpDocController extends Controller
// check if parent class has setter defined
$c = $className;
$parentSetter = false;
while($parent = get_parent_class($c)) {
while ($parent = get_parent_class($c)) {
if (method_exists($parent, 'set' . ucfirst($propName))) {
$parentSetter = true;
break;
......@@ -329,7 +329,7 @@ class PhpDocController extends Controller
// check if parent class has getter defined
$c = $className;
$parentGetter = false;
while($parent = get_parent_class($c)) {
while ($parent = get_parent_class($c)) {
if (method_exists($parent, 'set' . ucfirst($propName))) {
$parentGetter = true;
break;
......
docs/guide/validation.md
......@@ -120,7 +120,7 @@ needs to be divisible by 10. In the rules you would define: `['attributeName', '
Then, your own method could look like this:
```php
public function myValidationMethod($attribute) {
if(($this->$attribute % 10) != 0) {
if (($this->$attribute % 10) != 0) {
$this->addError($attribute, 'cannot divide value by 10');
}
}
......
docs/internals/core-code-style.md
......@@ -252,7 +252,7 @@ if ($event === null) {
}
// the following is NOT allowed:
if(!$model && null === $event)
if (!$model && null === $event)
throw new Exception('test');
```
......
docs/internals/view-code-style.md
......@@ -25,7 +25,7 @@ use yii\widgets\ActiveForm;
$this->title = 'Posts';
?>
<!-- Separate PHP blocks are preferred for foreach, for, if etc. -->
<?php foreach($posts as $post): ?>
<?php foreach ($posts as $post): ?>
<!-- Note indentation level here. -->
<h2><?= Html::encode($post['title']) ?></h2>
<p><?= Html::encode($post['shortDescription']) ?></p>
......
extensions/apidoc/apidoc
......@@ -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;
......
extensions/apidoc/helpers/ApiMarkdown.php
......@@ -70,7 +70,7 @@ class ApiMarkdown extends GithubMarkdown
if (!empty($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) {
$block['content'][] = $line;
} else {
......@@ -224,7 +224,7 @@ class ApiMarkdown extends GithubMarkdown
*
* @param string $content
* @param TypeDoc $context
* @param bool $paragraph
* @param boolean $paragraph
* @return string
*/
public static function process($content, $context = null, $paragraph = false)
......
extensions/apidoc/models/BaseDoc.php
......@@ -76,7 +76,7 @@ class BaseDoc extends Object
$this->phpDocContext = $docblock->getContext();
$this->tags = $docblock->getTags();
foreach($this->tags as $i => $tag) {
foreach ($this->tags as $i => $tag) {
if ($tag instanceof SinceTag) {
$this->since = $tag->getVersion();
unset($this->tags[$i]);
......
extensions/apidoc/models/ClassDoc.php
......@@ -45,12 +45,12 @@ class ClassDoc extends TypeDoc
if (($subject = parent::findSubject($subjectName)) !== null) {
return $subject;
}
foreach($this->events as $name => $event) {
foreach ($this->events as $name => $event) {
if ($subjectName == $name) {
return $event;
}
}
foreach($this->constants as $name => $constant) {
foreach ($this->constants as $name => $constant) {
if ($subjectName == $name) {
return $constant;
}
......@@ -64,7 +64,7 @@ class ClassDoc extends TypeDoc
public function getNativeEvents()
{
$events = [];
foreach($this->events as $name => $event) {
foreach ($this->events as $name => $event) {
if ($event->definedBy != $this->name) {
continue;
}
......@@ -93,13 +93,13 @@ class ClassDoc extends TypeDoc
$this->isAbstract = $reflector->isAbstract();
$this->isFinal = $reflector->isFinal();
foreach($reflector->getInterfaces() as $interface) {
foreach ($reflector->getInterfaces() as $interface) {
$this->interfaces[] = ltrim($interface, '\\');
}
foreach($reflector->getTraits() as $trait) {
foreach ($reflector->getTraits() as $trait) {
$this->traits[] = ltrim($trait, '\\');
}
foreach($reflector->getConstants() as $constantReflector) {
foreach ($reflector->getConstants() as $constantReflector) {
$docblock = $constantReflector->getDocBlock();
if ($docblock !== null && count($docblock->getTagsByName('event')) > 0) {
$event = new EventDoc($constantReflector);
......
extensions/apidoc/models/Context.php
......@@ -57,15 +57,15 @@ class Context extends Component
$reflection = new FileReflector($fileName, true);
$reflection->process();
foreach($reflection->getClasses() as $class) {
foreach ($reflection->getClasses() as $class) {
$class = new ClassDoc($class, $this, ['sourceFile' => $fileName]);
$this->classes[$class->name] = $class;
}
foreach($reflection->getInterfaces() as $interface) {
foreach ($reflection->getInterfaces() as $interface) {
$interface = new InterfaceDoc($interface, $this, ['sourceFile' => $fileName]);
$this->interfaces[$interface->name] = $interface;
}
foreach($reflection->getTraits() as $trait) {
foreach ($reflection->getTraits() as $trait) {
$trait = new TraitDoc($trait, $this, ['sourceFile' => $fileName]);
$this->traits[$trait->name] = $trait;
}
......@@ -74,7 +74,7 @@ class Context extends Component
public function updateReferences()
{
// update all subclass references
foreach($this->classes as $class) {
foreach ($this->classes as $class) {
$className = $class->name;
while (isset($this->classes[$class->parentClass])) {
$class = $this->classes[$class->parentClass];
......@@ -82,12 +82,12 @@ class Context extends Component
}
}
// update interfaces of subclasses
foreach($this->classes as $class) {
foreach ($this->classes as $class) {
$this->updateSubclassInferfacesTraits($class);
}
// update implementedBy and usedBy for interfaces and traits
foreach($this->classes as $class) {
foreach($class->traits as $trait) {
foreach ($this->classes as $class) {
foreach ($class->traits as $trait) {
if (isset($this->traits[$trait])) {
$trait = $this->traits[$trait];
$trait->usedBy[] = $class->name;
......@@ -95,12 +95,12 @@ class Context extends Component
$class->methods = array_merge($trait->methods, $class->methods);
}
}
foreach($class->interfaces as $interface) {
foreach ($class->interfaces as $interface) {
if (isset($this->interfaces[$interface])) {
$this->interfaces[$interface]->implementedBy[] = $class->name;
if ($class->isAbstract) {
// 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])) {
$class->methods[$method->name] = $method;
}
......@@ -110,15 +110,15 @@ class Context extends Component
}
}
// inherit docs
foreach($this->classes as $class) {
foreach ($this->classes as $class) {
$this->inheritDocs($class);
}
// inherit properties, methods, contants and events to subclasses
foreach($this->classes as $class) {
foreach ($this->classes as $class) {
$this->updateSubclassInheritance($class);
}
// add properties from getters and setters
foreach($this->classes as $class) {
foreach ($this->classes as $class) {
$this->handlePropertyFeature($class);
}
......@@ -131,7 +131,7 @@ class Context extends Component
*/
protected function updateSubclassInferfacesTraits($class)
{
foreach($class->subclasses as $subclass) {
foreach ($class->subclasses as $subclass) {
$subclass = $this->classes[$subclass];
$subclass->interfaces = array_unique(array_merge($subclass->interfaces, $class->interfaces));
$subclass->traits = array_unique(array_merge($subclass->traits, $class->traits));
......@@ -145,7 +145,7 @@ class Context extends Component
*/
protected function updateSubclassInheritance($class)
{
foreach($class->subclasses as $subclass) {
foreach ($class->subclasses as $subclass) {
$subclass = $this->classes[$subclass];
$subclass->events = array_merge($class->events, $subclass->events);
$subclass->constants = array_merge($class->constants, $subclass->constants);
......@@ -203,7 +203,7 @@ class Context extends Component
if (!$this->isSubclassOf($class, 'yii\base\Object')) {
return;
}
foreach($class->getPublicMethods() as $name => $method) {
foreach ($class->getPublicMethods() as $name => $method) {
if ($method->isStatic) {
continue;
}
......@@ -275,7 +275,7 @@ class Context extends Component
*/
private function paramsOptional($method, $number = 0)
{
foreach($method->params as $param) {
foreach ($method->params as $param) {
if (!$param->isOptional && $number-- <= 0) {
return false;
}
......@@ -289,7 +289,7 @@ class Context extends Component
*/
private function getFirstNotOptionalParameter($method)
{
foreach($method->params as $param) {
foreach ($method->params as $param) {
if (!$param->isOptional) {
return $param;
}
......@@ -309,7 +309,7 @@ class Context extends Component
if ($classA->name == $classB) {
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];
if ($classA->name == $classB) {
return true;
......
extensions/apidoc/models/EventDoc.php
......@@ -34,7 +34,7 @@ class EventDoc extends ConstDoc
return;
}
foreach($this->tags as $i => $tag) {
foreach ($this->tags as $i => $tag) {
if ($tag->getName() == 'event') {
$eventTag = new ReturnTag('event', $tag->getContent(), $tag->getDocBlock(), $tag->getLocation());
$this->type = $eventTag->getType();
......
extensions/apidoc/models/FunctionDoc.php
......@@ -45,12 +45,12 @@ class FunctionDoc extends BaseDoc
$this->isReturnByReference = $reflector->isByRef();
foreach($reflector->getArguments() as $arg) {
foreach ($reflector->getArguments() as $arg) {
$arg = new ParamDoc($arg, $context, ['sourceFile' => $this->sourceFile]);
$this->params[$arg->name] = $arg;
}
foreach($this->tags as $i => $tag) {
foreach ($this->tags as $i => $tag) {
if ($tag instanceof ThrowsTag) {
$this->exceptions[$tag->getType()] = $tag->getDescription();
unset($this->tags[$i]);
......
extensions/apidoc/models/InterfaceDoc.php
......@@ -33,11 +33,11 @@ class InterfaceDoc extends TypeDoc
return;
}
foreach($reflector->getParentInterfaces() as $interface) {
foreach ($reflector->getParentInterfaces() as $interface) {
$this->parentInterfaces[] = ltrim($interface, '\\');
}
foreach($this->methods as $method) {
foreach ($this->methods as $method) {
$method->isAbstract = true;
}
......
extensions/apidoc/models/PropertyDoc.php
......@@ -63,7 +63,7 @@ class PropertyDoc extends BaseDoc
$this->defaultValue = PrettyPrinter::getRepresentationOfValue($reflector->getNode()->default);
}
foreach($this->tags as $tag) {
foreach ($this->tags as $tag) {
if ($tag instanceof VarTag) {
$this->type = $tag->getType();
$this->types = $tag->getTypes();
......
extensions/apidoc/models/TraitDoc.php
......@@ -34,7 +34,7 @@ class TraitDoc extends TypeDoc
return;
}
foreach($reflector->getTraits() as $trait) {
foreach ($reflector->getTraits() as $trait) {
$this->traits[] = ltrim($trait, '\\');
}
}
......
extensions/apidoc/models/TypeDoc.php
......@@ -41,7 +41,7 @@ class TypeDoc extends BaseDoc
public function findSubject($subjectName)
{
if ($subjectName[0] != '$') {
foreach($this->methods as $name => $method) {
foreach ($this->methods as $name => $method) {
if (rtrim($subjectName, '()') == $name) {
return $method;
}
......@@ -53,7 +53,7 @@ class TypeDoc extends BaseDoc
if ($this->properties === null) {
return null;
}
foreach($this->properties as $name => $property) {
foreach ($this->properties as $name => $property) {
if (ltrim($subjectName, '$') == ltrim($name, '$')) {
return $property;
}
......@@ -93,7 +93,7 @@ class TypeDoc extends BaseDoc
private function getFilteredMethods($visibility = null, $definedBy = null)
{
$methods = [];
foreach($this->methods as $name => $method) {
foreach ($this->methods as $name => $method) {
if ($visibility !== null && $method->visibility != $visibility) {
continue;
}
......@@ -140,7 +140,7 @@ class TypeDoc extends BaseDoc
return [];
}
$properties = [];
foreach($this->properties as $name => $property) {
foreach ($this->properties as $name => $property) {
if ($visibility !== null && $property->visibility != $visibility) {
continue;
}
......@@ -167,14 +167,14 @@ class TypeDoc extends BaseDoc
return;
}
foreach($this->tags as $i => $tag) {
foreach ($this->tags as $i => $tag) {
if ($tag instanceof AuthorTag) {
$this->authors[$tag->getAuthorName()] = $tag->getAuthorEmail();
unset($this->tags[$i]);
}
}
foreach($reflector->getProperties() as $propertyReflector) {
foreach ($reflector->getProperties() as $propertyReflector) {
if ($propertyReflector->getVisibility() != 'private') {
$property = new PropertyDoc($propertyReflector, $context, ['sourceFile' => $this->sourceFile]);
$property->definedBy = $this->name;
......@@ -182,7 +182,7 @@ class TypeDoc extends BaseDoc
}
}
foreach($reflector->getMethods() as $methodReflector) {
foreach ($reflector->getMethods() as $methodReflector) {
if ($methodReflector->getVisibility() != 'private') {
$method = new MethodDoc($methodReflector, $context, ['sourceFile' => $this->sourceFile]);
$method->definedBy = $this->name;
......
extensions/apidoc/templates/bootstrap/SideNavWidget.php
......@@ -153,7 +153,7 @@ class SideNavWidget extends \yii\bootstrap\Widget
$label .= ' ' . Html::tag('b', '', ['class' => 'caret']);
if (is_array($items)) {
if ($active === false) {
foreach($items as $subItem) {
foreach ($items as $subItem) {
if (isset($subItem['active']) && $subItem['active']) {
$active = true;
}
......
extensions/apidoc/templates/bootstrap/assets/AssetBundle.php
......@@ -6,6 +6,7 @@
*/
namespace yii\apidoc\templates\bootstrap\assets;
use yii\web\View;
/**
......
extensions/apidoc/templates/bootstrap/layouts/api.php
......@@ -20,7 +20,7 @@ $this->beginContent('@yii/apidoc/templates/bootstrap/layouts/main.php'); ?>
$types = $renderer->getNavTypes(isset($type) ? $type : null, $types);
ksort($types);
$nav = [];
foreach($types as $i=>$class) {
foreach ($types as $i => $class) {
$namespace = $class->namespace;
if (empty($namespace)) {
$namespace = 'Not namespaced classes';
......
extensions/apidoc/templates/bootstrap/layouts/guide.php
......@@ -19,7 +19,7 @@ $this->beginContent('@yii/apidoc/templates/bootstrap/layouts/main.php'); ?>
'url' => $this->context->generateGuideUrl('index.md'),
'active' => isset($currentFile) && (basename($currentFile) == 'index.md'),
];
foreach($headlines as $file => $headline) {
foreach ($headlines as $file => $headline) {
$nav[] = [
'label' => $headline,
'url' => $this->context->generateGuideUrl($file),
......
extensions/apidoc/templates/bootstrap/layouts/main.php
......@@ -54,7 +54,7 @@ $this->beginPage();
if (!empty($this->context->extensions))
{
$extItems = [];
foreach($this->context->extensions as $ext) {
foreach ($this->context->extensions as $ext) {
$extItems[] = [
'label' => $ext,
'url' => "./ext-{$ext}-index.html",
......
extensions/apidoc/templates/bootstrap/views/index.php
......@@ -3,6 +3,7 @@
use yii\apidoc\models\ClassDoc;
use yii\apidoc\models\InterfaceDoc;
use yii\apidoc\models\TraitDoc;
/**
* @var ClassDoc[]|InterfaceDoc[]|TraitDoc[] $types
* @var yii\web\View $this
......@@ -29,7 +30,7 @@ if (isset($readme)) {
</tr>
<?php
ksort($types);
foreach($types as $i=>$class):
foreach ($types as $i => $class):
?>
<tr>
<td><?= $renderer->createTypeLink($class, $class, $class->name) ?></td>
......
extensions/apidoc/templates/html/views/constSummary.php
......@@ -32,7 +32,7 @@ ArrayHelper::multisort($constants, 'name');
<tr>
<th>Constant</th><th>Value</th><th>Description</th><th>Defined By</th>
</tr>
<?php foreach($constants as $constant): ?>
<?php foreach ($constants as $constant): ?>
<tr<?= $constant->definedBy != $type->name ? ' class="inherited"' : '' ?> id="<?= $constant->name ?>">
<td><?= $constant->name ?><a name="<?= $constant->name ?>-detail"></a></td>
<td><?= $constant->value ?></td>
......
extensions/apidoc/templates/html/views/eventDetails.php
......@@ -16,12 +16,12 @@ if (empty($events)) {
ArrayHelper::multisort($events, 'name');
?>
<h2>Event Details</h2>
<?php foreach($events as $event): ?>
<?php foreach ($events as $event): ?>
<div class="detailHeader h3" id="<?= $event->name.'-detail' ?>">
<?= $event->name ?>
<span class="detailHeaderTag small">
event
<?php if(!empty($event->since)): ?>
<?php if (!empty($event->since)): ?>
(available since version <?= $event->since ?>)
<?php endif; ?>
</span>
......
extensions/apidoc/templates/html/views/eventSummary.php
......@@ -32,13 +32,13 @@ ArrayHelper::multisort($events, 'name');
<tr>
<th>Event</th><th>Type</th><th>Description</th><th>Defined By</th>
</tr>
<?php foreach($events as $event): ?>
<?php foreach ($events as $event): ?>
<tr<?= $event->definedBy != $type->name ? ' class="inherited"' : '' ?> id="<?= $event->name ?>">
<td><?= $renderer->createSubjectLink($event) ?></td>
<td><?= $renderer->createTypeLink($event->types) ?></td>
<td>
<?= ApiMarkdown::process($event->shortDescription, $event->definedBy, true) ?>
<?php if(!empty($event->since)): ?>
<?php if (!empty($event->since)): ?>
(available since version <?= $event->since ?>)
<?php endif; ?>
</td>
......
extensions/apidoc/templates/html/views/methodDetails.php
......@@ -21,7 +21,7 @@ ArrayHelper::multisort($methods, 'name');
?>
<h2>Method Details</h2>
<?php foreach($methods as $method): ?>
<?php foreach ($methods as $method): ?>
<div class="detailHeader h3" id="<?= $method->name . '()-detail' ?>">
<?= $method->name ?>()
......@@ -29,7 +29,7 @@ ArrayHelper::multisort($methods, 'name');
<?= $method->visibility ?>
method
<?php if (!empty($method->since)): ?>
(available since version <?php echo $method->since; ?>)
(available since version <?= $method->since ?>)
<?php endif; ?>
</span>
</div>
......@@ -38,22 +38,22 @@ ArrayHelper::multisort($methods, 'name');
<tr><td colspan="3">
<div class="signature2"><?= $renderer->renderMethodSignature($method) ?></div>
</td></tr>
<?php if(!empty($method->params) || !empty($method->return) || !empty($method->exceptions)): ?>
<?php foreach($method->params as $param): ?>
<?php if (!empty($method->params) || !empty($method->return) || !empty($method->exceptions)): ?>
<?php foreach ($method->params as $param): ?>
<tr>
<td class="paramNameCol"><?= $param->name ?></td>
<td class="paramTypeCol"><?= $renderer->createTypeLink($param->types) ?></td>
<td class="paramDescCol"><?= ApiMarkdown::process($param->description, $type) ?></td>
</tr>
<?php endforeach; ?>
<?php if(!empty($method->return)): ?>
<?php if (!empty($method->return)): ?>
<tr>
<td class="paramNameCol"><?= 'return'; ?></td>
<td class="paramTypeCol"><?= $renderer->createTypeLink($method->returnTypes); ?></td>
<td class="paramDescCol"><?= ApiMarkdown::process($method->return, $type); ?></td>
</tr>
<?php endif; ?>
<?php foreach($method->exceptions as $exception => $description): ?>
<?php foreach ($method->exceptions as $exception => $description): ?>
<tr>
<td class="paramNameCol"><?= 'throws' ?></td>
<td class="paramTypeCol"><?= $renderer->createTypeLink($exception) ?></td>
......
extensions/apidoc/templates/html/views/methodSummary.php
......@@ -36,8 +36,8 @@ if ($protected && count($type->getProtectedMethods()) == 0 || !$protected && cou
<?php
$methods = $type->methods;
ArrayHelper::multisort($methods, 'name');
foreach($methods as $method): ?>
<?php if($protected && $method->visibility == 'protected' || !$protected && $method->visibility != 'protected'): ?>
foreach ($methods as $method): ?>
<?php if ($protected && $method->visibility == 'protected' || !$protected && $method->visibility != 'protected'): ?>
<tr<?= $method->definedBy != $type->name ? ' class="inherited"' : '' ?> id="<?= $method->name ?>()">
<td><?= $renderer->createSubjectLink($method, $method->name.'()') ?></td>
<td><?= ApiMarkdown::process($method->shortDescription, $method->definedBy, true) ?></td>
......
extensions/apidoc/templates/html/views/propertyDetails.php
......@@ -21,17 +21,17 @@ ArrayHelper::multisort($properties, 'name');
?>
<h2>Property Details</h2>
<?php foreach($properties as $property): ?>
<?php foreach ($properties as $property): ?>
<div class="detailHeader h3" id="<?= $property->name.'-detail' ?>">
<?= $property->name ?>
<span class="detailHeaderTag small">
<?= $property->visibility ?>
<?php if($property->getIsReadOnly()) echo ' <em>read-only</em> '; ?>
<?php if($property->getIsWriteOnly()) echo ' <em>write-only</em> '; ?>
<?php if ($property->getIsReadOnly()) echo ' <em>read-only</em> '; ?>
<?php if ($property->getIsWriteOnly()) echo ' <em>write-only</em> '; ?>
property
<?php if(!empty($property->since)): ?>
(available since version <?php echo $property->since; ?>)
<?php if (!empty($property->since)): ?>
(available since version <?= $property->since ?>)
<?php endif; ?>
</span>
</div>
......
extensions/apidoc/templates/html/views/propertySummary.php
......@@ -36,8 +36,8 @@ if ($protected && count($type->getProtectedProperties()) == 0 || !$protected &&
<?php
$properties = $type->properties;
ArrayHelper::multisort($properties, 'name');
foreach($properties as $property): ?>
<?php if($protected && $property->visibility == 'protected' || !$protected && $property->visibility != 'protected'): ?>
foreach ($properties as $property): ?>
<?php if ($protected && $property->visibility == 'protected' || !$protected && $property->visibility != 'protected'): ?>
<tr<?= $property->definedBy != $type->name ? ' class="inherited"' : '' ?> id="<?= $property->name ?>">
<td><?= $renderer->createSubjectLink($property) ?></td>
<td><?= $renderer->createTypeLink($property->types) ?></td>
......
extensions/apidoc/templates/html/views/seeAlso.php
......@@ -6,7 +6,7 @@
*/
$see = [];
foreach($object->tags as $tag) {
foreach ($object->tags as $tag) {
/** @var $tag phpDocumentor\Reflection\DocBlock\Tag\SeeTag */
if (get_class($tag) == 'phpDocumentor\Reflection\DocBlock\Tag\SeeTag') {
$ref = $tag->getReference();
......@@ -24,7 +24,7 @@ if (empty($see)) {
<div class="SeeAlso">
<h4>See Also</h4>
<ul>
<?php foreach($see as $ref): ?>
<?php foreach ($see as $ref): ?>
<li><?= \yii\apidoc\helpers\ApiMarkdown::process($ref, $object->definedBy, true) ?></li>
<?php endforeach; ?>
</ul>
......
extensions/apidoc/templates/html/views/type.php
......@@ -4,6 +4,7 @@ use yii\apidoc\helpers\ApiMarkdown;
use yii\apidoc\models\ClassDoc;
use yii\apidoc\models\InterfaceDoc;
use yii\apidoc\models\TraitDoc;
/**
* @var ClassDoc|InterfaceDoc|TraitDoc $type
* @var yii\web\View $this
......@@ -30,16 +31,16 @@ $renderer = $this->context;
?></h1>
<div id="nav">
<a href="index.html">All Classes</a>
<?php if(!($type instanceof InterfaceDoc) && !empty($type->properties)): ?>
<?php if (!($type instanceof InterfaceDoc) && !empty($type->properties)): ?>
| <a href="#properties">Properties</a>
<?php endif; ?>
<?php if(!empty($type->methods)): ?>
<?php if (!empty($type->methods)): ?>
| <a href="#methods">Methods</a>
<?php endif; ?>
<?php if($type instanceof ClassDoc && !empty($type->events)): ?>
<?php if ($type instanceof ClassDoc && !empty($type->events)): ?>
| <a href="#events">Events</a>
<?php endif; ?>
<?php if($type instanceof ClassDoc && !empty($type->constants)): ?>
<?php if ($type instanceof ClassDoc && !empty($type->constants)): ?>
| <a href="#constants">Constants</a>
<?php endif; ?>
</div>
......@@ -55,10 +56,10 @@ $renderer = $this->context;
<?php if ($type instanceof ClassDoc && !empty($type->interfaces)): ?>
<tr><th>Implements</th><td><?= $renderer->renderInterfaces($type->interfaces) ?></td></tr>
<?php endif; ?>
<?php if(!($type instanceof InterfaceDoc) && !empty($type->traits)): ?>
<?php if (!($type instanceof InterfaceDoc) && !empty($type->traits)): ?>
<tr><th>Uses Traits</th><td><?= $renderer->renderTraits($type->traits) ?></td></tr>
<?php endif; ?>
<?php if($type instanceof ClassDoc && !empty($type->subclasses)): ?>
<?php if ($type instanceof ClassDoc && !empty($type->subclasses)): ?>
<tr><th>Subclasses</th><td><?= $renderer->renderClasses($type->subclasses) ?></td></tr>
<?php endif; ?>
<?php if ($type instanceof InterfaceDoc && !empty($type->implementedBy)): ?>
......@@ -67,7 +68,7 @@ $renderer = $this->context;
<?php if ($type instanceof TraitDoc && !empty($type->usedBy)): ?>
<tr><th>Implemented by</th><td><?= $renderer->renderClasses($type->usedBy) ?></td></tr>
<?php endif; ?>
<?php if(!empty($type->since)): ?>
<?php if (!empty($type->since)): ?>
<tr><th>Available since version</th><td><?= $type->since ?></td></tr>
<?php endif; ?>
<?php if(($sourceUrl = $renderer->getSourceUrl($type)) !== null): ?>
......@@ -84,8 +85,8 @@ $renderer = $this->context;
</div>
<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' => true]) ?>
<?= $this->render('@yii/apidoc/templates/html/views/propertySummary', ['type' => $type, 'protected' => false]) ?>
<?= $this->render('@yii/apidoc/templates/html/views/propertySummary', ['type' => $type, 'protected' => true]) ?>
<a name="methods"></a>
<?= $this->render('@yii/apidoc/templates/html/views/methodSummary', ['type' => $type, 'protected' => false]) ?>
......@@ -99,6 +100,6 @@ $renderer = $this->context;
<?= $this->render('@yii/apidoc/templates/html/views/propertyDetails', ['type' => $type]) ?>
<?= $this->render('@yii/apidoc/templates/html/views/methodDetails', ['type' => $type]) ?>
<?php if($type instanceof ClassDoc): ?>
<?php if ($type instanceof ClassDoc): ?>
<?= $this->render('@yii/apidoc/templates/html/views/eventDetails', ['type' => $type]) ?>
<?php endif; ?>
extensions/apidoc/templates/online/ApiRenderer.php
......@@ -6,6 +6,7 @@
*/
namespace yii\apidoc\templates\online;
use yii\apidoc\models\Context;
use yii\apidoc\models\TypeDoc;
use yii\console\Controller;
......@@ -36,7 +37,7 @@ class ApiRenderer extends \yii\apidoc\templates\html\ApiRenderer
}
$packages = [];
$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 */
if (empty($type->namespace)) {
$notNamespaced[] = str_replace('\\', '-', $type->name);
......@@ -46,7 +47,7 @@ class ApiRenderer extends \yii\apidoc\templates\html\ApiRenderer
}
ksort($packages);
$packages = array_merge(['Not namespaced' => $notNamespaced], $packages);
foreach($packages as $name => $classes) {
foreach ($packages as $name => $classes) {
sort($packages[$name]);
}
file_put_contents($targetDir . '/packages.txt', serialize($packages));
......
extensions/apidoc/templates/online/views/index.php
......@@ -3,6 +3,7 @@
use yii\apidoc\models\ClassDoc;
use yii\apidoc\models\InterfaceDoc;
use yii\apidoc\models\TraitDoc;
/**
* @var ClassDoc[]|InterfaceDoc[]|TraitDoc[] $types
* @var yii\web\View $this
......@@ -22,7 +23,7 @@ use yii\apidoc\models\TraitDoc;
</tr>
<?php
ksort($types);
foreach($types as $i=>$class):
foreach ($types as $i => $class):
?>
<tr>
<td><?= $this->context->typeLink($class, $class->name) ?></td>
......
extensions/authclient/OAuth1.php
......@@ -175,7 +175,7 @@ class OAuth1 extends BaseOAuth
}
case 'POST': {
$curlOptions[CURLOPT_POST] = true;
if (!empty($params)){
if (!empty($params)) {
$curlOptions[CURLOPT_POSTFIELDS] = $params;
}
$authorizationHeader = $this->composeAuthorizationHeader($params);
......
extensions/authclient/OAuthToken.php
......@@ -58,14 +58,16 @@ class OAuthToken extends Object
/**
* @param string $expireDurationParamKey expire duration param key.
*/
public function setExpireDurationParamKey($expireDurationParamKey) {
public function setExpireDurationParamKey($expireDurationParamKey)
{
$this->_expireDurationParamKey = $expireDurationParamKey;
}
/**
* @return string expire duration param key.
*/
public function getExpireDurationParamKey() {
public function getExpireDurationParamKey()
{
if ($this->_expireDurationParamKey === null) {
$this->_expireDurationParamKey = $this->defaultExpireDurationParamKey();
}
......@@ -75,14 +77,16 @@ class OAuthToken extends Object
/**
* @return array
*/
public function getParams() {
public function getParams()
{
return $this->_params;
}
/**
* @param array $params
*/
public function setParams(array $params) {
public function setParams(array $params)
{
$this->_params = $params;
}
......@@ -91,7 +95,8 @@ class OAuthToken extends Object
* @param string $name param name.
* @param mixed $value param value,
*/
public function setParam($name, $value) {
public function setParam($name, $value)
{
$this->_params[$name] = $value;
}
......@@ -100,7 +105,8 @@ class OAuthToken extends Object
* @param string $name param name.
* @return mixed param value.
*/
public function getParam($name) {
public function getParam($name)
{
return isset($this->_params[$name]) ? $this->_params[$name] : null;
}
......@@ -109,7 +115,8 @@ class OAuthToken extends Object
* @param string $token token value.
* @return static self reference.
*/
public function setToken($token) {
public function setToken($token)
{
$this->setParam($this->tokenParamKey, $token);
}
......@@ -117,7 +124,8 @@ class OAuthToken extends Object
* Returns token value.
* @return string token value.
*/
public function getToken() {
public function getToken()
{
return $this->getParam($this->tokenParamKey);
}
......@@ -125,7 +133,8 @@ class OAuthToken extends Object
* Sets the token secret value.
* @param string $tokenSecret token secret.
*/
public function setTokenSecret($tokenSecret) {
public function setTokenSecret($tokenSecret)
{
$this->setParam($this->tokenSecretParamKey, $tokenSecret);
}
......@@ -133,7 +142,8 @@ class OAuthToken extends Object
* Returns the token secret value.
* @return string token secret value.
*/
public function getTokenSecret() {
public function getTokenSecret()
{
return $this->getParam($this->tokenSecretParamKey);
}
......@@ -141,7 +151,8 @@ class OAuthToken extends Object
* Sets token expire duration.
* @param string $expireDuration token expiration duration.
*/
public function setExpireDuration($expireDuration) {
public function setExpireDuration($expireDuration)
{
$this->setParam($this->getExpireDurationParamKey(), $expireDuration);
}
......@@ -149,7 +160,8 @@ class OAuthToken extends Object
* Returns the token expiration duration.
* @return integer token expiration duration.
*/
public function getExpireDuration() {
public function getExpireDuration()
{
return $this->getParam($this->getExpireDurationParamKey());
}
......@@ -157,7 +169,8 @@ class OAuthToken extends Object
* Fetches default expire duration param key.
* @return string expire duration param key.
*/
protected function defaultExpireDurationParamKey() {
protected function defaultExpireDurationParamKey()
{
$expireDurationParamKey = 'expires_in';
foreach ($this->getParams() as $name => $value) {
if (strpos($name, 'expir') !== false) {
......@@ -172,7 +185,8 @@ class OAuthToken extends Object
* Checks if token has expired.
* @return boolean is token expired.
*/
public function getIsExpired() {
public function getIsExpired()
{
$expirationDuration = $this->getExpireDuration();
if (empty($expirationDuration)) {
return false;
......@@ -184,7 +198,8 @@ class OAuthToken extends Object
* Checks if token is valid.
* @return boolean is token valid.
*/
public function getIsValid() {
public function getIsValid()
{
$token = $this->getToken();
return (!empty($token) && !$this->getIsExpired());
}
......
extensions/authclient/OpenId.php
......@@ -243,10 +243,10 @@ class OpenId extends BaseClient implements ClientInterface
if ($this->verifyPeer !== null) {
curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, $this->verifyPeer);
if($this->capath) {
if ($this->capath) {
curl_setopt($curl, CURLOPT_CAPATH, $this->capath);
}
if($this->cainfo) {
if ($this->cainfo) {
curl_setopt($curl, CURLOPT_CAINFO, $this->cainfo);
}
}
......
extensions/authclient/clients/LinkedIn.php
......@@ -147,7 +147,8 @@ class LinkedIn extends OAuth2
* Generates the auth state value.
* @return string auth state value.
*/
protected function generateAuthState() {
protected function generateAuthState()
{
return sha1(uniqid(get_class($this), true));
}
......
extensions/bootstrap/NavBar.php
......@@ -70,7 +70,7 @@ class NavBar extends Widget
*/
public $screenReaderToggleText = 'Toggle navigation';
/**
* @var bool whether the navbar content should be included in an inner div container which by default
* @var boolean whether the navbar content should be included in an inner div container which by default
* adds left and right padding. Set this to false for a 100% width navbar.
*/
public $renderInnerContainer = true;
......
extensions/bootstrap/Progress.php
......@@ -133,7 +133,7 @@ class Progress extends Widget
/**
* Generates a bar
* @param int $percent the percentage of the bar
* @param integer $percent the percentage of the bar
* @param string $label, optional, the label to display at the bar
* @param array $options the HTML attributes of the bar
* @return string the rendering result.
......
extensions/composer/Installer.php
......@@ -192,7 +192,7 @@ class Installer extends LibraryInstaller
if (!file_exists($yiiDir)) {
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
<?php
/**
......@@ -213,7 +213,7 @@ EOF
protected function removeBaseYiiFiles()
{
$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)) {
unlink($yiiDir . '/' . $file);
}
......
extensions/debug/LogTarget.php
......@@ -168,5 +168,4 @@ class LogTarget extends Target
# / 2 because messages are in couple (begin/end)
return count($profileLogs) / 2;
}
}
extensions/debug/components/search/matchers/Base.php
......@@ -37,5 +37,4 @@ abstract class Base extends Component implements MatcherInterface
{
return !empty($this->baseValue) || ($this->baseValue === '0');
}
}
extensions/debug/panels/DbPanel.php
......@@ -175,5 +175,4 @@ class DbPanel extends Panel
{
return (($this->criticalQueryThreshold !== null) && ($count > $this->criticalQueryThreshold));
}
}
extensions/debug/panels/MailPanel.php
......@@ -102,5 +102,4 @@ class MailPanel extends Panel
}
return $attr;
}
}
extensions/debug/views/default/panels/config/detail.php
......@@ -35,4 +35,3 @@ echo $this->render('panels/config/table', [
]);
echo $panel->getPhpInfo();
?>
\ No newline at end of file
extensions/debug/views/default/panels/config/table.php
......@@ -23,7 +23,7 @@ use yii\helpers\Html;
</tr>
</thead>
<tbody>
<?php foreach($values as $name => $value): ?>
<?php foreach ($values as $name => $value): ?>
<tr>
<th style="width: 200px;"><?= Html::encode($name) ?></th>
<td style="overflow:auto"><?= Html::encode($value) ?></td>
......
extensions/debug/views/default/panels/db/detail.php
......@@ -67,4 +67,3 @@ echo GridView::widget([
]
],
]);
?>
extensions/debug/views/default/panels/log/detail.php
......@@ -70,4 +70,3 @@ echo GridView::widget([
],
],
]);
?>
extensions/debug/views/default/panels/profile/detail.php
<?php
use yii\grid\GridView;
use yii\helpers\Html;
?>
<h1>Performance Profiling</h1>
<p>Total processing time: <b><?= $time ?></b>; Peak memory: <b><?= $memory ?></b>.</p>
......@@ -50,4 +51,3 @@ echo GridView::widget([
],
],
]);
?>
extensions/debug/views/default/panels/request/table.php
......@@ -23,7 +23,7 @@ use yii\helpers\VarDumper;
</tr>
</thead>
<tbody>
<?php foreach($values as $name => $value): ?>
<?php foreach ($values as $name => $value): ?>
<tr>
<th style="width: 200px;"><?= Html::encode($name) ?></th>
<td><?= htmlspecialchars(VarDumper::dumpAsString($value), ENT_QUOTES|ENT_SUBSTITUTE, \Yii::$app->charset, true) ?></td>
......
extensions/elasticsearch/ActiveQuery.php
......@@ -156,7 +156,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface
}
$models = $this->createModels($result['hits']['hits']);
if ($this->asArray && !$this->indexBy) {
foreach($models as $key => $model) {
foreach ($models as $key => $model) {
if ($pk === '_id') {
$model['_source']['_id'] = $model['_id'];
}
......@@ -168,7 +168,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface
$this->findWith($this->with, $models);
}
if (!$this->asArray) {
foreach($models as $model) {
foreach ($models as $model) {
$model->afterFind();
}
}
......@@ -226,7 +226,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface
/** @var ActiveRecord $modelClass */
$modelClass = $this->modelClass;
$pk = $modelClass::primaryKey()[0];
foreach($models as $key => $model) {
foreach ($models as $key => $model) {
if ($pk === '_id') {
$model['_source']['_id'] = $model['_id'];
}
......@@ -238,7 +238,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface
$this->findWith($this->with, $models);
}
if (!$this->asArray) {
foreach($models as $model) {
foreach ($models as $model) {
$model->afterFind();
}
}
......
extensions/elasticsearch/ActiveRecord.php
......@@ -122,7 +122,7 @@ class ActiveRecord extends BaseActiveRecord
$command = static::getDb()->createCommand();
$result = $command->mget(static::index(), static::type(), $primaryKeys, $options);
$models = [];
foreach($result['docs'] as $doc) {
foreach ($result['docs'] as $doc) {
if ($doc['exists']) {
$model = static::instantiate($doc);
static::populateRecord($model, $doc);
......@@ -422,7 +422,7 @@ class ActiveRecord extends BaseActiveRecord
return 0;
}
$bulk = '';
foreach($primaryKeys as $pk) {
foreach ($primaryKeys as $pk) {
$action = Json::encode([
"update" => [
"_id" => $pk,
......@@ -441,7 +441,7 @@ class ActiveRecord extends BaseActiveRecord
$response = static::getDb()->post($url, [], $bulk);
$n=0;
$errors = [];
foreach($response['items'] as $item) {
foreach ($response['items'] as $item) {
if (isset($item['update']['error'])) {
$errors[] = $item['update'];
} elseif ($item['update']['ok']) {
......@@ -480,7 +480,7 @@ class ActiveRecord extends BaseActiveRecord
return 0;
}
$bulk = '';
foreach($primaryKeys as $pk) {
foreach ($primaryKeys as $pk) {
$action = Json::encode([
"update" => [
"_id" => $pk,
......@@ -489,7 +489,7 @@ class ActiveRecord extends BaseActiveRecord
],
]);
$script = '';
foreach($counters as $counter => $value) {
foreach ($counters as $counter => $value) {
$script .= "ctx._source.$counter += $counter;\n";
}
$data = Json::encode([
......@@ -504,7 +504,7 @@ class ActiveRecord extends BaseActiveRecord
$response = static::getDb()->post($url, [], $bulk);
$n=0;
$errors = [];
foreach($response['items'] as $item) {
foreach ($response['items'] as $item) {
if (isset($item['update']['error'])) {
$errors[] = $item['update'];
} elseif ($item['update']['ok']) {
......@@ -543,7 +543,7 @@ class ActiveRecord extends BaseActiveRecord
return 0;
}
$bulk = '';
foreach($primaryKeys as $pk) {
foreach ($primaryKeys as $pk) {
$bulk .= Json::encode([
"delete" => [
"_id" => $pk,
......@@ -558,7 +558,7 @@ class ActiveRecord extends BaseActiveRecord
$response = static::getDb()->post($url, [], $bulk);
$n=0;
$errors = [];
foreach($response['items'] as $item) {
foreach ($response['items'] as $item) {
if (isset($item['delete']['error'])) {
$errors[] = $item['delete'];
} elseif ($item['delete']['found'] && $item['delete']['ok']) {
......
extensions/elasticsearch/Command.php
......@@ -364,7 +364,7 @@ class Command extends Component
* @param $pattern
* @param $settings
* @param $mappings
* @param int $order
* @param integer $order
* @return mixed
* @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-templates.html
*/
......
extensions/elasticsearch/Connection.php
......@@ -29,7 +29,7 @@ class Connection extends Component
const EVENT_AFTER_OPEN = 'afterOpen';
/**
* @var bool whether to autodetect available cluster nodes on [[open()]]
* @var boolean whether to autodetect available cluster nodes on [[open()]]
*/
public $autodetectCluster = true;
/**
......@@ -63,7 +63,7 @@ class Connection extends Component
public function init()
{
foreach($this->nodes as $node) {
foreach ($this->nodes as $node) {
if (!isset($node['http_address'])) {
throw new InvalidConfigException('Elasticsearch node needs at least a http_address configured.');
}
......@@ -210,7 +210,7 @@ class Connection extends Component
private function createUrl($path, $options = [])
{
if (!is_string($path)) {
$url = implode('/', array_map(function($a) {
$url = implode('/', array_map(function ($a) {
return urlencode(is_array($a) ? implode(',', $a) : $a);
}, $path));
if (!empty($options)) {
......@@ -240,7 +240,7 @@ class Connection extends Component
// http://www.php.net/manual/en/function.curl-setopt.php#82418
CURLOPT_HTTPHEADER => ['Expect:'],
CURLOPT_WRITEFUNCTION => function($curl, $data) use (&$body) {
CURLOPT_WRITEFUNCTION => function ($curl, $data) use (&$body) {
$body .= $data;
return mb_strlen($data, '8bit');
},
......
extensions/elasticsearch/QueryBuilder.php
......@@ -177,7 +177,7 @@ class QueryBuilder extends \yii\base\Object
private function buildHashCondition($condition)
{
$parts = [];
foreach($condition as $attribute => $value) {
foreach ($condition as $attribute => $value) {
if ($attribute == '_id') {
if ($value == null) { // there is no null pk
$parts[] = ['script' => ['script' => '0==1']];
......
extensions/gii/Generator.php
......@@ -13,7 +13,6 @@ use yii\base\InvalidConfigException;
use yii\base\Model;
use yii\web\View;
/**
* This is the base class for all generator classes.
*
......
extensions/gii/components/DiffRendererHtmlInline.php
......@@ -73,7 +73,7 @@ HTML;
}
}
// Added lines only on the right side
else if ($change['tag'] === 'insert') {
elseif ($change['tag'] === 'insert') {
foreach ($change['changed']['lines'] as $no => $line) {
$toLine = $change['changed']['offset'] + $no + 1;
$html .= <<<HTML
......@@ -86,7 +86,7 @@ HTML;
}
}
// Show deleted lines only on the left side
else if ($change['tag'] === 'delete') {
elseif ($change['tag'] === 'delete') {
foreach ($change['base']['lines'] as $no => $line) {
$fromLine = $change['base']['offset'] + $no + 1;
$html .= <<<HTML
......@@ -99,7 +99,7 @@ HTML;
}
}
// Show modified lines on both sides
else if ($change['tag'] === 'replace') {
elseif ($change['tag'] === 'replace') {
foreach ($change['base']['lines'] as $no => $line) {
$fromLine = $change['base']['offset'] + $no + 1;
$html .= <<<HTML
......
extensions/gii/generators/controller/templates/controller.php
......@@ -18,7 +18,7 @@ namespace <?= $generator->ns ?>;
class <?= $generator->getControllerClass() ?> extends <?= '\\' . trim($generator->baseClass, '\\') . "\n" ?>
{
<?php foreach($generator->getActionIDs() as $action): ?>
<?php foreach ($generator->getActionIDs() as $action): ?>
public function action<?= Inflector::id2camel($action) ?>()
{
return $this->render('<?= $action ?>');
......
extensions/gii/generators/crud/Generator.php
......@@ -499,5 +499,4 @@ class Generator extends \yii\gii\Generator
return $model->attributes();
}
}
}
extensions/jui/AutoCompleteAsset.php
......@@ -6,6 +6,7 @@
*/
namespace yii\jui;
use yii\web\AssetBundle;
/**
......
extensions/jui/ButtonAsset.php
......@@ -6,6 +6,7 @@
*/
namespace yii\jui;
use yii\web\AssetBundle;
/**
......
extensions/jui/CoreAsset.php
......@@ -6,6 +6,7 @@
*/
namespace yii\jui;
use yii\web\AssetBundle;
/**
......
extensions/jui/DatePickerAsset.php
......@@ -6,6 +6,7 @@
*/
namespace yii\jui;
use yii\web\AssetBundle;
/**
......
extensions/jui/DatePickerRegionalAsset.php
......@@ -6,6 +6,7 @@
*/
namespace yii\jui;
use yii\web\AssetBundle;
/**
......
extensions/jui/DialogAsset.php
......@@ -6,6 +6,7 @@
*/
namespace yii\jui;
use yii\web\AssetBundle;
/**
......
extensions/jui/DraggableAsset.php
......@@ -6,6 +6,7 @@
*/
namespace yii\jui;
use yii\web\AssetBundle;
/**
......
extensions/jui/DroppableAsset.php
......@@ -6,6 +6,7 @@
*/
namespace yii\jui;
use yii\web\AssetBundle;
/**
......
extensions/jui/EffectAsset.php
......@@ -6,6 +6,7 @@
*/
namespace yii\jui;
use yii\web\AssetBundle;
/**
......
extensions/jui/MenuAsset.php
......@@ -6,6 +6,7 @@
*/
namespace yii\jui;
use yii\web\AssetBundle;
/**
......
extensions/jui/ProgressBarAsset.php
......@@ -6,6 +6,7 @@
*/
namespace yii\jui;
use yii\web\AssetBundle;
/**
......
extensions/jui/ResizableAsset.php
......@@ -6,6 +6,7 @@
*/
namespace yii\jui;
use yii\web\AssetBundle;
/**
......
extensions/jui/SelectableAsset.php
......@@ -6,6 +6,7 @@
*/
namespace yii\jui;
use yii\web\AssetBundle;
/**
......
extensions/jui/SliderAsset.php
......@@ -6,6 +6,7 @@
*/
namespace yii\jui;
use yii\web\AssetBundle;
/**
......
extensions/jui/SortableAsset.php
......@@ -6,6 +6,7 @@
*/
namespace yii\jui;
use yii\web\AssetBundle;
/**
......
extensions/jui/SpinnerAsset.php
......@@ -6,6 +6,7 @@
*/
namespace yii\jui;
use yii\web\AssetBundle;
/**
......
extensions/jui/TabsAsset.php
......@@ -6,6 +6,7 @@
*/
namespace yii\jui;
use yii\web\AssetBundle;
/**
......
extensions/jui/ThemeAsset.php
......@@ -6,6 +6,7 @@
*/
namespace yii\jui;
use yii\web\AssetBundle;
/**
......
extensions/jui/TooltipAsset.php
......@@ -6,6 +6,7 @@
*/
namespace yii\jui;
use yii\web\AssetBundle;
/**
......
extensions/mongodb/ActiveQuery.php
......@@ -111,7 +111,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface
$this->findWith($this->with, $models);
}
if (!$this->asArray) {
foreach($models as $model) {
foreach ($models as $model) {
$model->afterFind();
}
}
......
extensions/mongodb/Collection.php
......@@ -626,7 +626,8 @@ class Collection extends Object
* @return array the highest scoring documents, in descending order by score.
* @throws Exception on failure.
*/
public function fullTextSearch($search, $condition = [], $fields = [], $options = []) {
public function fullTextSearch($search, $condition = [], $fields = [], $options = [])
{
$command = [
'search' => $search
];
......
extensions/mongodb/file/ActiveQuery.php
......@@ -56,7 +56,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface
$this->findWith($this->with, $models);
}
if (!$this->asArray) {
foreach($models as $model) {
foreach ($models as $model) {
$model->afterFind();
}
}
......
extensions/redis/ActiveQuery.php
......@@ -87,10 +87,10 @@ class ActiveQuery extends \yii\base\Component implements ActiveQueryInterface
// TODO add support for orderBy
$data = $this->executeScript($db, 'All');
$rows = [];
foreach($data as $dataRow) {
foreach ($data as $dataRow) {
$row = [];
$c = count($dataRow);
for($i = 0; $i < $c; ) {
for ($i = 0; $i < $c;) {
$row[$dataRow[$i++]] = $dataRow[$i++];
}
$rows[] = $row;
......@@ -101,7 +101,7 @@ class ActiveQuery extends \yii\base\Component implements ActiveQueryInterface
$this->findWith($this->with, $models);
}
if (!$this->asArray) {
foreach($models as $model) {
foreach ($models as $model) {
$model->afterFind();
}
}
......@@ -128,7 +128,7 @@ class ActiveQuery extends \yii\base\Component implements ActiveQueryInterface
}
$row = [];
$c = count($data);
for($i = 0; $i < $c; ) {
for ($i = 0; $i < $c;) {
$row[$data[$i++]] = $data[$i++];
}
if ($this->asArray) {
......@@ -336,7 +336,7 @@ class ActiveQuery extends \yii\base\Component implements ActiveQueryInterface
if (count($this->where) == 1) {
$pks = (array) reset($this->where);
} else {
foreach($this->where as $values) {
foreach ($this->where as $values) {
if (is_array($values)) {
// TODO support composite IN for composite PK
throw new NotSupportedException('Find by composite PK is not supported by redis ActiveRecord.');
......@@ -357,7 +357,7 @@ class ActiveQuery extends \yii\base\Component implements ActiveQueryInterface
}
$i = 0;
$data = [];
foreach($pks as $pk) {
foreach ($pks as $pk) {
if (++$i > $start && ($limit === null || $i <= $start + $limit)) {
$key = $modelClass::keyPrefix() . ':a:' . $modelClass::buildKey($pk);
$result = $db->executeCommand('HGETALL', [$key]);
......@@ -380,10 +380,10 @@ class ActiveQuery extends \yii\base\Component implements ActiveQueryInterface
return count($data);
case 'Column':
$column = [];
foreach($data as $dataRow) {
foreach ($data as $dataRow) {
$row = [];
$c = count($dataRow);
for($i = 0; $i < $c; ) {
for ($i = 0; $i < $c;) {
$row[$dataRow[$i++]] = $dataRow[$i++];
}
$column[] = $row[$columnName];
......@@ -391,9 +391,9 @@ class ActiveQuery extends \yii\base\Component implements ActiveQueryInterface
return $column;
case 'Sum':
$sum = 0;
foreach($data as $dataRow) {
foreach ($data as $dataRow) {
$c = count($dataRow);
for($i = 0; $i < $c; ) {
for ($i = 0; $i < $c;) {
if ($dataRow[$i++] == $columnName) {
$sum += $dataRow[$i];
break;
......@@ -404,10 +404,10 @@ class ActiveQuery extends \yii\base\Component implements ActiveQueryInterface
case 'Average':
$sum = 0;
$count = 0;
foreach($data as $dataRow) {
foreach ($data as $dataRow) {
$count++;
$c = count($dataRow);
for($i = 0; $i < $c; ) {
for ($i = 0; $i < $c;) {
if ($dataRow[$i++] == $columnName) {
$sum += $dataRow[$i];
break;
......@@ -417,9 +417,9 @@ class ActiveQuery extends \yii\base\Component implements ActiveQueryInterface
return $sum / $count;
case 'Min':
$min = null;
foreach($data as $dataRow) {
foreach ($data as $dataRow) {
$c = count($dataRow);
for($i = 0; $i < $c; ) {
for ($i = 0; $i < $c;) {
if ($dataRow[$i++] == $columnName && ($min == null || $dataRow[$i] < $min)) {
$min = $dataRow[$i];
break;
......@@ -429,9 +429,9 @@ class ActiveQuery extends \yii\base\Component implements ActiveQueryInterface
return $min;
case 'Max':
$max = null;
foreach($data as $dataRow) {
foreach ($data as $dataRow) {
$c = count($dataRow);
for($i = 0; $i < $c; ) {
for ($i = 0; $i < $c;) {
if ($dataRow[$i++] == $columnName && ($max == null || $dataRow[$i] > $max)) {
$max = $dataRow[$i];
break;
......
extensions/redis/ActiveRecord.php
......@@ -139,7 +139,7 @@ class ActiveRecord extends BaseActiveRecord
$key = static::keyPrefix() . ':a:' . static::buildKey($pk);
// save attributes
$args = [$key];
foreach($values as $attribute => $value) {
foreach ($values as $attribute => $value) {
$args[] = $attribute;
$args[] = $value;
}
......@@ -172,13 +172,13 @@ class ActiveRecord extends BaseActiveRecord
}
$db = static::getDb();
$n=0;
foreach(static::fetchPks($condition) as $pk) {
foreach (static::fetchPks($condition) as $pk) {
$newPk = $pk;
$pk = static::buildKey($pk);
$key = static::keyPrefix() . ':a:' . $pk;
// save attributes
$args = [$key];
foreach($attributes as $attribute => $value) {
foreach ($attributes as $attribute => $value) {
if (isset($newPk[$attribute])) {
$newPk[$attribute] = $value;
}
......@@ -224,9 +224,9 @@ class ActiveRecord extends BaseActiveRecord
}
$db = static::getDb();
$n=0;
foreach(static::fetchPks($condition) as $pk) {
foreach (static::fetchPks($condition) as $pk) {
$key = static::keyPrefix() . ':a:' . static::buildKey($pk);
foreach($counters as $attribute => $value) {
foreach ($counters as $attribute => $value) {
$db->executeCommand('HINCRBY', [$key, $attribute, $value]);
}
$n++;
......@@ -254,7 +254,7 @@ class ActiveRecord extends BaseActiveRecord
$attributeKeys = [];
$pks = static::fetchPks($condition);
$db->executeCommand('MULTI');
foreach($pks as $pk) {
foreach ($pks as $pk) {
$pk = static::buildKey($pk);
$db->executeCommand('LREM', [static::keyPrefix(), 0, $pk]);
$attributeKeys[] = static::keyPrefix() . ':a:' . $pk;
......@@ -276,9 +276,9 @@ class ActiveRecord extends BaseActiveRecord
$primaryKey = static::primaryKey();
$pks = [];
foreach($records as $record) {
foreach ($records as $record) {
$pk = [];
foreach($primaryKey as $key) {
foreach ($primaryKey as $key) {
$pk[$key] = $record[$key];
}
$pks[] = $pk;
......@@ -304,7 +304,7 @@ class ActiveRecord extends BaseActiveRecord
}
ksort($key); // ensure order is always the same
$isNumeric = true;
foreach($key as $value) {
foreach ($key as $value) {
if (!is_numeric($value)) {
$isNumeric = false;
}
......
extensions/redis/Cache.php
......@@ -78,7 +78,7 @@ class Cache extends \yii\caching\Cache
parent::init();
if (is_string($this->redis)) {
$this->redis = Yii::$app->getComponent($this->redis);
} else if (is_array($this->redis)) {
} elseif (is_array($this->redis)) {
if (!isset($this->redis['class'])) {
$this->redis['class'] = Connection::className();
}
......@@ -145,7 +145,7 @@ class Cache extends \yii\caching\Cache
protected function setValues($data, $expire)
{
$args = [];
foreach($data as $key => $value) {
foreach ($data as $key => $value) {
$args[] = $key;
$args[] = $value;
}
......@@ -164,7 +164,7 @@ class Cache extends \yii\caching\Cache
}
$result = $this->redis->executeCommand('EXEC');
array_shift($result);
foreach($result as $i => $r) {
foreach ($result as $i => $r) {
if ($r != 1) {
$failedKeys[] = $index[$i];
}
......
extensions/redis/Connection.php
......@@ -45,7 +45,7 @@ class Connection extends Component
*/
public $hostname = 'localhost';
/**
* @var int the port to use for connecting to the redis server. Default port is 6379.
* @var integer the port to use for connecting to the redis server. Default port is 6379.
*/
public $port = 6379;
/**
......@@ -54,7 +54,7 @@ class Connection extends Component
*/
public $password;
/**
* @var int the redis database to use. This is an integer value starting from 0. Defaults to 0.
* @var integer the redis database to use. This is an integer value starting from 0. Defaults to 0.
*/
public $database = 0;
/**
......@@ -254,7 +254,7 @@ class Connection extends Component
);
if ($this->_socket) {
if ($this->dataTimeout !== null) {
stream_set_timeout($this->_socket, $timeout=(int)$this->dataTimeout, (int) (($this->dataTimeout - $timeout) * 1000000));
stream_set_timeout($this->_socket, $timeout = (int)$this->dataTimeout, (int) (($this->dataTimeout - $timeout) * 1000000));
}
if ($this->password !== null) {
$this->executeCommand('AUTH', [$this->password]);
......@@ -345,13 +345,13 @@ class Connection extends Component
* for details on the mentioned reply types.
* @trows Exception for commands that return [error reply](http://redis.io/topics/protocol#error-reply).
*/
public function executeCommand($name, $params=[])
public function executeCommand($name, $params = [])
{
$this->open();
array_unshift($params, $name);
$command = '*' . count($params) . "\r\n";
foreach($params as $arg) {
foreach ($params as $arg) {
$command .= '$' . mb_strlen($arg, '8bit') . "\r\n" . $arg . "\r\n";
}
......
extensions/redis/LuaScriptBuilder.php
......@@ -133,6 +133,7 @@ class LuaScriptBuilder extends \yii\base\Object
* @param ActiveQuery $query the query used to build the script
* @param string $buildResult the lua script for building the result
* @param string $return the lua variable that should be returned
* @throws yii\base\NotSupportedException when query contains unsupported order by condition
* @return string
*/
private function build($query, $buildResult, $return)
......@@ -155,7 +156,7 @@ class LuaScriptBuilder extends \yii\base\Object
$modelClass = $query->modelClass;
$key = $this->quoteValue($modelClass::keyPrefix());
$loadColumnValues = '';
foreach($columns as $column => $alias) {
foreach ($columns as $column => $alias) {
$loadColumnValues .= "local $alias=redis.call('HGET',$key .. ':a:' .. pk, '$column')\n";
}
......
extensions/redis/README.md
......@@ -160,7 +160,7 @@ class Customer extends \yii\redis\ActiveRecord
*/
public static function active($query)
{
$query->andWhere(array('status' => 1));
$query->andWhere(['status' => 1]);
}
}
```
......
extensions/redis/Session.php
......@@ -81,7 +81,7 @@ class Session extends \yii\web\Session
{
if (is_string($this->redis)) {
$this->redis = Yii::$app->getComponent($this->redis);
} else if (is_array($this->redis)) {
} elseif (is_array($this->redis)) {
if (!isset($this->redis['class'])) {
$this->redis['class'] = Connection::className();
}
......
extensions/sphinx/ActiveQuery.php
......@@ -135,7 +135,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface
}
$models = $this->fillUpSnippets($models);
if (!$this->asArray) {
foreach($models as $model) {
foreach ($models as $model) {
$model->afterFind();
}
}
......
extensions/sphinx/Connection.php
......@@ -6,6 +6,7 @@
*/
namespace yii\sphinx;
use yii\base\NotSupportedException;
/**
......
extensions/sphinx/Query.php
......@@ -338,7 +338,7 @@ class Query extends Component implements QueryInterface
/**
* Sets the value indicating whether to SELECT DISTINCT or not.
* @param bool $value whether to SELECT DISTINCT or not.
* @param boolean $value whether to SELECT DISTINCT or not.
* @return static the query object itself
*/
public function distinct($value = true)
......
extensions/sphinx/QueryBuilder.php
......@@ -422,7 +422,7 @@ class QueryBuilder extends Object
if (strpos($column, '(') === false) {
$column = $this->db->quoteColumnName($column);
}
$columns[$i] = "$column AS " . $this->db->quoteColumnName($i);;
$columns[$i] = "$column AS " . $this->db->quoteColumnName($i);
} elseif (strpos($column, '(') === false) {
if (preg_match('/^(.*?)(?i:\s+as\s+|\s+)([\w\-_\.]+)$/', $column, $matches)) {
$columns[$i] = $this->db->quoteColumnName($matches[1]) . ' AS ' . $this->db->quoteColumnName($matches[2]);
......@@ -907,7 +907,8 @@ class QueryBuilder extends Object
* @param array $params the binding parameters to be populated
* @return string SQL expression, which represents column value
*/
protected function composeColumnValue($indexes, $columnName, $value, &$params) {
protected function composeColumnValue($indexes, $columnName, $value, &$params)
{
if ($value === null) {
return 'NULL';
} elseif ($value instanceof Expression) {
......
extensions/twig/TwigSimpleFileLoader.php
......@@ -68,7 +68,8 @@ class TwigSimpleFileLoader implements \Twig_LoaderInterface
* @param string $name file name
* @return string absolute path of file
*/
protected function getFilePath($name){
protected function getFilePath($name)
{
return $this->_dir . '/' . $name;
}
}
extensions/twig/ViewRenderer.php
......@@ -118,7 +118,7 @@ class ViewRenderer extends BaseViewRenderer
}
// Adding global 'void' function (usage: {{void(App.clientScript.registerScriptFile(...))}})
$this->twig->addFunction('void', new \Twig_Function_Function(function($argument){
$this->twig->addFunction('void', new \Twig_Function_Function(function ($argument) {
}));
$this->twig->addFunction('path', new \Twig_Function_Function(function ($path, $args = []) {
......
extensions/twig/ViewRendererStaticClassProxy.php
......@@ -19,7 +19,8 @@ class ViewRendererStaticClassProxy
{
private $_staticClassName;
public function __construct($staticClassName) {
public function __construct($staticClassName)
{
$this->_staticClassName = $staticClassName;
}
......
framework/assets/yii.js
......@@ -158,7 +158,7 @@ yii = (function ($) {
return {};
}
var qs = url.substring(pos + 1).split('&');
for(var i = 0, result = {}; i < qs.length; i++){
for (var i = 0, result = {}; i < qs.length; i++) {
qs[i] = qs[i].split('=');
result[decodeURIComponent(qs[i][0])] = decodeURIComponent(qs[i][1]);
}
......
framework/base/ErrorException.php
......@@ -64,7 +64,7 @@ class ErrorException extends \ErrorException implements Arrayable
* Returns if error is one of fatal type.
*
* @param array $error error got from error_get_last()
* @return bool if error is one of fatal type
* @return boolean if error is one of fatal type
*/
public static function isFatalError($error)
{
......
framework/db/BaseActiveRecord.php
......@@ -406,7 +406,7 @@ abstract class BaseActiveRecord extends Model implements ActiveRecordInterface
/**
* Check whether the named relation has been populated with records.
* @param string $name the relation name (case-sensitive)
* @return bool whether relation has been populated with records.
* @return boolean whether relation has been populated with records.
*/
public function isRelationPopulated($name)
{
......
framework/db/Query.php
......@@ -396,7 +396,7 @@ class Query extends Component implements QueryInterface
/**
* Sets the value indicating whether to SELECT DISTINCT or not.
* @param bool $value whether to SELECT DISTINCT or not.
* @param boolean $value whether to SELECT DISTINCT or not.
* @return static the query object itself
*/
public function distinct($value = true)
......@@ -754,7 +754,7 @@ class Query extends Component implements QueryInterface
/**
* Appends a SQL statement using UNION operator.
* @param string|Query $sql the SQL statement to be appended using UNION
* @param bool $all TRUE if using UNION ALL and FALSE if using UNION
* @param boolean $all TRUE if using UNION ALL and FALSE if using UNION
* @return static the query object itself
*/
public function union($sql, $all = false)
......
framework/helpers/BaseConsole.php
......@@ -123,7 +123,7 @@ class BaseConsole
/**
* Scrolls whole page up by sending ANSI control code SU to the terminal.
* New lines are added at the bottom. This is not supported by ANSI.SYS used in windows.
* @param int $lines number of lines to scroll up
* @param integer $lines number of lines to scroll up
*/
public static function scrollUp($lines = 1)
{
......@@ -133,7 +133,7 @@ class BaseConsole
/**
* Scrolls whole page down by sending ANSI control code SD to the terminal.
* New lines are added at the top. This is not supported by ANSI.SYS used in windows.
* @param int $lines number of lines to scroll down
* @param integer $lines number of lines to scroll down
*/
public static function scrollDown($lines = 1)
{
......@@ -474,7 +474,7 @@ class BaseConsole
* colorcodes will just be removed (And %% will be transformed into %)
*
* @param string $string String to convert
* @param bool $colored Should the string be colored?
* @param boolean $colored Should the string be colored?
* @return string
*/
// TODO rework/refactor according to https://github.com/yiisoft/yii2/issues/746
......@@ -554,7 +554,7 @@ class BaseConsole
* - not tty consoles
*
* @param mixed $stream
* @return bool true if the stream supports ANSI colors, otherwise false.
* @return boolean true if the stream supports ANSI colors, otherwise false.
*/
public static function streamSupportsAnsiColors($stream)
{
......@@ -575,7 +575,7 @@ class BaseConsole
/**
* Usage: list($width, $height) = ConsoleHelper::getScreenSize();
*
* @param bool $refresh whether to force checking and not re-use cached size value.
* @param boolean $refresh whether to force checking and not re-use cached size value.
* This is useful to detect changing window size while the application is running but may
* not get up to date values on every terminal.
* @return array|boolean An array of ($width, $height) or false when it was not able to determine size.
......@@ -617,7 +617,7 @@ class BaseConsole
/**
* Gets input from STDIN and returns a string right-trimmed for EOLs.
*
* @param bool $raw If set to true, returns the raw string without trimming
* @param boolean $raw If set to true, returns the raw string without trimming
* @return string the string read from stdin
*/
public static function stdin($raw = false)
......@@ -898,7 +898,7 @@ class BaseConsole
* @param string|boolean $remove This can be `false` to leave the progress bar on screen and just print a newline.
* If set to `true`, the line of the progress bar will be cleared. This may also be a string to be displayed instead
* of the progress bar.
* @param bool $keepPrefix whether to keep the prefix that has been specified for the progressbar when progressbar
* @param boolean $keepPrefix whether to keep the prefix that has been specified for the progressbar when progressbar
* gets removed. Defaults to true.
* @see startProgress
* @see updateProgress
......
framework/helpers/BaseFileHelper.php
......@@ -147,7 +147,6 @@ class BaseFileHelper
* @param string $src the source directory
* @param string $dst the destination directory
* @param array $options options for directory copy. Valid options are:
* @throws \yii\base\InvalidParamException if unable to open directory
*
* - dirMode: integer, the permission to be set for newly copied directories. Defaults to 0775.
* - fileMode: integer, the permission to be set for newly copied files. Defaults to the current environment setting.
......@@ -178,6 +177,7 @@ class BaseFileHelper
* - afterCopy: callback, a PHP callback that is called after each sub-directory or file is successfully copied.
* The signature of the callback should be: `function ($from, $to)`, where `$from` is the sub-directory or
* file copied from, while `$to` is the copy target.
* @throws \yii\base\InvalidParamException if unable to open directory
*/
public static function copyDirectory($src, $dst, $options = [])
{
......
framework/helpers/BaseInflector.php
......@@ -332,7 +332,7 @@ class BaseInflector
* Converts an underscored or CamelCase word into a English
* sentence.
* @param string $words
* @param bool $ucAll whether to set all words to uppercase
* @param boolean $ucAll whether to set all words to uppercase
* @return string
*/
public static function titleize($words, $ucAll = false)
......@@ -415,7 +415,7 @@ class BaseInflector
/**
* Returns a human-readable string from $word
* @param string $word the string to humanize
* @param bool $ucAll whether to set all words to uppercase or not
* @param boolean $ucAll whether to set all words to uppercase or not
* @return string
*/
public static function humanize($word, $ucAll = false)
......@@ -455,7 +455,7 @@ class BaseInflector
* [[$transliteration]] array.
* @param string $string An arbitrary string to convert
* @param string $replacement The replacement to use for spaces
* @param bool $lowercase whether to return the string in lowercase or not. Defaults to `true`.
* @param boolean $lowercase whether to return the string in lowercase or not. Defaults to `true`.
* @return string The converted string.
*/
public static function slug($string, $replacement = '-', $lowercase = true)
......@@ -484,7 +484,7 @@ class BaseInflector
/**
* Converts number to its ordinal English form. For example, converts 13 to 13th, 2 to 2nd ...
* @param int $number the number to get its ordinal value
* @param integer $number the number to get its ordinal value
* @return string
*/
public static function ordinalize($number)
......
framework/i18n/MessageFormatter.php
......@@ -259,7 +259,7 @@ class MessageFormatter extends Component
/**
* Tokenizes a pattern by separating normal text from replaceable patterns
* @param string $pattern patter to tokenize
* @return array|bool array of tokens or false on failure
* @return array|boolean array of tokens or false on failure
*/
private static function tokenizePattern($pattern)
{
......
framework/requirements/YiiRequirementChecker.php
......@@ -320,7 +320,7 @@ class YiiRequirementChecker
/**
* Normalizes requirement ensuring it has correct format.
* @param array $requirement raw requirement.
* @param int $requirementKey requirement key in the list.
* @param integer $requirementKey requirement key in the list.
* @return array normalized requirement.
*/
function normalizeRequirement($requirement, $requirementKey = 0)
......
framework/requirements/views/web/index.php
......@@ -51,7 +51,7 @@
<table class="table table-bordered">
<tr><th>Name</th><th>Result</th><th>Required By</th><th>Memo</th></tr>
<?php foreach($requirements as $requirement): ?>
<?php foreach ($requirements as $requirement): ?>
<tr class="<?php echo $requirement['condition'] ? 'success' : ($requirement['mandatory'] ? 'error' : 'warning') ?>">
<td>
<?php echo $requirement['name'] ?>
......
framework/web/AssetConverter.php
......@@ -64,7 +64,7 @@ class AssetConverter extends Component implements AssetConverterInterface
* @param string $basePath asset base path and command working directory
* @param string $asset the name of the asset file
* @param string $result the name of the file to be generated by the converter command
* @return bool true on success, false on failure. Failures will be logged.
* @return boolean true on success, false on failure. Failures will be logged.
* @throws \yii\base\Exception when the command fails and YII_DEBUG is true.
* In production mode the error will be logged.
*/
......
framework/widgets/LinkPager.php
......@@ -90,7 +90,7 @@ class LinkPager extends Widget
*/
public $lastPageLabel;
/**
* @var bool whether to register link tags in the HTML header for prev, next, first and last page.
* @var boolean whether to register link tags in the HTML header for prev, next, first and last page.
* Defaults to `false` to avoid conflicts when multiple pagers are used on one page.
* @see http://www.w3.org/TR/html401/struct/links.html#h-12.1.2
* @see registerLinkTags()
......
tests/unit/extensions/elasticsearch/ElasticSearchTestCase.php
......@@ -27,7 +27,7 @@ class ElasticSearchTestCase extends TestCase
if (strpos($host, ':')===false) {
$host .= ':9200';
}
if(!@stream_socket_client($host, $errorNumber, $errorDescription, 0.5)) {
if (!@stream_socket_client($host, $errorNumber, $errorDescription, 0.5)) {
$this->markTestSkipped('No elasticsearch server running at ' . $params['dsn'] . ' : ' . $errorNumber . ' - ' . $errorDescription);
}
......@@ -35,7 +35,7 @@ class ElasticSearchTestCase extends TestCase
}
/**
* @param bool $reset whether to clean up the test database
* @param boolean $reset whether to clean up the test database
* @return Connection
*/
public function getConnection($reset = true)
......
tests/unit/extensions/redis/RedisCacheTest.php
......@@ -28,7 +28,7 @@ class RedisCacheTest extends CacheTestCase
$this->markTestSkipped('No redis server connection configured.');
}
$connection = new Connection($params);
if(!@stream_socket_client($connection->hostname . ':' . $connection->port, $errorNumber, $errorDescription, 0.5)) {
if (!@stream_socket_client($connection->hostname . ':' . $connection->port, $errorNumber, $errorDescription, 0.5)) {
$this->markTestSkipped('No redis server running at ' . $connection->hostname . ':' . $connection->port . ' : ' . $errorNumber . ' - ' . $errorDescription);
}
......
tests/unit/extensions/redis/RedisTestCase.php
......@@ -21,7 +21,7 @@ abstract class RedisTestCase extends TestCase
$this->markTestSkipped('No redis server connection configured.');
}
$connection = new Connection($params);
if(!@stream_socket_client($connection->hostname . ':' . $connection->port, $errorNumber, $errorDescription, 0.5)) {
if (!@stream_socket_client($connection->hostname . ':' . $connection->port, $errorNumber, $errorDescription, 0.5)) {
$this->markTestSkipped('No redis server running at ' . $connection->hostname . ':' . $connection->port . ' : ' . $errorNumber . ' - ' . $errorDescription);
}
......@@ -31,7 +31,7 @@ abstract class RedisTestCase extends TestCase
}
/**
* @param bool $reset whether to clean up the test database
* @param boolean $reset whether to clean up the test database
* @return Connection
*/
public function getConnection($reset = true)
......
tests/unit/extensions/sphinx/SchemaTest.php
......@@ -25,7 +25,7 @@ class SchemaTest extends SphinxTestCase
$indexes = $schema->getIndexSchemas();
$this->assertEquals(count($schema->getIndexNames()), count($indexes));
foreach($indexes as $index) {
foreach ($indexes as $index) {
$this->assertInstanceOf('yii\sphinx\IndexSchema', $index);
}
}
......@@ -62,7 +62,7 @@ class SchemaTest extends SphinxTestCase
$schema = $this->getConnection()->schema;
foreach($values as $value) {
foreach ($values as $value) {
$this->assertEquals($value[1], $schema->getPdoType($value[0]));
}
fclose($fp);
......
tests/unit/extensions/sphinx/SphinxTestCase.php
......@@ -82,8 +82,8 @@ class SphinxTestCase extends TestCase
}
/**
* @param bool $reset whether to clean up the test database
* @param bool $open whether to open test database
* @param boolean $reset whether to clean up the test database
* @param boolean $open whether to open test database
* @return \yii\sphinx\Connection
*/
public function getConnection($reset = false, $open = true)
......@@ -119,8 +119,8 @@ class SphinxTestCase extends TestCase
}
/**
* @param bool $reset whether to clean up the test database
* @param bool $open whether to open and populate test database
* @param boolean $reset whether to clean up the test database
* @param boolean $open whether to open and populate test database
* @return \yii\db\Connection
*/
public function getDbConnection($reset = true, $open = true)
......
tests/unit/framework/caching/CacheTestCase.php
......@@ -22,7 +22,7 @@ use yii\caching\Cache;
abstract class CacheTestCase extends TestCase
{
/**
* @var int virtual time to be returned by mocked time() function.
* @var integer virtual time to be returned by mocked time() function.
* Null means normal time() behavior.
*/
public static $time;
......
tests/unit/framework/caching/DbCacheTest.php
......@@ -34,7 +34,7 @@ class DbCacheTest extends CacheTestCase
}
/**
* @param bool $reset whether to clean up the test database
* @param boolean $reset whether to clean up the test database
* @return \yii\db\Connection
*/
public function getConnection($reset = true)
......
tests/unit/framework/db/DatabaseTestCase.php
......@@ -35,8 +35,8 @@ abstract class DatabaseTestCase extends TestCase
}
/**
* @param bool $reset whether to clean up the test database
* @param bool $open whether to open and populate test database
* @param boolean $reset whether to clean up the test database
* @param boolean $open whether to open and populate test database
* @return \yii\db\Connection
*/
public function getConnection($reset = true, $open = true)
......
tests/unit/framework/db/SchemaTest.php
......@@ -32,7 +32,7 @@ class SchemaTest extends DatabaseTestCase
$tables = $schema->getTableSchemas();
$this->assertEquals(count($schema->getTableNames()), count($tables));
foreach($tables as $table) {
foreach ($tables as $table) {
$this->assertInstanceOf('yii\db\TableSchema', $table);
}
}
......@@ -85,7 +85,7 @@ class SchemaTest extends DatabaseTestCase
/** @var Schema $schema */
$schema = $this->getConnection()->schema;
foreach($values as $value) {
foreach ($values as $value) {
$this->assertEquals($value[1], $schema->getPdoType($value[0]));
}
fclose($fp);
......
tests/unit/framework/db/cubrid/CubridSchemaTest.php
......@@ -28,7 +28,7 @@ class CubridSchemaTest extends SchemaTest
/** @var Schema $schema */
$schema = $this->getConnection()->schema;
foreach($values as $value) {
foreach ($values as $value) {
$this->assertEquals($value[1], $schema->getPdoType($value[0]));
}
fclose($fp);
......
tests/unit/framework/helpers/FileHelperTest.php
......@@ -254,14 +254,14 @@ class FileHelperTest extends TestCase
public function testFindFilesExclude()
{
$basePath = $this->testFilePath . DIRECTORY_SEPARATOR;
$dirs = ['', 'one', 'one'.DIRECTORY_SEPARATOR.'two', 'three'];
$dirs = ['', 'one', 'one' . DIRECTORY_SEPARATOR . 'two', 'three'];
$files = array_fill_keys(array_map(function($n){return "a.$n";}, range(1,8)), 'file contents');
$tree = $files;
$root = $files;
$flat = [];
foreach($dirs as $dir) {
foreach($files as $fileName=>$contents) {
foreach ($dirs as $dir) {
foreach ($files as $fileName => $contents) {
$flat[] = rtrim($basePath.$dir,DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.$fileName;
}
if ($dir === '') continue;
......
tests/unit/framework/log/TargetTest.php
......@@ -66,7 +66,7 @@ class TargetTest extends TestCase
$this->assertEquals(count($expected), count(static::$messages));
$i = 0;
foreach($expected as $e) {
foreach ($expected as $e) {
$this->assertEquals('test' . $e, static::$messages[$i++][0]);
}
}
......
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