Completed
Push — master ( eb6e2f...2ffbee )
by recca
04:40
created
lib/elFinderSession.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -172,6 +172,9 @@
 block discarded – undo
172 172
         return $this;
173 173
     }
174 174
 
175
+    /**
176
+     * @param string $key
177
+     */
175 178
     protected function &getSessionRef($key)
176 179
     {
177 180
         $session = null;
Please login to merge, or discard this patch.
lib/elFinderVolumeDriver.class.php 1 patch
Doc Comments   +15 added lines, -14 removed lines patch added patch discarded remove patch
@@ -1831,7 +1831,6 @@  discard block
 block discarded – undo
1831 1831
      *
1832 1832
      * @param  string    $hash   directory hash
1833 1833
      * @param  bool|null $lineal only lineal parents
1834
-     * @param  string    $until  hash that is enough to that extent >= 2.1.24
1835 1834
      * @return array
1836 1835
      * @author Dmitry (dio) Levashov
1837 1836
      **/
@@ -2446,7 +2445,7 @@  discard block
 block discarded – undo
2446 2445
      * Return file contents.
2447 2446
      *
2448 2447
      * @param  string  $hash  file hash
2449
-     * @return string|false
2448
+     * @return boolean|string
2450 2449
      * @author Dmitry (dio) Levashov
2451 2450
      **/
2452 2451
     public function getContents($hash)
@@ -2764,7 +2763,7 @@  discard block
 block discarded – undo
2764 2763
      *
2765 2764
      * @param  string $q search string
2766 2765
      * @param  array $mimes
2767
-     * @param null $hash
2766
+     * @param string|null $hash
2768 2767
      * @return array
2769 2768
      * @author Dmitry (dio) Levashov
2770 2769
      */
@@ -3592,7 +3591,8 @@  discard block
 block discarded – undo
3592 3591
      * Not implemented.
3593 3592
      *
3594 3593
      * @param  string  path
3595
-     * @return mixed
3594
+     * @param string $path
3595
+     * @return string
3596 3596
      * @author Dmitry (dio) Levashov
3597 3597
      **/
3598 3598
     protected function crypt($path)
@@ -3605,7 +3605,8 @@  discard block
 block discarded – undo
3605 3605
      * Not implemented.
3606 3606
      *
3607 3607
      * @param  mixed  hash
3608
-     * @return mixed
3608
+     * @param string $hash
3609
+     * @return string
3609 3610
      * @author Dmitry (dio) Levashov
3610 3611
      **/
3611 3612
     protected function uncrypt($hash)
@@ -3657,7 +3658,7 @@  discard block
 block discarded – undo
3657 3658
      * @param  string $from from character encoding
3658 3659
      * @param  string $to to character encoding
3659 3660
      * @param  string $locale local locale
3660
-     * @param $restoreLocale
3661
+     * @param boolean $restoreLocale
3661 3662
      * @param  string $unknown replaces character for unknown
3662 3663
      * @return mixed
3663 3664
      */
@@ -3910,7 +3911,7 @@  discard block
 block discarded – undo
3910 3911
      *
3911 3912
      * @param string $dir parent dir path
3912 3913
      * @param string $name new file name
3913
-     * @param null $isDir
3914
+     * @param boolean $isDir
3914 3915
      * @return bool
3915 3916
      * @author Dmitry (dio) Levashov
3916 3917
      */
@@ -4634,7 +4635,7 @@  discard block
 block discarded – undo
4634 4635
      * @param  string  $src   source path
4635 4636
      * @param  string  $dst   destination dir path
4636 4637
      * @param  string  $name  new file name (optionaly)
4637
-     * @return string|false
4638
+     * @return string
4638 4639
      * @author Dmitry (dio) Levashov
4639 4640
      **/
4640 4641
     protected function copy($src, $dst, $name)
@@ -4710,7 +4711,7 @@  discard block
 block discarded – undo
4710 4711
      * @param  string  $src   source path
4711 4712
      * @param  string  $dst   destination dir path
4712 4713
      * @param  string  $name  new file name
4713
-     * @return string|false
4714
+     * @return string|boolean
4714 4715
      * @author Dmitry (dio) Levashov
4715 4716
      **/
4716 4717
     protected function move($src, $dst, $name)
@@ -4740,7 +4741,7 @@  discard block
 block discarded – undo
4740 4741
      * @param  string  $src          source file hash
4741 4742
      * @param  string  $destination  destination dir path
4742 4743
      * @param  string  $name         file name
4743
-     * @return string|false
4744
+     * @return string
4744 4745
      * @author Dmitry (dio) Levashov
4745 4746
      **/
4746 4747
     protected function copyFrom($volume, $src, $destination, $name)
@@ -5371,8 +5372,8 @@  discard block
 block discarded – undo
5371 5372
      * @param  string $path image file
5372 5373
      * @param  int $width square width
5373 5374
      * @param  int $height square height
5374
-     * @param int|string $align reserved
5375
-     * @param int|string $valign reserved
5375
+     * @param string $align reserved
5376
+     * @param string $valign reserved
5376 5377
      * @param  string $bgcolor square background color in #rrggbb format
5377 5378
      * @param  string $destformat image destination format
5378 5379
      * @param  int $jpgQuality JEPG quality (1-100)
@@ -5642,7 +5643,7 @@  discard block
 block discarded – undo
5642 5643
      *
5643 5644
      * @param  string $command command line
5644 5645
      * @param  array $output stdout strings
5645
-     * @param array|int $return_var process exit code
5646
+     * @param integer $return_var process exit code
5646 5647
      * @param  array $error_output stderr strings
5647 5648
      * @return int exit code
5648 5649
      * @author Alexey Sukhotin
@@ -6146,7 +6147,7 @@  discard block
 block discarded – undo
6146 6147
      * @param  array   $files  files names list
6147 6148
      * @param  string  $name   archive name
6148 6149
      * @param  array   $arc    archiver options
6149
-     * @return string|bool
6150
+     * @return false|string
6150 6151
      * @author Dmitry (dio) Levashov,
6151 6152
      * @author Alexey Sukhotin
6152 6153
      * @author Naoki Sawada
Please login to merge, or discard this patch.
lib/elFinderVolumeDropbox.class.php 1 patch
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -725,7 +725,7 @@  discard block
 block discarded – undo
725 725
      * @param  string  $src   source path
726 726
      * @param  string  $dst   destination dir path
727 727
      * @param  string  $name  new file name (optionaly)
728
-     * @return string|false
728
+     * @return string|boolean
729 729
      * @author Dmitry (dio) Levashov
730 730
      * @author Naoki Sawada
731 731
      **/
@@ -1119,7 +1119,7 @@  discard block
 block discarded – undo
1119 1119
      *
1120 1120
      * @param  resource $fp file pointer
1121 1121
      * @param string $path
1122
-     * @return bool
1122
+     * @return boolean|null
1123 1123
      * @author Dmitry (dio) Levashov
1124 1124
      */
1125 1125
     protected function _fclose($fp, $path = '')
@@ -1324,7 +1324,7 @@  discard block
 block discarded – undo
1324 1324
      *
1325 1325
      * @param  string  $path     file path
1326 1326
      * @param  string  $content  new file content
1327
-     * @return bool
1327
+     * @return boolean|string
1328 1328
      * @author Dmitry (dio) Levashov
1329 1329
      **/
1330 1330
     protected function _filePutContents($path, $content)
@@ -1386,7 +1386,7 @@  discard block
 block discarded – undo
1386 1386
      * Recursive symlinks search.
1387 1387
      *
1388 1388
      * @param  string  $path  file/dir path
1389
-     * @return bool
1389
+     * @return boolean|null
1390 1390
      * @author Dmitry (dio) Levashov
1391 1391
      **/
1392 1392
     protected function _findSymlinks($path)
Please login to merge, or discard this patch.
lib/elFinderVolumeFTP.class.php 1 patch
Doc Comments   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -573,7 +573,7 @@  discard block
 block discarded – undo
573 573
      * Return ftp transfer mode for file.
574 574
      *
575 575
      * @param  string  $path  file path
576
-     * @return string
576
+     * @return integer
577 577
      * @author Dmitry (dio) Levashov
578 578
      **/
579 579
     protected function ftpMode($path)
@@ -764,7 +764,7 @@  discard block
 block discarded – undo
764 764
      * If file does not exists - returns empty array or false.
765 765
      *
766 766
      * @param  string  $path    file path
767
-     * @return array|false
767
+     * @return string
768 768
      * @author Dmitry (dio) Levashov
769 769
      **/
770 770
     protected function _stat($path)
@@ -1048,7 +1048,7 @@  discard block
 block discarded – undo
1048 1048
      *
1049 1049
      * @param  resource $fp file pointer
1050 1050
      * @param string $path
1051
-     * @return bool
1051
+     * @return boolean|null
1052 1052
      * @author Dmitry (dio) Levashov
1053 1053
      */
1054 1054
     protected function _fclose($fp, $path = '')
@@ -1066,7 +1066,7 @@  discard block
 block discarded – undo
1066 1066
      *
1067 1067
      * @param  string  $path  parent dir path
1068 1068
      * @param string  $name  new directory name
1069
-     * @return string|bool
1069
+     * @return false|string
1070 1070
      * @author Dmitry (dio) Levashov
1071 1071
      **/
1072 1072
     protected function _mkdir($path, $name)
@@ -1086,7 +1086,7 @@  discard block
 block discarded – undo
1086 1086
      *
1087 1087
      * @param  string  $path  parent dir path
1088 1088
      * @param string  $name  new file name
1089
-     * @return string|bool
1089
+     * @return string|false
1090 1090
      * @author Dmitry (dio) Levashov
1091 1091
      **/
1092 1092
     protected function _mkfile($path, $name)
@@ -1123,7 +1123,7 @@  discard block
 block discarded – undo
1123 1123
      * @param  string  $source     source file path
1124 1124
      * @param  string  $targetDir  target directory path
1125 1125
      * @param  string  $name       new file name
1126
-     * @return bool
1126
+     * @return string|false
1127 1127
      * @author Dmitry (dio) Levashov
1128 1128
      **/
1129 1129
     protected function _copy($source, $targetDir, $name)
@@ -1151,7 +1151,7 @@  discard block
 block discarded – undo
1151 1151
      * @param  string $source source file path
1152 1152
      * @param $targetDir
1153 1153
      * @param  string $name file name
1154
-     * @return bool|string
1154
+     * @return string|false
1155 1155
      * @internal param string $target target dir path
1156 1156
      * @author Dmitry (dio) Levashov
1157 1157
      */
@@ -1194,7 +1194,7 @@  discard block
 block discarded – undo
1194 1194
      * @param  string    $dir  target dir path
1195 1195
      * @param  string    $name file name
1196 1196
      * @param  array     $stat file stat (required by some virtual fs)
1197
-     * @return bool|string
1197
+     * @return string|false
1198 1198
      * @author Dmitry (dio) Levashov
1199 1199
      **/
1200 1200
     protected function _save($fp, $dir, $name, $stat)
@@ -1270,7 +1270,7 @@  discard block
 block discarded – undo
1270 1270
      *
1271 1271
      * @param string $path
1272 1272
      * @param string $mode
1273
-     * @return bool
1273
+     * @return integer
1274 1274
      */
1275 1275
     protected function _chmod($path, $mode)
1276 1276
     {
@@ -1283,7 +1283,7 @@  discard block
 block discarded – undo
1283 1283
      * Recursive symlinks search.
1284 1284
      *
1285 1285
      * @param  string  $path  file/dir path
1286
-     * @return bool
1286
+     * @return boolean|null
1287 1287
      * @author Dmitry (dio) Levashov
1288 1288
      **/
1289 1289
     protected function _findSymlinks($path)
@@ -1462,7 +1462,7 @@  discard block
 block discarded – undo
1462 1462
      * @param  array   $files  files names list
1463 1463
      * @param  string  $name   archive name
1464 1464
      * @param  array   $arc    archiver options
1465
-     * @return string|bool
1465
+     * @return false|string
1466 1466
      * @author Dmitry (dio) Levashov,
1467 1467
      * @author Alexey Sukhotin
1468 1468
      **/
@@ -1587,9 +1587,9 @@  discard block
 block discarded – undo
1587 1587
      * Downloads specified files from remote directory
1588 1588
      * if there is a directory among files it is downloaded recursively (omitting symbolic links).
1589 1589
      *
1590
-     * @param $remote_directory string remote FTP path to a source directory to download from.
1590
+     * @param string $remote_directory string remote FTP path to a source directory to download from.
1591 1591
      * @param array $files list of files to download from remote directory.
1592
-     * @param $dest_local_directory string destination folder to store downloaded files.
1592
+     * @param string $dest_local_directory string destination folder to store downloaded files.
1593 1593
      * @return bool true on success and false on failure.
1594 1594
      */
1595 1595
     private function ftp_download_files($remote_directory, array $files, $dest_local_directory)
@@ -1664,7 +1664,7 @@  discard block
 block discarded – undo
1664 1664
     /**
1665 1665
      * Returns array of strings containing all files and folders in the specified local directory.
1666 1666
      * @param $dir
1667
-     * @param $omitSymlinks
1667
+     * @param boolean $omitSymlinks
1668 1668
      * @param string $prefix
1669 1669
      * @return array array of files and folders names relative to the $path
1670 1670
      * or an empty array if the directory $path is empty,
Please login to merge, or discard this patch.
lib/elFinderVolumeLocalFileSystem.class.php 1 patch
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -828,7 +828,7 @@  discard block
 block discarded – undo
828 828
      *
829 829
      * @param  string  $path  parent dir path
830 830
      * @param string  $name  new directory name
831
-     * @return string|bool
831
+     * @return string|false
832 832
      * @author Dmitry (dio) Levashov
833 833
      **/
834 834
     protected function _mkdir($path, $name)
@@ -850,7 +850,7 @@  discard block
 block discarded – undo
850 850
      *
851 851
      * @param  string  $path  parent dir path
852 852
      * @param string  $name  new file name
853
-     * @return string|bool
853
+     * @return string|false
854 854
      * @author Dmitry (dio) Levashov
855 855
      **/
856 856
     protected function _mkfile($path, $name)
@@ -910,7 +910,7 @@  discard block
 block discarded – undo
910 910
      * @param  string $source source file path
911 911
      * @param $targetDir
912 912
      * @param  string $name file name
913
-     * @return bool|string
913
+     * @return string|false
914 914
      * @internal param string $target target dir path
915 915
      * @author Dmitry (dio) Levashov
916 916
      */
@@ -1196,7 +1196,7 @@  discard block
 block discarded – undo
1196 1196
      * @param  array   $files  files names list
1197 1197
      * @param  string  $name   archive name
1198 1198
      * @param  array   $arc    archiver options
1199
-     * @return string|bool
1199
+     * @return false|string
1200 1200
      * @author Dmitry (dio) Levashov,
1201 1201
      * @author Alexey Sukhotin
1202 1202
      **/
Please login to merge, or discard this patch.
lib/elFinderVolumeMySQL.class.php 1 patch
Doc Comments   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -654,7 +654,7 @@  discard block
 block discarded – undo
654 654
      *
655 655
      * @param  resource $fp file pointer
656 656
      * @param string $path
657
-     * @return bool
657
+     * @return boolean|null
658 658
      * @author Dmitry (dio) Levashov
659 659
      */
660 660
     protected function _fclose($fp, $path = '')
@@ -672,7 +672,7 @@  discard block
 block discarded – undo
672 672
      *
673 673
      * @param  string  $path  parent dir path
674 674
      * @param string  $name  new directory name
675
-     * @return string|bool
675
+     * @return string|false
676 676
      * @author Dmitry (dio) Levashov
677 677
      **/
678 678
     protected function _mkdir($path, $name)
@@ -685,7 +685,7 @@  discard block
 block discarded – undo
685 685
      *
686 686
      * @param  string  $path  parent dir path
687 687
      * @param string  $name  new file name
688
-     * @return string|bool
688
+     * @return string|false
689 689
      * @author Dmitry (dio) Levashov
690 690
      **/
691 691
     protected function _mkfile($path, $name)
@@ -735,7 +735,7 @@  discard block
 block discarded – undo
735 735
      * @param  string $source source file path
736 736
      * @param $targetDir
737 737
      * @param  string $name file name
738
-     * @return bool|string
738
+     * @return string|false
739 739
      * @internal param string $target target dir path
740 740
      * @author Dmitry (dio) Levashov
741 741
      */
@@ -929,7 +929,7 @@  discard block
 block discarded – undo
929 929
      *
930 930
      * @param  string  $path  archive path
931 931
      * @param  array   $arc   archiver command and arguments (same as in $this->archivers)
932
-     * @return true
932
+     * @return boolean
933 933
      * @author Dmitry (dio) Levashov,
934 934
      * @author Alexey Sukhotin
935 935
      **/
Please login to merge, or discard this patch.