diff --git a/framework/base/Application.php b/framework/base/Application.php index 10c24c8233..f6bbe53e2b 100644 --- a/framework/base/Application.php +++ b/framework/base/Application.php @@ -363,7 +363,6 @@ abstract class Application extends Module * Sets the root directory of the application and the @app alias. * This method can only be invoked at the beginning of the constructor. * @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. */ public function setBasePath($path) diff --git a/framework/console/controllers/FixtureController.php b/framework/console/controllers/FixtureController.php index caba5d271c..32275c9f0e 100644 --- a/framework/console/controllers/FixtureController.php +++ b/framework/console/controllers/FixtureController.php @@ -236,7 +236,6 @@ class FixtureController extends Controller /** * Show help message. - * @param array $fixturesInput */ private function printHelpMessage() { diff --git a/framework/db/cubrid/QueryBuilder.php b/framework/db/cubrid/QueryBuilder.php index 72ac4df6ef..be1802d93b 100644 --- a/framework/db/cubrid/QueryBuilder.php +++ b/framework/db/cubrid/QueryBuilder.php @@ -9,7 +9,6 @@ namespace yii\db\cubrid; use yii\base\InvalidArgumentException; use yii\base\NotSupportedException; -use yii\db\Constraint; use yii\db\Exception; use yii\db\Expression; @@ -65,7 +64,6 @@ class QueryBuilder extends \yii\db\QueryBuilder */ public function upsert($table, $insertColumns, $updateColumns, &$params) { - /** @var Constraint[] $constraints */ list($uniqueNames, $insertNames, $updateNames) = $this->prepareUpsertColumns($table, $insertColumns, $updateColumns, $constraints); if (empty($uniqueNames)) { return $this->insert($table, $insertColumns, $params); diff --git a/framework/db/mssql/QueryBuilder.php b/framework/db/mssql/QueryBuilder.php index e14d3653c4..14eaff4828 100644 --- a/framework/db/mssql/QueryBuilder.php +++ b/framework/db/mssql/QueryBuilder.php @@ -9,7 +9,6 @@ namespace yii\db\mssql; use yii\base\InvalidArgumentException; use yii\base\NotSupportedException; -use yii\db\Constraint; use yii\db\Expression; use yii\db\Query; use yii\db\TableSchema; @@ -544,7 +543,6 @@ class QueryBuilder extends \yii\db\QueryBuilder { $insertColumns = $this->normalizeTableRowData($table, $insertColumns, $params); - /** @var Constraint[] $constraints */ list($uniqueNames, $insertNames, $updateNames) = $this->prepareUpsertColumns($table, $insertColumns, $updateColumns, $constraints); if (empty($uniqueNames)) { return $this->insert($table, $insertColumns, $params); diff --git a/framework/db/oci/QueryBuilder.php b/framework/db/oci/QueryBuilder.php index 7f63a5bbcb..56b01dded0 100644 --- a/framework/db/oci/QueryBuilder.php +++ b/framework/db/oci/QueryBuilder.php @@ -9,7 +9,6 @@ namespace yii\db\oci; use yii\base\InvalidArgumentException; use yii\db\Connection; -use yii\db\Constraint; use yii\db\Exception; use yii\db\Expression; use yii\db\Query; @@ -213,7 +212,6 @@ EOD; */ public function upsert($table, $insertColumns, $updateColumns, &$params) { - /** @var Constraint[] $constraints */ list($uniqueNames, $insertNames, $updateNames) = $this->prepareUpsertColumns($table, $insertColumns, $updateColumns, $constraints); if (empty($uniqueNames)) { return $this->insert($table, $insertColumns, $params); diff --git a/framework/db/pgsql/QueryBuilder.php b/framework/db/pgsql/QueryBuilder.php index 48e9ea8671..ada018c209 100644 --- a/framework/db/pgsql/QueryBuilder.php +++ b/framework/db/pgsql/QueryBuilder.php @@ -8,7 +8,6 @@ namespace yii\db\pgsql; use yii\base\InvalidArgumentException; -use yii\db\Constraint; use yii\db\Expression; use yii\db\ExpressionInterface; use yii\db\Query; @@ -368,7 +367,6 @@ class QueryBuilder extends \yii\db\QueryBuilder */ private function oldUpsert($table, $insertColumns, $updateColumns, &$params) { - /** @var Constraint[] $constraints */ list($uniqueNames, $insertNames, $updateNames) = $this->prepareUpsertColumns($table, $insertColumns, $updateColumns, $constraints); if (empty($uniqueNames)) { return $this->insert($table, $insertColumns, $params); diff --git a/framework/db/sqlite/QueryBuilder.php b/framework/db/sqlite/QueryBuilder.php index 18abffa8eb..1e2ee03aed 100644 --- a/framework/db/sqlite/QueryBuilder.php +++ b/framework/db/sqlite/QueryBuilder.php @@ -10,7 +10,6 @@ namespace yii\db\sqlite; use yii\base\InvalidArgumentException; use yii\base\NotSupportedException; use yii\db\Connection; -use yii\db\Constraint; use yii\db\Expression; use yii\db\ExpressionInterface; use yii\db\Query; @@ -69,7 +68,6 @@ class QueryBuilder extends \yii\db\QueryBuilder */ public function upsert($table, $insertColumns, $updateColumns, &$params) { - /** @var Constraint[] $constraints */ list($uniqueNames, $insertNames, $updateNames) = $this->prepareUpsertColumns($table, $insertColumns, $updateColumns, $constraints); if (empty($uniqueNames)) { return $this->insert($table, $insertColumns, $params); diff --git a/framework/helpers/BaseMarkdown.php b/framework/helpers/BaseMarkdown.php index df7e38c78a..2e46482c56 100644 --- a/framework/helpers/BaseMarkdown.php +++ b/framework/helpers/BaseMarkdown.php @@ -95,7 +95,6 @@ class BaseMarkdown if ($flavor === null) { $flavor = static::$defaultFlavor; } - /** @var \cebe\markdown\Markdown $parser */ if (!isset(static::$flavors[$flavor])) { throw new InvalidArgumentException("Markdown flavor '$flavor' is not defined.'"); } elseif (!is_object($config = static::$flavors[$flavor])) {