Completed
Pull Request — master (#15633)
by Brandon
12:39
created
framework/db/TableSchema.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -73,7 +73,7 @@
 block discarded – undo
73 73
 
74 74
     /**
75 75
      * Returns the names of all columns in this table.
76
-     * @return array list of column names
76
+     * @return integer[] list of column names
77 77
      */
78 78
     public function getColumnNames()
79 79
     {
Please login to merge, or discard this patch.
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.