Completed
Pull Request — 2.1 (#14036)
by Angel
21:16 queued 12:09
created
framework/base/Security.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
      * Verifies and decrypts data encrypted with [[encryptByPassword()]].
133 133
      * @param string $data the encrypted data to decrypt
134 134
      * @param string $password the password to use for decryption
135
-     * @return bool|string the decrypted data or false on authentication failure
135
+     * @return false|string the decrypted data or false on authentication failure
136 136
      * @see encryptByPassword()
137 137
      */
138 138
     public function decryptByPassword($data, $password)
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
      * @param string $data the encrypted data to decrypt
146 146
      * @param string $inputKey the input to use for encryption and authentication
147 147
      * @param string $info optional context and application specific information, see [[hkdf()]]
148
-     * @return bool|string the decrypted data or false on authentication failure
148
+     * @return false|string the decrypted data or false on authentication failure
149 149
      * @see encryptByKey()
150 150
      */
151 151
     public function decryptByKey($data, $inputKey, $info = null)
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
212 212
      * @param string $secret the decryption password or key
213 213
      * @param string $info context/application specific information, @see encrypt()
214 214
      *
215
-     * @return bool|string the decrypted data or false on authentication failure
215
+     * @return false|string the decrypted data or false on authentication failure
216 216
      * @throws InvalidConfigException on OpenSSL not loaded
217 217
      * @throws Exception on OpenSSL error
218 218
      * @see encrypt()
Please login to merge, or discard this patch.
build/controllers/PhpDocController.php 1 patch
Doc Comments   +20 added lines, -2 removed lines patch added patch discarded remove patch
@@ -114,6 +114,9 @@  discard block
 block discarded – undo
114 114
         return array_merge(parent::options($actionID), ['updateFiles', 'skipFrameworkRequirements']);
115 115
     }
116 116
 
117
+    /**
118
+     * @param string|null $root
119
+     */
117 120
     protected function findFiles($root, $needsInclude = true)
118 121
     {
119 122
         $except = [];
@@ -237,6 +240,9 @@  discard block
 block discarded – undo
237 240
         return FileHelper::findFiles($root, $options);
238 241
     }
239 242
 
243
+    /**
244
+     * @param string $extensionPath
245
+     */
240 246
     private function setUpExtensionAliases($extensionPath)
241 247
     {
242 248
         foreach (scandir($extensionPath) as $extension) {
@@ -344,6 +350,9 @@  discard block
 block discarded – undo
344 350
         }
345 351
     }
346 352
 
353
+    /**
354
+     * @param string $line
355
+     */
347 356
     protected function fixParamTypes($line)
