Completed
Pull Request — 2.1 (#15488)
by Nikolay
37:27
created
framework/base/Security.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
      * Verifies and decrypts data encrypted with [[encryptByPassword()]].
137 137
      * @param string $data the encrypted data to decrypt
138 138
      * @param string $password the password to use for decryption
139
-     * @return bool|string the decrypted data or false on authentication failure
139
+     * @return false|string the decrypted data or false on authentication failure
140 140
      * @see encryptByPassword()
141 141
      */
142 142
     public function decryptByPassword($data, $password)
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
149 149
      * @param string $data the encrypted data to decrypt
150 150
      * @param string $inputKey the input to use for encryption and authentication
151 151
      * @param string $info optional context and application specific information, see [[hkdf()]]
152
-     * @return bool|string the decrypted data or false on authentication failure
152
+     * @return false|string the decrypted data or false on authentication failure
153 153
      * @see encryptByKey()
154 154
      */
155 155
     public function decryptByKey($data, $inputKey, $info = null)
@@ -216,7 +216,7 @@  discard block
 block discarded – undo
216 216
      * @param string $secret the decryption password or key
217 217
      * @param string|null $info context/application specific information, @see encrypt()
218 218
      *
219
-     * @return bool|string the decrypted data or false on authentication failure
219
+     * @return false|string the decrypted data or false on authentication failure
220 220
      * @throws InvalidConfigException on OpenSSL not loaded
221 221
      * @throws Exception on OpenSSL error
222 222
      * @see encrypt()
Please login to merge, or discard this patch.
framework/console/controllers/BaseMigrateController.php 1 patch
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -204,7 +204,7 @@  discard block
 block discarded – undo
204 204
      * yii migrate/down all # revert all migrations
205 205
      * ```
206 206
      *
207
-     * @param int|string $limit the number of migrations to be reverted. Defaults to 1,
207
+     * @param integer $limit the number of migrations to be reverted. Defaults to 1,
208 208
      * meaning the last applied migration will be reverted. When value is "all", all migrations will be reverted.
209 209
      * @throws Exception if the number of the steps specified is less than 1.
210 210
      *
@@ -266,7 +266,7 @@  discard block
 block discarded – undo
266 266
      * yii migrate/redo all # redo all migrations
267 267
      * ```
268 268
      *
269
-     * @param int|string $limit the number of migrations to be redone. Defaults to 1,
269
+     * @param integer $limit the number of migrations to be redone. Defaults to 1,
270 270
      * meaning the last applied migration will be redone. When equals "all", all migrations will be redone.
271 271
      * @throws Exception if the number of the steps specified is less than 1.
272 272
      *
@@ -463,7 +463,7 @@  discard block
 block discarded – undo
463 463
      * yii migrate/history all # showing the whole history
464 464
      * ```
465 465
      *
466
-     * @param int|string $limit the maximum number of migrations to be displayed.
466
+     * @param integer $limit the maximum number of migrations to be displayed.
467 467
      * If it is "all", the whole migration history will be displayed.
468 468
      * @throws \yii\console\Exception if invalid limit value passed
469 469
      */
@@ -507,7 +507,7 @@  discard block
 block discarded – undo
507 507
      * yii migrate/new all # showing all new migrations
508 508
      * ```
509 509
      *
510
-     * @param int|string $limit the maximum number of new migrations to be displayed.
510
+     * @param integer $limit the maximum number of new migrations to be displayed.
511 511
      * If it is `all`, all available new migrations will be displayed.
512 512
      * @throws \yii\console\Exception if invalid limit value passed
513 513
      */
Please login to merge, or discard this patch.
framework/db/pgsql/Schema.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -266,7 +266,7 @@
 block discarded – undo
266 266
     /**
267 267
      * Loads the column information into a [[ColumnSchema]] object.
268 268
      * @param array $info column information
269
-     * @return ColumnSchema the column schema object
269
+     * @return \yii\db\ColumnSchema the column schema object
270 270
      */
271 271
     protected function loadColumnSchema($info)
272 272
     {
Please login to merge, or discard this patch.
framework/base/Application.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -530,7 +530,7 @@
 block discarded – undo
530 530
 
531 531
     /**
532 532
      * Returns the request component.
533
-     * @return \yii\web\Request|\yii\console\Request the request component.
533
+     * @return Request the request component.
534 534
      */
535 535
     public function getRequest()
536 536
     {
Please login to merge, or discard this patch.
framework/db/Command.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -242,7 +242,7 @@  discard block
 block discarded – undo
242 242
 
243 243
     /**
244 244
      * Binds a parameter to the SQL statement to be executed.
245
-     * @param string|int $name parameter identifier. For a prepared statement
245
+     * @param string $name parameter identifier. For a prepared statement
246 246
      * using named placeholders, this will be a parameter name of
247 247
      * the form `:name`. For a prepared statement using question mark
248 248
      * placeholders, this will be the 1-indexed position of the parameter.
@@ -379,7 +379,7 @@  discard block
 block discarded – undo
379 379
     /**
380 380
      * Executes the SQL statement and returns the value of the first column in the first row of data.
381 381
      * This method is best used when only a single value is needed for a query.
382
-     * @return string|null|false the value of the first column in the first row of the query result.
382
+     * @return string the value of the first column in the first row of the query result.
383 383
      * False is returned if there is no value.
384 384
      * @throws Exception execution failed
385 385
      */
Please login to merge, or discard this patch.
framework/web/CacheSession.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -113,7 +113,7 @@
 block discarded – undo
113 113
     /**
114 114
      * Generates a unique key used for storing session data in cache.
115 115
      * @param string $id session variable name
116
-     * @return mixed a safe cache key associated with the session variable name
116
+     * @return string[] a safe cache key associated with the session variable name
117 117
      */
118 118
     protected function calculateKey($id)
119 119
     {
Please login to merge, or discard this patch.
framework/caching/TagDependency.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -69,7 +69,7 @@
 block discarded – undo
69 69
     /**
70 70
      * Invalidates all of the cached data items that are associated with any of the specified [[tags]].
71 71
      * @param \Psr\SimpleCache\CacheInterface $cache the cache component that caches the data items
72
-     * @param string|array $tags
72
+     * @param string $tags
73 73
      */
74 74
     public static function invalidate($cache, $tags)
75 75
     {
Please login to merge, or discard this patch.
framework/console/controllers/MessageController.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -622,7 +622,7 @@
 block discarded – undo
622 622
      * Finds out a line of the first non-char PHP token found.
623 623
      *
624 624
      * @param array $tokens
625
-     * @return int|string
625
+     * @return string
626 626
      * @since 2.0.1
627 627
      */
628 628
     protected function getLine($tokens)
Please login to merge, or discard this patch.
framework/i18n/MessageFormatter.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@
 block discarded – undo
52 52
     /**
53 53
      * Get the error code from the last operation.
54 54
      * @link http://php.net/manual/en/messageformatter.geterrorcode.php
55
-     * @return string Code of the last error.
55
+     * @return integer Code of the last error.
56 56
      */
57 57
     public function getErrorCode()
58 58
     {
Please login to merge, or discard this patch.