Completed
Pull Request — stable7 (#24167)
by Lukas
07:55
created
lib/private/updater.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -277,7 +277,7 @@
 block discarded – undo
277 277
 	 * @param string $installedVersion previous version from which to upgrade from
278 278
 	 *
279 279
 	 * @throws \Exception
280
-	 * @return bool true if the operation succeeded, false otherwise
280
+	 * @return boolean|null true if the operation succeeded, false otherwise
281 281
 	 */
282 282
 	private function doUpgrade($currentVersion, $installedVersion) {
283 283
 		// Stop update if the update is over several major versions
Please login to merge, or discard this patch.
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -32,7 +32,6 @@
 block discarded – undo
32 32
 
33 33
 namespace OC;
34 34
 
35
-use OC\Core\Command\Log\Manage;
36 35
 use OC\Hooks\BasicEmitter;
37 36
 use OC_App;
38 37
 use OC_Installer;
Please login to merge, or discard this patch.
lib/public/backgroundjob.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -131,7 +131,7 @@
 block discarded – undo
131 131
 	 * @deprecated 6.0.0
132 132
 	 * Gets one queued task
133 133
 	 * @param int $id ID of the task
134
-	 * @return BackgroundJob\IJob|null
134
+	 * @return BackgroundJob\IJob
135 135
 	 * @since 4.5.0
136 136
 	 */
137 137
 	public static function findQueuedTask($id) {
Please login to merge, or discard this patch.
lib/public/files.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -66,7 +66,7 @@
 block discarded – undo
66 66
 	/**
67 67
 	 * Search for files by mimetype
68 68
 	 * @param string $mimetype
69
-	 * @return array
69
+	 * @return \OC\Files\FileInfo[]
70 70
 	 * @since 6.0.0
71 71
 	 */
72 72
 	static public function searchByMime( $mimetype ) {
Please login to merge, or discard this patch.
tests/lib/appframework/controller/ControllerTest.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -32,6 +32,9 @@
 block discarded – undo
32 32
 
33 33
 class ChildController extends Controller {
34 34
 
35
+	/**
36
+	 * @param Request $request
37
+	 */
35 38
 	public function __construct($appName, $request) {
36 39
 		parent::__construct($appName, $request);
37 40
 		$this->registerResponder('tom', function ($respone) {
Please login to merge, or discard this patch.
tests/lib/appframework/db/EntityTest.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -42,6 +42,9 @@
 block discarded – undo
42 42
 	protected $testId;
43 43
 	protected $preName;
44 44
 
45
+	/**
46
+	 * @param string $name
47
+	 */
45 48
 	public function __construct($name=null){
46 49
 		$this->addType('testId', 'integer');		
47 50
 		$this->name = $name;
Please login to merge, or discard this patch.
tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php 1 patch
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -72,6 +72,10 @@
 block discarded – undo
72 72
 	}
73 73
 
74 74
 
75
+	/**
76
+	 * @param boolean $isLoggedIn
77
+	 * @param boolean $isAdminUser
78
+	 */
75 79
 	private function getMiddleware($isLoggedIn, $isAdminUser){
76 80
 		return new SecurityMiddleware(
77 81
 			$this->request,
Please login to merge, or discard this patch.
tests/lib/appframework/utility/ControllerMethodReflectorTest.php 1 patch
Doc Comments   -3 removed lines patch added patch discarded remove patch
@@ -92,7 +92,6 @@  discard block
 block discarded – undo
92 92
 
93 93
 	/**
94 94
 	 * @Annotation
95
-	 * @param int $test
96 95
 	 */
97 96
 	public function testReadTypeIntAnnotations(){
98 97
 		$reader = new ControllerMethodReflector();
@@ -107,7 +106,6 @@  discard block
 block discarded – undo
107 106
 
108 107
 	/**
109 108
 	 * @Annotation
110
-	 * @param double $test something special
111 109
 	 */
112 110
 	public function testReadTypeDoubleAnnotations(){
113 111
 		$reader = new ControllerMethodReflector();
@@ -121,7 +119,6 @@  discard block
 block discarded – undo
121 119
 
122 120
 	/**
123 121
 	 * @Annotation
124
-	 * @param 	string  $foo
125 122
 	 */
126 123
 	public function testReadTypeWhitespaceAnnotations(){
127 124
 		$reader = new ControllerMethodReflector();
Please login to merge, or discard this patch.
tests/lib/contacts/localadressbook.php 1 patch
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -46,6 +46,10 @@
 block discarded – undo
46 46
 
47 47
 class SimpleUserForTesting implements \OCP\IUser {
48 48
 
49
+	/**
50
+	 * @param string $uid
51
+	 * @param string $displayName
52
+	 */
49 53
 	public function __construct($uid, $displayName) {
50 54
 
51 55
 		$this->uid = $uid;
Please login to merge, or discard this patch.
tests/lib/db.php 1 patch
Doc Comments   +8 added lines patch added patch discarded remove patch
@@ -322,11 +322,19 @@
 block discarded – undo
322 322
 		$this->assertSame(2, $query->execute(array('uri1')));
323 323
 	}
324 324
 
325
+	/**
326
+	 * @param string $fullname
327
+	 * @param string $uri
328
+	 */
325 329
 	protected function insertCardData($fullname, $uri) {
326 330
 		$query = OC_DB::prepare("INSERT INTO `*PREFIX*{$this->table2}` (`fullname`, `uri`, `carddata`) VALUES (?, ?, ?)");
327 331
 		$this->assertSame(1, $query->execute(array($fullname, $uri, $this->getUniqueID())));
328 332
 	}
329 333
 
334
+	/**
335
+	 * @param string $fullname
336
+	 * @param string $uri
337
+	 */
330 338
 	protected function updateCardData($fullname, $uri) {
331 339
 		$query = OC_DB::prepare("UPDATE `*PREFIX*{$this->table2}` SET `uri` = ? WHERE `fullname` = ?");
332 340
 		return $query->execute(array($uri, $fullname));
Please login to merge, or discard this patch.