Completed
Pull Request — stable7 (#24167)
by Lukas
07:55
created
lib/private/appframework/middleware/middlewaredispatcher.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@
 block discarded – undo
56 56
 
57 57
 	/**
58 58
 	 * Adds a new middleware
59
-	 * @param Middleware $middleWare the middleware which will be added
59
+	 * @param \OCP\AppFramework\Middleware $middleWare the middleware which will be added
60 60
 	 */
61 61
 	public function registerMiddleware(Middleware $middleWare){
62 62
 		array_push($this->middlewares, $middleWare);
Please login to merge, or discard this patch.
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -26,7 +26,6 @@
 block discarded – undo
26 26
 
27 27
 use OCP\AppFramework\Controller;
28 28
 use OCP\AppFramework\Http\Response;
29
-use OCP\AppFramework\MiddleWare;
30 29
 
31 30
 /**
32 31
  * This class is used to store and run all the middleware in correct order
Please login to merge, or discard this patch.
lib/private/avatar.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@
 block discarded – undo
44 44
 
45 45
 	/**
46 46
 	 * sets the users avatar
47
-	 * @param \OC_Image|resource|string $data OC_Image, imagedata or path to set a new avatar
47
+	 * @param string $data OC_Image, imagedata or path to set a new avatar
48 48
 	 * @throws Exception if the provided file is not a jpg or png image
49 49
 	 * @throws Exception if the provided image is not valid
50 50
 	 * @throws \OC\NotSquareException if the image is not square
Please login to merge, or discard this patch.
lib/private/connector/sabre/objecttree.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@
 block discarded – undo
35 35
 	}
36 36
 
37 37
 	/**
38
-	 * @param \Sabre\DAV\ICollection $rootNode
38
+	 * @param \OC_Connector_Sabre_Directory $rootNode
39 39
 	 * @param \OC\Files\View $view
40 40
 	 * @param \OC\Files\Mount\Manager $mountManager
41 41
 	 */
Please login to merge, or discard this patch.
lib/private/db.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -248,7 +248,7 @@  discard block
 block discarded – undo
248 248
 	/**
249 249
 	 * gets last value of autoincrement
250 250
 	 * @param string $table The optional table name (will replace *PREFIX*) and add sequence suffix
251
-	 * @return string id
251
+	 * @return integer id
252 252
 	 * @throws DatabaseException
253 253
 	 *
254 254
 	 * \Doctrine\DBAL\Connection lastInsertId
@@ -265,7 +265,7 @@  discard block
 block discarded – undo
265 265
 	 * Insert a row if a matching row doesn't exists.
266 266
 	 * @param string $table The table to insert into in the form '*PREFIX*tableName'
267 267
 	 * @param array $input An array of fieldname/value pairs
268
-	 * @return boolean number of updated rows
268
+	 * @return integer|null number of updated rows
269 269
 	 */
270 270
 	public static function insertIfNotExist($table, $input) {
271 271
 		self::connect();
@@ -335,7 +335,7 @@  discard block
 block discarded – undo
335 335
 	 * simulate the database schema update
336 336
 	 * @param string $file file to read structure from
337 337
 	 * @throws Exception
338
-	 * @return string|boolean
338
+	 * @return boolean
339 339
 	 */
340 340
 	public static function simulateUpdateDbFromStructure($file) {
341 341
 		$schemaManager = self::getMDB2SchemaManager();
Please login to merge, or discard this patch.
lib/private/db/connection.php 1 patch
Doc Comments   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
 	 * columns or sequences.
146 146
 	 *
147 147
 	 * @param string $seqName Name of the sequence object from which the ID should be returned.
148
-	 * @return string A string representation of the last inserted ID.
148
+	 * @return integer A string representation of the last inserted ID.
149 149
 	 */
150 150
 	public function lastInsertId($seqName = null)
151 151
 	{
@@ -165,7 +165,8 @@  discard block
 block discarded – undo
165 165
 	 * Insert a row if a matching row doesn't exists.
166 166
 	 * @param string $table. The table to insert into in the form '*PREFIX*tableName'
167 167
 	 * @param array $input. An array of fieldname/value pairs
168
-	 * @return bool The return value from execute()
168
+	 * @param string $table
169
+	 * @return integer|null The return value from execute()
169 170
 	 */
170 171
 	public function insertIfNotExist($table, $input) {
171 172
 		return $this->adapter->insertIfNotExist($table, $input);
Please login to merge, or discard this patch.
lib/private/db/connectionwrapper.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
 	/**
33 33
 	 * Used to get the id of the just inserted element
34 34
 	 * @param string $table the name of the table where we inserted the item
35
-	 * @return string the id of the inserted element
35
+	 * @return integer the id of the inserted element
36 36
 	 */
37 37
 	public function lastInsertId($table = null)
38 38
 	{
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 	 *    'family' => array ('value' => 'Stefanov'),
54 54
 	 *    'birth_date' => array ('value' => '1975-06-20')
55 55
 	 *    );
56
-	 * @return bool
56
+	 * @return integer|null
57 57
 	 *
58 58
 	 */
59 59
 	public function insertIfNotExist($table, $input)
Please login to merge, or discard this patch.
lib/private/db/mdb2schemamanager.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -107,7 +107,7 @@
 block discarded – undo
107 107
 	/**
108 108
 	 * update the database scheme
109 109
 	 * @param string $file file to read structure from
110
-	 * @return string|boolean
110
+	 * @return boolean
111 111
 	 */
112 112
 	public function simulateUpdateDbFromStructure($file) {
113 113
 		$toSchema = $this->readSchemaFromFile($file);
Please login to merge, or discard this patch.
lib/private/db/sqlitemigrator.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
 	protected $config;
53 53
 
54 54
 	/**
55
-	 * @param \Doctrine\DBAL\Connection $connection
55
+	 * @param Connection $connection
56 56
 	 * @param ISecureRandom $random
57 57
 	 * @param IConfig $config
58 58
 	 */
Please login to merge, or discard this patch.
lib/private/files/filesystem.php 1 patch
Doc Comments   +55 added lines patch added patch discarded remove patch
@@ -172,6 +172,7 @@  discard block
 block discarded – undo
172 172
 
173 173
 	/**
174 174
 	 * @param callable $wrapper
175
+	 * @param string $wrapperName
175 176
 	 */
176 177
 	public static function addStorageWrapper($wrapperName, $wrapper) {
177 178
 		self::getLoader()->addStorageWrapper($wrapperName, $wrapper);
@@ -289,6 +290,9 @@  discard block
 block discarded – undo
289 290
 		}
290 291
 	}
291 292
 
293
+	/**
294
+	 * @param string $root
295
+	 */
292 296
 	static public function init($user, $root) {
293 297
 		if (self::$defaultInstance) {
294 298
 			return false;
@@ -545,11 +549,15 @@  discard block
 block discarded – undo
545 549
 
546 550
 	/**
547 551
 	 * following functions are equivalent to their php builtin equivalents for arguments/return values.
552
+	 * @param string $path
548 553
 	 */
549 554
 	static public function mkdir($path) {
550 555
 		return self::$defaultInstance->mkdir($path);
551 556
 	}
552 557
 
558
+	/**
559
+	 * @param string $path
560
+	 */
553 561
 	static public function rmdir($path) {
554 562
 		return self::$defaultInstance->rmdir($path);
555 563
 	}
@@ -562,10 +570,16 @@  discard block
 block discarded – undo
562 570
 		return self::$defaultInstance->readdir($path);
563 571
 	}
564 572
 
573
+	/**
574
+	 * @param string $path
575
+	 */
565 576
 	static public function is_dir($path) {
566 577
 		return self::$defaultInstance->is_dir($path);
567 578
 	}
568 579
 
580
+	/**
581
+	 * @param string $path
582
+	 */
569 583
 	static public function is_file($path) {
570 584
 		return self::$defaultInstance->is_file($path);
571 585
 	}
@@ -578,10 +592,16 @@  discard block
 block discarded – undo
578 592
 		return self::$defaultInstance->filetype($path);
579 593
 	}
580 594
 
595
+	/**
596
+	 * @param string $path
597
+	 */
581 598
 	static public function filesize($path) {
582 599
 		return self::$defaultInstance->filesize($path);
583 600
 	}
584 601
 
602
+	/**
603
+	 * @param string $path
604
+	 */
585 605
 	static public function readfile($path) {
586 606
 		return self::$defaultInstance->readfile($path);
587 607
 	}
@@ -590,6 +610,9 @@  discard block
 block discarded – undo
590 610
 		return self::$defaultInstance->isCreatable($path);
591 611
 	}
592 612
 
613
+	/**
614
+	 * @param string $path
615
+	 */
593 616
 	static public function isReadable($path) {
594 617
 		return self::$defaultInstance->isReadable($path);
595 618
 	}
@@ -602,6 +625,9 @@  discard block
 block discarded – undo
602 625
 		return self::$defaultInstance->isDeletable($path);
603 626
 	}
604 627
 
628
+	/**
629
+	 * @param string $path
630
+	 */
605 631
 	static public function isSharable($path) {
606 632
 		return self::$defaultInstance->isSharable($path);
607 633
 	}
@@ -614,33 +640,56 @@  discard block
 block discarded – undo
614 640
 		return self::$defaultInstance->filemtime($path);
615 641
 	}
616 642
 
643
+	/**
644
+	 * @param string $path
645
+	 * @param integer $mtime
646
+	 */
617 647
 	static public function touch($path, $mtime = null) {
618 648
 		return self::$defaultInstance->touch($path, $mtime);
619 649
 	}
620 650
 
621 651
 	/**
652
+	 * @param string $path
622 653
 	 * @return string
623 654
 	 */
624 655
 	static public function file_get_contents($path) {
625 656
 		return self::$defaultInstance->file_get_contents($path);
626 657
 	}
627 658
 
659
+	/**
660
+	 * @param string $path
661
+	 * @param string $data
662
+	 */
628 663
 	static public function file_put_contents($path, $data) {
629 664
 		return self::$defaultInstance->file_put_contents($path, $data);
630 665
 	}
631 666
 
667
+	/**
668
+	 * @param string $path
669
+	 */
632 670
 	static public function unlink($path) {
633 671
 		return self::$defaultInstance->unlink($path);
634 672
 	}
635 673
 
674
+	/**
675
+	 * @param string $path1
676
+	 * @param string $path2
677
+	 */
636 678
 	static public function rename($path1, $path2) {
637 679
 		return self::$defaultInstance->rename($path1, $path2);
638 680
 	}
639 681
 
682
+	/**
683
+	 * @param string $path2
684
+	 */
640 685
 	static public function copy($path1, $path2) {
641 686
 		return self::$defaultInstance->copy($path1, $path2);
642 687
 	}
643 688
 
689
+	/**
690
+	 * @param string|null $path
691
+	 * @param string $mode
692
+	 */
644 693
 	static public function fopen($path, $mode) {
645 694
 		return self::$defaultInstance->fopen($path, $mode);
646 695
 	}
@@ -656,6 +705,9 @@  discard block
 block discarded – undo
656 705
 		return self::$defaultInstance->fromTmpFile($tmpFile, $path);
657 706
 	}
658 707
 
708
+	/**
709
+	 * @param string $path
710
+	 */
659 711
 	static public function getMimeType($path) {
660 712
 		return self::$defaultInstance->getMimeType($path);
661 713
 	}
@@ -668,6 +720,9 @@  discard block
 block discarded – undo
668 720
 		return self::$defaultInstance->free_space($path);
669 721
 	}
670 722
 
723
+	/**
724
+	 * @param string $query
725
+	 */
671 726
 	static public function search($query) {
672 727
 		return self::$defaultInstance->search($query);
673 728
 	}
Please login to merge, or discard this patch.