diff --git a/build/controllers/DevController.php b/build/controllers/DevController.php index e31c9a59d9d..fdd8022cc58 100644 --- a/build/controllers/DevController.php +++ b/build/controllers/DevController.php @@ -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 * @since 2.0 @@ -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; /** diff --git a/build/controllers/PhpDocController.php b/build/controllers/PhpDocController.php index 144413f8228..e0bcecce684 100644 --- a/build/controllers/PhpDocController.php +++ b/build/controllers/PhpDocController.php @@ -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 * @author Alexander Makarov @@ -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) diff --git a/build/controllers/ReleaseController.php b/build/controllers/ReleaseController.php index 2bd825eee69..1d73fa5f6d8 100644 --- a/build/controllers/ReleaseController.php +++ b/build/controllers/ReleaseController.php @@ -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: * @@ -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; /** @@ -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); } @@ -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) { diff --git a/build/controllers/TranslationController.php b/build/controllers/TranslationController.php index b4d2164d262..dd89ad24ea9 100644 --- a/build/controllers/TranslationController.php +++ b/build/controllers/TranslationController.php @@ -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') { diff --git a/build/controllers/Utf8Controller.php b/build/controllers/Utf8Controller.php index ca5175dbfd6..673d9bfdeeb 100644 --- a/build/controllers/Utf8Controller.php +++ b/build/controllers/Utf8Controller.php @@ -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; // } } diff --git a/cs/src/YiiConfig.php b/cs/src/YiiConfig.php index 4e2e28ff703..95442861a4e 100644 --- a/cs/src/YiiConfig.php +++ b/cs/src/YiiConfig.php @@ -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