348 357
     {
349 358
         return preg_replace_callback('~@(param|return) ([\w\\|]+)~i', function($matches) {
@@ -558,7 +567,7 @@  discard block
 block discarded – undo
558 567
     /**
559 568
      * remove multi empty lines and trim trailing whitespace
560 569
      *
561
-     * @param $doc
570
+     * @param string $doc
562 571
      * @return string
563 572
      */
564 573
     protected function cleanDocComment($doc)
@@ -577,7 +586,7 @@  discard block
 block discarded – undo
577 586
 
578 587
     /**
579 588
      * Replace property annotations in doc comment
580
-     * @param $doc
589
+     * @param string $doc
581 590
      * @param $properties
582 591
      * @return string
583 592
      */
@@ -745,6 +754,9 @@  discard block
 block discarded – undo
745 754
         return [$className, $phpdoc];
746 755
     }
747 756
 
757
+    /**
758
+     * @param string $pattern
759
+     */
748 760
     protected function match($pattern, $subject, $split = false)
749 761
     {
750 762
         $sets = [];
@@ -766,6 +778,9 @@  discard block
 block discarded – undo
766 778
         return $sets;
767 779
     }
768 780
 
781
+    /**
782
+     * @param string $str
783
+     */
769 784
     protected function fixSentence($str)
770 785
     {
771 786
         // TODO fix word wrap
@@ -774,6 +789,9 @@  discard block
 block discarded – undo
774 789
         return strtoupper(substr($str, 0, 1)) . substr($str, 1) . ($str[strlen($str) - 1] != '.' ? '.' : '');
775 790
     }
776 791
 
792
+    /**
793
+     * @param string $param
794
+     */
777 795
     protected function getPropParam($prop, $param)
778 796
     {
779 797
         return isset($prop['property']) ? $prop['property'][$param] : (isset($prop['get']) ? $prop['get'][$param] : $prop['set'][$param]);
Please login to merge, or discard this patch.
build/controllers/ReleaseController.php 1 patch
Doc Comments   +21 added lines, -1 removed lines patch added patch discarded remove patch
@@ -367,7 +367,7 @@  discard block
 block discarded – undo
367 367
 
368 368
     /**
369 369
      * @param array $what list of items
370
-     * @param array $limit list of things to allow, or empty to allow any, can be `app`, `framework`, `extension`
370
+     * @param string[] $limit list of things to allow, or empty to allow any, can be `app`, `framework`, `extension`
371 371
      * @throws \yii\base\Exception
372 372
      */
373 373
     protected function validateWhat(array $what, $limit = [], $ensureGitClean = true)
@@ -547,6 +547,10 @@  discard block
 block discarded – undo
547 547
 
548 548
     }
549 549
 
550
+    /**
551
+     * @param string $name
552
+     * @param string $path
553
+     */
550 554
     protected function releaseApplication($name, $path, $version)
551 555
     {
552 556
         $this->stdout("\n");
@@ -649,6 +653,9 @@  discard block
 block discarded – undo
649 653
         Yii::setAlias('@app', $this->_oldAlias);
650 654
     }
651 655
 
656
+    /**
657
+     * @param string $name
658
+     */
652 659
     protected function packageApplication($name, $version, $packagePath)
653 660
     {
654 661
         FileHelper::createDirectory($packagePath);
@@ -810,6 +817,9 @@  discard block
 block discarded – undo
810 817
     }
811 818
 
812 819
 
820
+    /**
821
+     * @param string[] $what
822
+     */
813 823
     protected function closeChangelogs($what, $version)
814 824
     {
815 825
         $v = str_replace('\\-', '[\\- ]', preg_quote($version, '/'));
@@ -821,6 +831,9 @@  discard block
 block discarded – undo
821 831
         );
822 832
     }
823 833
 
834
+    /**
835
+     * @param string[] $what
836
+     */
824 837
     protected function openChangelogs($what, $version)
825 838
     {
826 839
         $headline = "\n$version under development\n";
@@ -882,6 +895,7 @@  discard block
 block discarded – undo
882 895
 
883 896
     /**
884 897
      * Ensure sorting of the changelog lines
898
+     * @param string[] $changelog
885 899
      */
886 900
     protected function resortChangelog($changelog)
887 901
     {
@@ -977,6 +991,9 @@  discard block
 block discarded – undo
977 991
             $frameworkPath . '/BaseYii.php');
978 992
     }
979 993
 
994
+    /**
995
+     * @param string $pattern
996
+     */
980 997
     protected function sed($pattern, $replace, $files)
981 998
     {
982 999
         foreach ((array) $files as $file) {
@@ -1009,6 +1026,9 @@  discard block
 block discarded – undo
1009 1026
     const MINOR = 'minor';
1010 1027
     const PATCH = 'patch';
1011 1028
 
1029
+    /**
1030
+     * @param string $type
1031
+     */
1012 1032
     protected function getNextVersions(array $versions, $type)
1013 1033
     {
1014 1034
         foreach ($versions as $k => $v) {
Please login to merge, or discard this patch.
framework/db/mysql/QueryBuilder.php 1 patch
Doc Comments   +2 added lines patch added patch discarded remove patch
@@ -251,6 +251,7 @@  discard block
 block discarded – undo
251 251
     /**
252 252
      * @inheritdoc
253 253
      * @since 2.0.8
254
+     * @param string $comment
254 255
      */
255 256
     public function addCommentOnColumn($table, $column, $comment)
256 257
     {
@@ -267,6 +268,7 @@  discard block
 block discarded – undo
267 268
     /**
268 269
      * @inheritdoc
269 270
      * @since 2.0.8
271
+     * @param string $comment
270 272
      */
271 273
     public function addCommentOnTable($table, $comment)
272 274
     {
Please login to merge, or discard this patch.
framework/widgets/FragmentCache.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -132,7 +132,7 @@
 block discarded – undo
132 132
 
133 133
     /**
134 134
      * Returns the cached content if available.
135
-     * @return string|false the cached content. False is returned if valid content is not found in the cache.
135
+     * @return string|boolean the cached content. False is returned if valid content is not found in the cache.
136 136
      */
137 137
     public function getCachedContent()
138 138
     {
Please login to merge, or discard this patch.