Browse Source

Typo PHPDoc (#18939)

Typo PHPDoc

Co-authored-by: toir427 <t.tuychiev@safenetpay.com>
Co-authored-by: Bizley <pawel@positive.codes>
tags/2.0.44
Toir Tuychiev 3 years ago committed by GitHub
parent
commit
728e910baf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      build/controllers/DevController.php
  2. 8
      build/controllers/PhpDocController.php
  3. 8
      build/controllers/ReleaseController.php
  4. 1
      build/controllers/TranslationController.php
  5. 4
      build/controllers/Utf8Controller.php
  6. 2
      cs/src/YiiConfig.php

6
build/controllers/DevController.php

@ -16,8 +16,8 @@ use yii\helpers\FileHelper;
/** /**
* This command helps to set up a dev environment with all extensions and applications. * 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 * It will clone an extension or app repo and link the yii2 dev installation to the contained applications/extensions vendor dirs
* to help working on yii using the application to test it. * to help to work on yii using the application to test it.
* *
* @author Carsten Brandt <mail@cebe.cc> * @author Carsten Brandt <mail@cebe.cc>
* @since 2.0 * @since 2.0
@ -29,7 +29,7 @@ class DevController extends Controller
*/ */
public $defaultAction = 'all'; 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; public $useHttp = false;
/** /**

8
build/controllers/PhpDocController.php

@ -14,7 +14,7 @@ use yii\helpers\FileHelper;
use yii\helpers\Json; 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 Carsten Brandt <mail@cebe.cc>
* @author Alexander Makarov <sam@rmcreative.ru> * @author Alexander Makarov <sam@rmcreative.ru>
@ -871,11 +871,11 @@ class PhpDocController extends Controller
*/ */
protected function isBaseObject($className, \ReflectionClass $ref) protected function isBaseObject($className, \ReflectionClass $ref)
{ {
$isDepreceatedObject = false; $isDeprecatedObject = false;
if (PHP_VERSION_ID <= 70100) { 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) private function shouldSkipClass($className)

8
build/controllers/ReleaseController.php

@ -15,7 +15,7 @@ use yii\helpers\Console;
use yii\helpers\FileHelper; use yii\helpers\FileHelper;
/** /**
* ReleaseController is there to help preparing releases. * ReleaseController is there to help to prepare releases.
* *
* Get a version overview: * Get a version overview:
* *
@ -53,7 +53,7 @@ class ReleaseController extends Controller
*/ */
public $dryRun = false; public $dryRun = false;
/** /**
* @var bool whether to fetch latest tags. * @var bool whether to fetch the latest tags.
*/ */
public $update = false; public $update = false;
/** /**
@ -206,7 +206,7 @@ class ReleaseController extends Controller
$newVersions[$k] = $this->version; $newVersions[$k] = $this->version;
} }
} else { } else {
// otherwise get next patch or minor // otherwise, get next patch or minor
$newVersions = $this->getNextVersions($versions, self::PATCH); $newVersions = $this->getNextVersions($versions, self::PATCH);
} }
@ -803,7 +803,7 @@ class ReleaseController extends Controller
try { try {
chdir($path); chdir($path);
} catch (\yii\base\ErrorException $e) { } 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); exec('git fetch --tags', $output, $ret);
if ($ret != 0) { if ($ret != 0) {

1
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 $sourcePath the directory where the original documentation files are
* @param string $translationPath the directory where the translated documentation files are * @param string $translationPath the directory where the translated documentation files are
* @param string $title custom title to use for report * @param string $title custom title to use for report
* @return string
*/ */
public function actionReport($sourcePath, $translationPath, $title = 'Translation report') public function actionReport($sourcePath, $translationPath, $title = 'Translation report')
{ {

4
build/controllers/Utf8Controller.php

@ -69,11 +69,11 @@ class Utf8Controller extends Controller
} }
if ($ord < 0x0020 && $ord != 0x000A && $ord != 0x0009 || if ($ord < 0x0020 && $ord != 0x000A && $ord != 0x0009 ||
0x0080 <= $ord && $ord < 0x009F) { 0x0080 <= $ord && $ord < 0x009F) {
$this->found('CONTROL CHARARCTER', $c, $line, $pos, $file); $this->found('CONTROL CHARACTER', $c, $line, $pos, $file);
continue; continue;
} }
// if ($ord > 0x009F) { // if ($ord > 0x009F) {
// $this->found("NON ASCII CHARARCTER", $c, $line, $pos, $file); // $this->found("NON ASCII CHARACTER", $c, $line, $pos, $file);
// continue; // continue;
// } // }
} }

2
cs/src/YiiConfig.php

@ -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 * @param array $rules
* @return $this * @return $this

Loading…
Cancel
Save