php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-26 06:15:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Typo PHPDoc (#18939)

Browse Source 
Typo PHPDoc

Co-authored-by: toir427 <t.tuychiev@safenetpay.com>
Co-authored-by: Bizley <pawel@positive.codes>
This commit is contained in:
Toir Tuychiev
2021-10-08 12:02:19 +05:00
committed by GitHub
parent 71892888b0
commit 728e910baf
6 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build/controllers/DevController.php
View File

@ -16,8 +16,8 @@ use yii\helpers\FileHelper;
/**
* 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
@ -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;
/**

8
build/controllers/PhpDocController.php
View File

@ -14,7 +14,7 @@ use yii\helpers\FileHelper;
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>
@ -871,11 +871,11 @@ class PhpDocController extends Controller
*/
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)

8
build/controllers/ReleaseController.php
View File

@ -15,7 +15,7 @@ use yii\helpers\Console;
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 @@ class ReleaseController extends Controller
$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 @@ class ReleaseController extends Controller
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) {

1
build/controllers/TranslationController.php
View File

@ -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')
{

4
build/controllers/Utf8Controller.php
View File

@ -69,11 +69,11 @@ class Utf8Controller extends Controller
}
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;
// }
}

2
cs/src/YiiConfig.php
View File

@ -156,7 +156,7 @@ class YiiConfig extends Config
}
/**
* Merge current rules config with provided list of rules.
* Merge current rules' config with provided list of rules.
*
* @param array $rules
* @return $this