Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Typo PHPDoc #18939

Merged
merged 2 commits into from
Oct 8, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions build/controllers/DevController.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
/**
* This command helps to set up a dev environment with all extensions and applications.
*
* It will clone an extension or app repo and link the yii2 dev installation to the containted applications/extensions vendor dirs
* to help working on yii using the application to test it.
* It will clone an extension or app repo and link the yii2 dev installation to the contained applications/extensions vendor dirs
* to help to work on yii using the application to test it.
*
* @author Carsten Brandt <mail@cebe.cc>
* @since 2.0
Expand All @@ -29,7 +29,7 @@ class DevController extends Controller
*/
public $defaultAction = 'all';
/**
* @var bool whether to use HTTP when cloning github repositories
* @var bool whether to use HTTP when cloning GitHub repositories
*/
public $useHttp = false;
/**
Expand Down
8 changes: 4 additions & 4 deletions build/controllers/PhpDocController.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
use yii\helpers\Json;

/**
* PhpDocController is there to help maintaining PHPDoc annotation in class files.
* PhpDocController is there to help to maintain PHPDoc annotation in class files.
*
* @author Carsten Brandt <mail@cebe.cc>
* @author Alexander Makarov <sam@rmcreative.ru>
Expand Down Expand Up @@ -871,11 +871,11 @@ protected function hasSetterInParents($className, $propName)
*/
protected function isBaseObject($className, \ReflectionClass $ref)
{
$isDepreceatedObject = false;
$isDeprecatedObject = false;
if (PHP_VERSION_ID <= 70100) {
$isDepreceatedObject = $ref->isSubclassOf('yii\base\Object') || $className === 'yii\base\Object';
$isDeprecatedObject = $ref->isSubclassOf('yii\base\Object') || $className === 'yii\base\Object';
}
return !$isDepreceatedObject && !$ref->isSubclassOf('yii\base\BaseObject') && $className !== 'yii\base\BaseObject';
return !$isDeprecatedObject && !$ref->isSubclassOf('yii\base\BaseObject') && $className !== 'yii\base\BaseObject';
}

private function shouldSkipClass($className)
Expand Down
8 changes: 4 additions & 4 deletions build/controllers/ReleaseController.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
use yii\helpers\FileHelper;

/**
* ReleaseController is there to help preparing releases.
* ReleaseController is there to help to prepare releases.
*
* Get a version overview:
*
Expand Down Expand Up @@ -53,7 +53,7 @@ class ReleaseController extends Controller
*/
public $dryRun = false;
/**
* @var bool whether to fetch latest tags.
* @var bool whether to fetch the latest tags.
*/
public $update = false;
/**
Expand Down Expand Up @@ -206,7 +206,7 @@ public function actionRelease(array $what)
$newVersions[$k] = $this->version;
}
} else {
// otherwise get next patch or minor
// otherwise, get next patch or minor
$newVersions = $this->getNextVersions($versions, self::PATCH);
}

Expand Down Expand Up @@ -803,7 +803,7 @@ protected function gitFetchTags($path)
try {
chdir($path);
} catch (\yii\base\ErrorException $e) {
throw new Exception('Failed to getch git tags in ' . $path . ': ' . $e->getMessage());
throw new Exception('Failed to fetch git tags in ' . $path . ': ' . $e->getMessage());
}
exec('git fetch --tags', $output, $ret);
if ($ret != 0) {
Expand Down
1 change: 0 additions & 1 deletion build/controllers/TranslationController.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ class TranslationController extends Controller
* @param string $sourcePath the directory where the original documentation files are
* @param string $translationPath the directory where the translated documentation files are
* @param string $title custom title to use for report
* @return string
*/
public function actionReport($sourcePath, $translationPath, $title = 'Translation report')
{
Expand Down
4 changes: 2 additions & 2 deletions build/controllers/Utf8Controller.php
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,11 @@ public function actionCheckGuide($directory = null)
}
if ($ord < 0x0020 && $ord != 0x000A && $ord != 0x0009 ||
0x0080 <= $ord && $ord < 0x009F) {
$this->found('CONTROL CHARARCTER', $c, $line, $pos, $file);
$this->found('CONTROL CHARACTER', $c, $line, $pos, $file);
continue;
}
// if ($ord > 0x009F) {
// $this->found("NON ASCII CHARARCTER", $c, $line, $pos, $file);
// $this->found("NON ASCII CHARACTER", $c, $line, $pos, $file);
// continue;
// }
}
Expand Down
2 changes: 1 addition & 1 deletion cs/src/YiiConfig.php
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ public function __construct($name = 'yii-cs-config')
}

/**
* Merge current rules config with provided list of rules.
* Merge current rules' config with provided list of rules.
*
* @param array $rules
* @return $this
Expand Down