mirror of
https://github.com/yiisoft/yii2.git
synced 2025-10-28 12:34:34 +08:00
Remove invalid and unnecessary PHPDoc annotations (#20507)
This commit is contained in:
@ -363,7 +363,6 @@ abstract class Application extends Module
|
|||||||
* Sets the root directory of the application and the @app alias.
|
* Sets the root directory of the application and the @app alias.
|
||||||
* This method can only be invoked at the beginning of the constructor.
|
* This method can only be invoked at the beginning of the constructor.
|
||||||
* @param string $path the root directory of the application.
|
* @param string $path the root directory of the application.
|
||||||
* @property string the root directory of the application.
|
|
||||||
* @throws InvalidArgumentException if the directory does not exist.
|
* @throws InvalidArgumentException if the directory does not exist.
|
||||||
*/
|
*/
|
||||||
public function setBasePath($path)
|
public function setBasePath($path)
|
||||||
|
|||||||
@ -236,7 +236,6 @@ class FixtureController extends Controller
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Show help message.
|
* Show help message.
|
||||||
* @param array $fixturesInput
|
|
||||||
*/
|
*/
|
||||||
private function printHelpMessage()
|
private function printHelpMessage()
|
||||||
{
|
{
|
||||||
|
|||||||
@ -9,7 +9,6 @@ namespace yii\db\cubrid;
|
|||||||
|
|
||||||
use yii\base\InvalidArgumentException;
|
use yii\base\InvalidArgumentException;
|
||||||
use yii\base\NotSupportedException;
|
use yii\base\NotSupportedException;
|
||||||
use yii\db\Constraint;
|
|
||||||
use yii\db\Exception;
|
use yii\db\Exception;
|
||||||
use yii\db\Expression;
|
use yii\db\Expression;
|
||||||
|
|
||||||
@ -65,7 +64,6 @@ class QueryBuilder extends \yii\db\QueryBuilder
|
|||||||
*/
|
*/
|
||||||
public function upsert($table, $insertColumns, $updateColumns, &$params)
|
public function upsert($table, $insertColumns, $updateColumns, &$params)
|
||||||
{
|
{
|
||||||
/** @var Constraint[] $constraints */
|
|
||||||
list($uniqueNames, $insertNames, $updateNames) = $this->prepareUpsertColumns($table, $insertColumns, $updateColumns, $constraints);
|
list($uniqueNames, $insertNames, $updateNames) = $this->prepareUpsertColumns($table, $insertColumns, $updateColumns, $constraints);
|
||||||
if (empty($uniqueNames)) {
|
if (empty($uniqueNames)) {
|
||||||
return $this->insert($table, $insertColumns, $params);
|
return $this->insert($table, $insertColumns, $params);
|
||||||
|
|||||||
@ -9,7 +9,6 @@ namespace yii\db\mssql;
|
|||||||
|
|
||||||
use yii\base\InvalidArgumentException;
|
use yii\base\InvalidArgumentException;
|
||||||
use yii\base\NotSupportedException;
|
use yii\base\NotSupportedException;
|
||||||
use yii\db\Constraint;
|
|
||||||
use yii\db\Expression;
|
use yii\db\Expression;
|
||||||
use yii\db\Query;
|
use yii\db\Query;
|
||||||
use yii\db\TableSchema;
|
use yii\db\TableSchema;
|
||||||
@ -544,7 +543,6 @@ class QueryBuilder extends \yii\db\QueryBuilder
|
|||||||
{
|
{
|
||||||
$insertColumns = $this->normalizeTableRowData($table, $insertColumns, $params);
|
$insertColumns = $this->normalizeTableRowData($table, $insertColumns, $params);
|
||||||
|
|
||||||
/** @var Constraint[] $constraints */
|
|
||||||
list($uniqueNames, $insertNames, $updateNames) = $this->prepareUpsertColumns($table, $insertColumns, $updateColumns, $constraints);
|
list($uniqueNames, $insertNames, $updateNames) = $this->prepareUpsertColumns($table, $insertColumns, $updateColumns, $constraints);
|
||||||
if (empty($uniqueNames)) {
|
if (empty($uniqueNames)) {
|
||||||
return $this->insert($table, $insertColumns, $params);
|
return $this->insert($table, $insertColumns, $params);
|
||||||
|
|||||||
@ -9,7 +9,6 @@ namespace yii\db\oci;
|
|||||||
|
|
||||||
use yii\base\InvalidArgumentException;
|
use yii\base\InvalidArgumentException;
|
||||||
use yii\db\Connection;
|
use yii\db\Connection;
|
||||||
use yii\db\Constraint;
|
|
||||||
use yii\db\Exception;
|
use yii\db\Exception;
|
||||||
use yii\db\Expression;
|
use yii\db\Expression;
|
||||||
use yii\db\Query;
|
use yii\db\Query;
|
||||||
@ -213,7 +212,6 @@ EOD;
|
|||||||
*/
|
*/
|
||||||
public function upsert($table, $insertColumns, $updateColumns, &$params)
|
public function upsert($table, $insertColumns, $updateColumns, &$params)
|
||||||
{
|
{
|
||||||
/** @var Constraint[] $constraints */
|
|
||||||
list($uniqueNames, $insertNames, $updateNames) = $this->prepareUpsertColumns($table, $insertColumns, $updateColumns, $constraints);
|
list($uniqueNames, $insertNames, $updateNames) = $this->prepareUpsertColumns($table, $insertColumns, $updateColumns, $constraints);
|
||||||
if (empty($uniqueNames)) {
|
if (empty($uniqueNames)) {
|
||||||
return $this->insert($table, $insertColumns, $params);
|
return $this->insert($table, $insertColumns, $params);
|
||||||
|
|||||||
@ -8,7 +8,6 @@
|
|||||||
namespace yii\db\pgsql;
|
namespace yii\db\pgsql;
|
||||||
|
|
||||||
use yii\base\InvalidArgumentException;
|
use yii\base\InvalidArgumentException;
|
||||||
use yii\db\Constraint;
|
|
||||||
use yii\db\Expression;
|
use yii\db\Expression;
|
||||||
use yii\db\ExpressionInterface;
|
use yii\db\ExpressionInterface;
|
||||||
use yii\db\Query;
|
use yii\db\Query;
|
||||||
@ -368,7 +367,6 @@ class QueryBuilder extends \yii\db\QueryBuilder
|
|||||||
*/
|
*/
|
||||||
private function oldUpsert($table, $insertColumns, $updateColumns, &$params)
|
private function oldUpsert($table, $insertColumns, $updateColumns, &$params)
|
||||||
{
|
{
|
||||||
/** @var Constraint[] $constraints */
|
|
||||||
list($uniqueNames, $insertNames, $updateNames) = $this->prepareUpsertColumns($table, $insertColumns, $updateColumns, $constraints);
|
list($uniqueNames, $insertNames, $updateNames) = $this->prepareUpsertColumns($table, $insertColumns, $updateColumns, $constraints);
|
||||||
if (empty($uniqueNames)) {
|
if (empty($uniqueNames)) {
|
||||||
return $this->insert($table, $insertColumns, $params);
|
return $this->insert($table, $insertColumns, $params);
|
||||||
|
|||||||
@ -10,7 +10,6 @@ namespace yii\db\sqlite;
|
|||||||
use yii\base\InvalidArgumentException;
|
use yii\base\InvalidArgumentException;
|
||||||
use yii\base\NotSupportedException;
|
use yii\base\NotSupportedException;
|
||||||
use yii\db\Connection;
|
use yii\db\Connection;
|
||||||
use yii\db\Constraint;
|
|
||||||
use yii\db\Expression;
|
use yii\db\Expression;
|
||||||
use yii\db\ExpressionInterface;
|
use yii\db\ExpressionInterface;
|
||||||
use yii\db\Query;
|
use yii\db\Query;
|
||||||
@ -69,7 +68,6 @@ class QueryBuilder extends \yii\db\QueryBuilder
|
|||||||
*/
|
*/
|
||||||
public function upsert($table, $insertColumns, $updateColumns, &$params)
|
public function upsert($table, $insertColumns, $updateColumns, &$params)
|
||||||
{
|
{
|
||||||
/** @var Constraint[] $constraints */
|
|
||||||
list($uniqueNames, $insertNames, $updateNames) = $this->prepareUpsertColumns($table, $insertColumns, $updateColumns, $constraints);
|
list($uniqueNames, $insertNames, $updateNames) = $this->prepareUpsertColumns($table, $insertColumns, $updateColumns, $constraints);
|
||||||
if (empty($uniqueNames)) {
|
if (empty($uniqueNames)) {
|
||||||
return $this->insert($table, $insertColumns, $params);
|
return $this->insert($table, $insertColumns, $params);
|
||||||
|
|||||||
@ -95,7 +95,6 @@ class BaseMarkdown
|
|||||||
if ($flavor === null) {
|
if ($flavor === null) {
|
||||||
$flavor = static::$defaultFlavor;
|
$flavor = static::$defaultFlavor;
|
||||||
}
|
}
|
||||||
/** @var \cebe\markdown\Markdown $parser */
|
|
||||||
if (!isset(static::$flavors[$flavor])) {
|
if (!isset(static::$flavors[$flavor])) {
|
||||||
throw new InvalidArgumentException("Markdown flavor '$flavor' is not defined.'");
|
throw new InvalidArgumentException("Markdown flavor '$flavor' is not defined.'");
|
||||||
} elseif (!is_object($config = static::$flavors[$flavor])) {
|
} elseif (!is_object($config = static::$flavors[$flavor])) {
|
||||||
|
|||||||
Reference in New Issue
Block a user