nextcloud / server

apps/dav/lib/CalDAV/Principal/Collection.php

Indentation +9 added lines, -9 removed lines

@@ -32,14 +32,14 @@
  */
 class Collection extends \Sabre\CalDAV\Principal\Collection {
 
-	/**
-	 * Returns a child object based on principal information
-	 *
-	 * @param array $principalInfo
-	 * @return User
-	 */
-	function getChildForPrincipal(array $principalInfo) {
-		return new User($this->principalBackend, $principalInfo);
-	}
+    /**
+     * Returns a child object based on principal information
+     *
+     * @param array $principalInfo
+     * @return User
+     */
+    function getChildForPrincipal(array $principalInfo) {
+        return new User($this->principalBackend, $principalInfo);
+    }
 
 }

apps/dav/lib/CalDAV/Principal/User.php

Indentation +21 added lines, -21 removed lines

@@ -30,26 +30,26 @@
  */
 class User extends \Sabre\CalDAV\Principal\User {
 
-	/**
-	 * Returns a list of ACE's for this node.
-	 *
-	 * Each ACE has the following properties:
-	 *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-	 *     currently the only supported privileges
-	 *   * 'principal', a url to the principal who owns the node
-	 *   * 'protected' (optional), indicating that this ACE is not allowed to
-	 *      be updated.
-	 *
-	 * @return array
-	 */
-	function getACL() {
-		$acl = parent::getACL();
-		$acl[] = [
-			'privilege' => '{DAV:}read',
-			'principal' => '{DAV:}authenticated',
-			'protected' => true,
-		];
-		return $acl;
-	}
+    /**
+     * Returns a list of ACE's for this node.
+     *
+     * Each ACE has the following properties:
+     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+     *     currently the only supported privileges
+     *   * 'principal', a url to the principal who owns the node
+     *   * 'protected' (optional), indicating that this ACE is not allowed to
+     *      be updated.
+     *
+     * @return array
+     */
+    function getACL() {
+        $acl = parent::getACL();
+        $acl[] = [
+            'privilege' => '{DAV:}read',
+            'principal' => '{DAV:}authenticated',
+            'protected' => true,
+        ];
+        return $acl;
+    }
 
 }

lib/public/RichObjectStrings/Definitions.php

Indentation +398 added lines, -398 removed lines

@@ -29,404 +29,404 @@
  * @since 11.0.0
  */
 class Definitions {
-	/**
-	 * @var array
-	 * @since 11.0.0
-	 */
-	public $definitions = [
-		'addressbook' => [
-			'author' => 'Nextcloud',
-			'app' => 'dav',
-			'since' => '11.0.0',
-			'parameters' => [
-				'id' => [
-					'since' => '11.0.0',
-					'required' => true,
-					'description' => 'The id used to identify the addressbook on the instance',
-					'example' => '42',
-				],
-				'name' => [
-					'since' => '11.0.0',
-					'required' => true,
-					'description' => 'The display name of the addressbook which should be used in the visual representation',
-					'example' => 'Contacts',
-				],
-			],
-		],
-		'addressbook-contact' => [
-			'author' => 'Nextcloud',
-			'app' => 'dav',
-			'since' => '11.0.0',
-			'parameters' => [
-				'id' => [
-					'since' => '11.0.0',
-					'required' => true,
-					'description' => 'The id used to identify the contact on the instance',
-					'example' => '42',
-				],
-				'name' => [
-					'since' => '11.0.0',
-					'required' => true,
-					'description' => 'The display name of the contact which should be used in the visual representation',
-					'example' => 'John Doe',
-				],
-			],
-		],
-		'announcement' => [
-			'author' => 'Joas Schilling',
-			'app' => 'announcementcenter',
-			'since' => '11.0.0',
-			'parameters' => [
-				'id' => [
-					'since' => '11.0.0',
-					'required' => true, 'description' => 'The id used to identify the announcement on the instance',
-					'example' => '42',
-				],
-				'name' => [
-					'since' => '11.0.0',
-					'required' => true,
-					'description' => 'The announcement subject which should be used in the visual representation',
-					'example' => 'file.txt',
-				],
-				'link' => [
-					'since' => '11.0.0',
-					'required' => false,
-					'description' => 'The full URL to the file',
-					'example' => 'http://localhost/index.php/apps/announcements/#23',
-				],
-			],
-		],
-		'app' => [
-			'author' => 'Nextcloud',
-			'app' => 'updatenotification',
-			'since' => '11.0.0',
-			'parameters' => [
-				'id' => [
-					'since' => '11.0.0',
-					'required' => true, 'description' => 'The app id',
-					'example' => 'updatenotification',
-				],
-				'name' => [
-					'since' => '11.0.0',
-					'required' => true,
-					'description' => 'The name of the app which should be used in the visual representation',
-					'example' => 'Update notification',
-				],
-			],
-		],
-		'calendar' => [
-			'author' => 'Nextcloud',
-			'app' => 'dav',
-			'since' => '11.0.0',
-			'parameters' => [
-				'id' => [
-					'since' => '11.0.0',
-					'required' => true,
-					'description' => 'The id used to identify the calendar on the instance',
-					'example' => '42',
-				],
-				'name' => [
-					'since' => '11.0.0',
-					'required' => true,
-					'description' => 'The display name of the calendar which should be used in the visual representation',
-					'example' => 'Personal',
-				],
-			],
-		],
-		'calendar-event' => [
-			'author' => 'Nextcloud',
-			'app' => 'dav',
-			'since' => '11.0.0',
-			'parameters' => [
-				'id' => [
-					'since' => '11.0.0',
-					'required' => true,
-					'description' => 'The id used to identify the event on the instance',
-					'example' => '42',
-				],
-				'name' => [
-					'since' => '11.0.0',
-					'required' => true,
-					'description' => 'The display name of the event which should be used in the visual representation',
-					'example' => 'Workout',
-				],
-			],
-		],
-		'call' => [
-			'author' => 'Nextcloud',
-			'app' => 'spreed',
-			'since' => '11.0.2',
-			'parameters' => [
-				'id' => [
-					'since' => '11.0.2',
-					'required' => true,
-					'description' => 'The id used to identify the call on the instance',
-					'example' => '42',
-				],
-				'name' => [
-					'since' => '11.0.2',
-					'required' => true,
-					'description' => 'The display name of the call which should be used in the visual representation',
-					'example' => 'Company call',
-				],
-				'call-type' => [
-					'since' => '11.0.2',
-					'required' => true,
-					'description' => 'The type of the call: one2one, group or public',
-					'example' => 'one2one',
-				],
-			],
-		],
-		'circle' => [
-			'author' => 'Maxence Lange',
-			'app' => 'circles',
-			'since' => '12.0.0',
-			'parameters' => [
-				'id' => [
-					'since' => '12.0.0',
-					'required' => true,
-					'description' => 'The id used to identify the circle on the instance',
-					'example' => '42',
-				],
-				'name' => [
-					'since' => '12.0.0',
-					'required' => true,
-					'description' => 'The display name of the circle which should be used in the visual representation',
-					'example' => 'My friends',
-				],
-				'link' => [
-					'since' => '12.0.0',
-					'required' => true,
-					'description' => 'The full URL to the circle',
-					'example' => 'http://localhost/index.php/apps/circles/#42',
-				],
-			],
-		],
-		'email' => [
-			'author' => 'Nextcloud',
-			'app' => 'sharebymail',
-			'since' => '11.0.0',
-			'parameters' => [
-				'id' => [
-					'since' => '11.0.0',
-					'required' => true,
-					'description' => 'The mail-address used to identify the event on the instance',
-					'example' => 'test@localhost',
-				],
-				'name' => [
-					'since' => '11.0.0',
-					'required' => true,
-					'description' => 'The display name of a matching contact or the email (fallback) which should be used in the visual representation',
-					'example' => 'Foo Bar',
-				],
-			],
-		],
-		'file' => [
-			'author' => 'Nextcloud',
-			'app' => 'dav',
-			'since' => '11.0.0',
-			'parameters' => [
-				'id' => [
-					'since' => '11.0.0',
-					'required' => true,
-					'description' => 'The id used to identify the file on the instance',
-					'example' => '42',
-				],
-				'name' => [
-					'since' => '11.0.0',
-					'required' => true,
-					'description' => 'The file name which should be used in the visual representation',
-					'example' => 'file.txt',
-				],
-				'path' => [
-					'since' => '11.0.0',
-					'required' => true,
-					'description' => 'The full path of the file for the user, should not start with a slash',
-					'example' => 'path/to/file.txt',
-				],
-				'link' => [
-					'since' => '11.0.0',
-					'required' => false,
-					'description' => 'The full URL to the file',
-					'example' => 'http://localhost/index.php/f/42',
-				],
-			],
-		],
-		'highlight' => [
-			'author' => 'Nextcloud',
-			'app' => 'core',
-			'since' => '13.0.0',
-			'parameters' => [
-				'id' => [
-					'since' => '13.0.0',
-					'required' => true,
-					'description' => 'The id used to identify the highlighted object on the instance',
-					'example' => '42',
-				],
-				'name' => [
-					'since' => '13.0.0',
-					'required' => true,
-					'description' => 'The string that should be highlighted.',
-					'example' => 'Hello World',
-				],
-				'link' => [
-					'since' => '13.0.0',
-					'required' => false,
-					'description' => 'The full URL that should be opened when clicking the highlighted text.',
-					'example' => 'http://localhost/index.php/f/42',
-				],
-			],
-		],
-		'open-graph' => [
-			'author' => 'Maxence Lange',
-			'app' => 'mood',
-			'since' => '12.0.0',
-			'parameters' => [
-				'id' => [
-					'since' => '12.0.0',
-					'required' => true,
-					'description' => 'The id used to identify the open graph data on the instance',
-					'example' => '42',
-				],
-				'name' => [
-					'since' => '12.0.0',
-					'required' => true,
-					'description' => 'The open graph title of the website',
-					'example' => 'This is a website',
-				],
-				'description' => [
-					'since' => '12.0.0',
-					'required' => false,
-					'description' => 'The open graph description from the website',
-					'example' => 'This is the description of the website',
-				],
-				'thumb' => [
-					'since' => '12.0.0',
-					'required' => false,
-					'description' => 'The full URL of the open graph thumbnail',
-					'example' => 'http://localhost/index.php/apps/mood/data/image?url=https%3A%2F%2Fthumb.example.com%2Fimage.png',
-				],
-				'website' => [
-					'since' => '12.0.0',
-					'required' => false,
-					'description' => 'The name of the described website',
-					'example' => 'Nextcloud - App Store',
-				],
-				'link' => [
-					'since' => '12.0.0',
-					'required' => false,
-					'description' => 'The full link to the website',
-					'example' => 'https://apps.nextcloud.com/apps/mood',
-				],
-			],
-		],
-		'pending-federated-share' => [
-			'author' => 'Nextcloud',
-			'app' => 'dav',
-			'since' => '11.0.0',
-			'parameters' => [
-				'id' => [
-					'since' => '11.0.0',
-					'required' => true,
-					'description' => 'The id used to identify the federated share on the instance',
-					'example' => '42',
-				],
-				'name' => [
-					'since' => '11.0.0',
-					'required' => true,
-					'description' => 'The name of the shared item which should be used in the visual representation',
-					'example' => 'file.txt',
-				],
-			],
-		],
-		'systemtag' => [
-			'author' => 'Nextcloud',
-			'app' => 'core',
-			'since' => '11.0.0',
-			'parameters' => [
-				'id' => [
-					'since' => '11.0.0',
-					'required' => true,
-					'description' => 'The id used to identify the systemtag on the instance',
-					'example' => '23',
-				],
-				'name' => [
-					'since' => '11.0.0',
-					'required' => true,
-					'description' => 'The display name of the systemtag which should be used in the visual representation',
-					'example' => 'Project 1',
-				],
-				'visibility' => [
-					'since' => '11.0.0',
-					'required' => true,
-					'description' => 'If the user can see the systemtag',
-					'example' => '1',
-				],
-				'assignable' => [
-					'since' => '11.0.0',
-					'required' => true,
-					'description' => 'If the user can assign the systemtag',
-					'example' => '0',
-				],
-			],
-		],
-		'user' => [
-			'author' => 'Nextcloud',
-			'app' => 'core',
-			'since' => '11.0.0',
-			'parameters' => [
-				'id' => [
-					'since' => '11.0.0',
-					'required' => true,
-					'description' => 'The id used to identify the user on the instance',
-					'example' => 'johndoe',
-				],
-				'name' => [
-					'since' => '11.0.0',
-					'required' => true,
-					'description' => 'The display name of the user which should be used in the visual representation',
-					'example' => 'John Doe',
-				],
-				'server' => [
-					'since' => '11.0.0',
-					'required' => false,
-					'description' => 'The URL of the instance the user lives on',
-					'example' => 'localhost',
-				],
-			],
-		],
-		'user-group' => [
-			'author' => 'Nextcloud',
-			'app' => 'core',
-			'since' => '11.0.0',
-			'parameters' => [
-				'id' => [
-					'since' => '11.0.0',
-					'required' => true,
-					'description' => 'The id used to identify the group on the instance',
-					'example' => 'supportteam',
-				],
-				'name' => [
-					'since' => '11.0.0',
-					'required' => true,
-					'description' => 'The display name of the group which should be used in the visual representation',
-					'example' => 'Support Team',
-				],
-			],
-		],
-	];
+    /**
+     * @var array
+     * @since 11.0.0
+     */
+    public $definitions = [
+        'addressbook' => [
+            'author' => 'Nextcloud',
+            'app' => 'dav',
+            'since' => '11.0.0',
+            'parameters' => [
+                'id' => [
+                    'since' => '11.0.0',
+                    'required' => true,
+                    'description' => 'The id used to identify the addressbook on the instance',
+                    'example' => '42',
+                ],
+                'name' => [
+                    'since' => '11.0.0',
+                    'required' => true,
+                    'description' => 'The display name of the addressbook which should be used in the visual representation',
+                    'example' => 'Contacts',
+                ],
+            ],
+        ],
+        'addressbook-contact' => [
+            'author' => 'Nextcloud',
+            'app' => 'dav',
+            'since' => '11.0.0',
+            'parameters' => [
+                'id' => [
+                    'since' => '11.0.0',
+                    'required' => true,
+                    'description' => 'The id used to identify the contact on the instance',
+                    'example' => '42',
+                ],
+                'name' => [
+                    'since' => '11.0.0',
+                    'required' => true,
+                    'description' => 'The display name of the contact which should be used in the visual representation',
+                    'example' => 'John Doe',
+                ],
+            ],
+        ],
+        'announcement' => [
+            'author' => 'Joas Schilling',
+            'app' => 'announcementcenter',
+            'since' => '11.0.0',
+            'parameters' => [
+                'id' => [
+                    'since' => '11.0.0',
+                    'required' => true, 'description' => 'The id used to identify the announcement on the instance',
+                    'example' => '42',
+                ],
+                'name' => [
+                    'since' => '11.0.0',
+                    'required' => true,
+                    'description' => 'The announcement subject which should be used in the visual representation',
+                    'example' => 'file.txt',
+                ],
+                'link' => [
+                    'since' => '11.0.0',
+                    'required' => false,
+                    'description' => 'The full URL to the file',
+                    'example' => 'http://localhost/index.php/apps/announcements/#23',
+                ],
+            ],
+        ],
+        'app' => [
+            'author' => 'Nextcloud',
+            'app' => 'updatenotification',
+            'since' => '11.0.0',
+            'parameters' => [
+                'id' => [
+                    'since' => '11.0.0',
+                    'required' => true, 'description' => 'The app id',
+                    'example' => 'updatenotification',
+                ],
+                'name' => [
+                    'since' => '11.0.0',
+                    'required' => true,
+                    'description' => 'The name of the app which should be used in the visual representation',
+                    'example' => 'Update notification',
+                ],
+            ],
+        ],
+        'calendar' => [
+            'author' => 'Nextcloud',
+            'app' => 'dav',
+            'since' => '11.0.0',
+            'parameters' => [
+                'id' => [
+                    'since' => '11.0.0',
+                    'required' => true,
+                    'description' => 'The id used to identify the calendar on the instance',
+                    'example' => '42',
+                ],
+                'name' => [
+                    'since' => '11.0.0',
+                    'required' => true,
+                    'description' => 'The display name of the calendar which should be used in the visual representation',
+                    'example' => 'Personal',
+                ],
+            ],
+        ],
+        'calendar-event' => [
+            'author' => 'Nextcloud',
+            'app' => 'dav',
+            'since' => '11.0.0',
+            'parameters' => [
+                'id' => [
+                    'since' => '11.0.0',
+                    'required' => true,
+                    'description' => 'The id used to identify the event on the instance',
+                    'example' => '42',
+                ],
+                'name' => [
+                    'since' => '11.0.0',
+                    'required' => true,
+                    'description' => 'The display name of the event which should be used in the visual representation',
+                    'example' => 'Workout',
+                ],
+            ],
+        ],
+        'call' => [
+            'author' => 'Nextcloud',
+            'app' => 'spreed',
+            'since' => '11.0.2',
+            'parameters' => [
+                'id' => [
+                    'since' => '11.0.2',
+                    'required' => true,
+                    'description' => 'The id used to identify the call on the instance',
+                    'example' => '42',
+                ],
+                'name' => [
+                    'since' => '11.0.2',
+                    'required' => true,
+                    'description' => 'The display name of the call which should be used in the visual representation',
+                    'example' => 'Company call',
+                ],
+                'call-type' => [
+                    'since' => '11.0.2',
+                    'required' => true,
+                    'description' => 'The type of the call: one2one, group or public',
+                    'example' => 'one2one',
+                ],
+            ],
+        ],
+        'circle' => [
+            'author' => 'Maxence Lange',
+            'app' => 'circles',
+            'since' => '12.0.0',
+            'parameters' => [
+                'id' => [
+                    'since' => '12.0.0',
+                    'required' => true,
+                    'description' => 'The id used to identify the circle on the instance',
+                    'example' => '42',
+                ],
+                'name' => [
+                    'since' => '12.0.0',
+                    'required' => true,
+                    'description' => 'The display name of the circle which should be used in the visual representation',
+                    'example' => 'My friends',
+                ],
+                'link' => [
+                    'since' => '12.0.0',
+                    'required' => true,
+                    'description' => 'The full URL to the circle',
+                    'example' => 'http://localhost/index.php/apps/circles/#42',
+                ],
+            ],
+        ],
+        'email' => [
+            'author' => 'Nextcloud',
+            'app' => 'sharebymail',
+            'since' => '11.0.0',
+            'parameters' => [
+                'id' => [
+                    'since' => '11.0.0',
+                    'required' => true,
+                    'description' => 'The mail-address used to identify the event on the instance',
+                    'example' => 'test@localhost',
+                ],
+                'name' => [
+                    'since' => '11.0.0',
+                    'required' => true,
+                    'description' => 'The display name of a matching contact or the email (fallback) which should be used in the visual representation',
+                    'example' => 'Foo Bar',
+                ],
+            ],
+        ],
+        'file' => [
+            'author' => 'Nextcloud',
+            'app' => 'dav',
+            'since' => '11.0.0',
+            'parameters' => [
+                'id' => [
+                    'since' => '11.0.0',
+                    'required' => true,
+                    'description' => 'The id used to identify the file on the instance',
+                    'example' => '42',
+                ],
+                'name' => [
+                    'since' => '11.0.0',
+                    'required' => true,
+                    'description' => 'The file name which should be used in the visual representation',
+                    'example' => 'file.txt',
+                ],
+                'path' => [
+                    'since' => '11.0.0',
+                    'required' => true,
+                    'description' => 'The full path of the file for the user, should not start with a slash',
+                    'example' => 'path/to/file.txt',
+                ],
+                'link' => [
+                    'since' => '11.0.0',
+                    'required' => false,
+                    'description' => 'The full URL to the file',
+                    'example' => 'http://localhost/index.php/f/42',
+                ],
+            ],
+        ],
+        'highlight' => [
+            'author' => 'Nextcloud',
+            'app' => 'core',
+            'since' => '13.0.0',
+            'parameters' => [
+                'id' => [
+                    'since' => '13.0.0',
+                    'required' => true,
+                    'description' => 'The id used to identify the highlighted object on the instance',
+                    'example' => '42',
+                ],
+                'name' => [
+                    'since' => '13.0.0',
+                    'required' => true,
+                    'description' => 'The string that should be highlighted.',
+                    'example' => 'Hello World',
+                ],
+                'link' => [
+                    'since' => '13.0.0',
+                    'required' => false,
+                    'description' => 'The full URL that should be opened when clicking the highlighted text.',
+                    'example' => 'http://localhost/index.php/f/42',
+                ],
+            ],
+        ],
+        'open-graph' => [
+            'author' => 'Maxence Lange',
+            'app' => 'mood',
+            'since' => '12.0.0',
+            'parameters' => [
+                'id' => [
+                    'since' => '12.0.0',
+                    'required' => true,
+                    'description' => 'The id used to identify the open graph data on the instance',
+                    'example' => '42',
+                ],
+                'name' => [
+                    'since' => '12.0.0',
+                    'required' => true,
+                    'description' => 'The open graph title of the website',
+                    'example' => 'This is a website',
+                ],
+                'description' => [
+                    'since' => '12.0.0',
+                    'required' => false,
+                    'description' => 'The open graph description from the website',
+                    'example' => 'This is the description of the website',
+                ],
+                'thumb' => [
+                    'since' => '12.0.0',
+                    'required' => false,
+                    'description' => 'The full URL of the open graph thumbnail',
+                    'example' => 'http://localhost/index.php/apps/mood/data/image?url=https%3A%2F%2Fthumb.example.com%2Fimage.png',
+                ],
+                'website' => [
+                    'since' => '12.0.0',
+                    'required' => false,
+                    'description' => 'The name of the described website',
+                    'example' => 'Nextcloud - App Store',
+                ],
+                'link' => [
+                    'since' => '12.0.0',
+                    'required' => false,
+                    'description' => 'The full link to the website',
+                    'example' => 'https://apps.nextcloud.com/apps/mood',
+                ],
+            ],
+        ],
+        'pending-federated-share' => [
+            'author' => 'Nextcloud',
+            'app' => 'dav',
+            'since' => '11.0.0',
+            'parameters' => [
+                'id' => [
+                    'since' => '11.0.0',
+                    'required' => true,
+                    'description' => 'The id used to identify the federated share on the instance',
+                    'example' => '42',
+                ],
+                'name' => [
+                    'since' => '11.0.0',
+                    'required' => true,
+                    'description' => 'The name of the shared item which should be used in the visual representation',
+                    'example' => 'file.txt',
+                ],
+            ],
+        ],
+        'systemtag' => [
+            'author' => 'Nextcloud',
+            'app' => 'core',
+            'since' => '11.0.0',
+            'parameters' => [
+                'id' => [
+                    'since' => '11.0.0',
+                    'required' => true,
+                    'description' => 'The id used to identify the systemtag on the instance',
+                    'example' => '23',
+                ],
+                'name' => [
+                    'since' => '11.0.0',
+                    'required' => true,
+                    'description' => 'The display name of the systemtag which should be used in the visual representation',
+                    'example' => 'Project 1',
+                ],
+                'visibility' => [
+                    'since' => '11.0.0',
+                    'required' => true,
+                    'description' => 'If the user can see the systemtag',
+                    'example' => '1',
+                ],
+                'assignable' => [
+                    'since' => '11.0.0',
+                    'required' => true,
+                    'description' => 'If the user can assign the systemtag',
+                    'example' => '0',
+                ],
+            ],
+        ],
+        'user' => [
+            'author' => 'Nextcloud',
+            'app' => 'core',
+            'since' => '11.0.0',
+            'parameters' => [
+                'id' => [
+                    'since' => '11.0.0',
+                    'required' => true,
+                    'description' => 'The id used to identify the user on the instance',
+                    'example' => 'johndoe',
+                ],
+                'name' => [
+                    'since' => '11.0.0',
+                    'required' => true,
+                    'description' => 'The display name of the user which should be used in the visual representation',
+                    'example' => 'John Doe',
+                ],
+                'server' => [
+                    'since' => '11.0.0',
+                    'required' => false,
+                    'description' => 'The URL of the instance the user lives on',
+                    'example' => 'localhost',
+                ],
+            ],
+        ],
+        'user-group' => [
+            'author' => 'Nextcloud',
+            'app' => 'core',
+            'since' => '11.0.0',
+            'parameters' => [
+                'id' => [
+                    'since' => '11.0.0',
+                    'required' => true,
+                    'description' => 'The id used to identify the group on the instance',
+                    'example' => 'supportteam',
+                ],
+                'name' => [
+                    'since' => '11.0.0',
+                    'required' => true,
+                    'description' => 'The display name of the group which should be used in the visual representation',
+                    'example' => 'Support Team',
+                ],
+            ],
+        ],
+    ];
 
-	/**
-	 * @param string $type
-	 * @return array
-	 * @throws InvalidObjectExeption
-	 * @since 11.0.0
-	 */
-	public function getDefinition($type) {
-		if (isset($this->definitions[$type])) {
-			return $this->definitions[$type];
-		}
+    /**
+     * @param string $type
+     * @return array
+     * @throws InvalidObjectExeption
+     * @since 11.0.0
+     */
+    public function getDefinition($type) {
+        if (isset($this->definitions[$type])) {
+            return $this->definitions[$type];
+        }
 
-		throw new InvalidObjectExeption('Object type is undefined');
-	}
+        throw new InvalidObjectExeption('Object type is undefined');
+    }
 }

lib/private/Repair/NC13/RepairInvalidPaths.php

Indentation +160 added lines, -160 removed lines

@@ -29,164 +29,164 @@
 use OCP\Migration\IRepairStep;
 
 class RepairInvalidPaths implements IRepairStep {
-	const MAX_ROWS = 1000;
-
-	/** @var IDBConnection */
-	private $connection;
-	/** @var IConfig */
-	private $config;
-
-	private $getIdQuery;
-	private $updateQuery;
-	private $reparentQuery;
-	private $deleteQuery;
-
-	public function __construct(IDBConnection $connection, IConfig $config) {
-		$this->connection = $connection;
-		$this->config = $config;
-	}
-
-
-	public function getName() {
-		return 'Repair invalid paths in file cache';
-	}
-
-	/**
-	 * @return \Generator
-	 * @suppress SqlInjectionChecker
-	 */
-	private function getInvalidEntries() {
-		$builder = $this->connection->getQueryBuilder();
-
-		$computedPath = $builder->func()->concat(
-			'p.path',
-			$builder->func()->concat($builder->createNamedParameter('/'), 'f.name')
-		);
-
-		//select f.path, f.parent,p.path from oc_filecache f inner join oc_filecache p on f.parent=p.fileid and p.path!='' where f.path != p.path || '/' || f.name;
-		$builder->select('f.fileid', 'f.path', 'f.name', 'f.parent', 'f.storage')
-			->selectAlias('p.path', 'parent_path')
-			->selectAlias('p.storage', 'parent_storage')
-			->from('filecache', 'f')
-			->innerJoin('f', 'filecache', 'p', $builder->expr()->andX(
-				$builder->expr()->eq('f.parent', 'p.fileid'),
-				$builder->expr()->nonEmptyString('p.name')
-			))
-			->where($builder->expr()->neq('f.path', $computedPath))
-			->setMaxResults(self::MAX_ROWS);
-
-		do {
-			$result = $builder->execute();
-			$rows = $result->fetchAll();
-			foreach ($rows as $row) {
-				yield $row;
-			}
-			$result->closeCursor();
-		} while (count($rows) > 0);
-	}
-
-	private function getId($storage, $path) {
-		if (!$this->getIdQuery) {
-			$builder = $this->connection->getQueryBuilder();
-
-			$this->getIdQuery = $builder->select('fileid')
-				->from('filecache')
-				->where($builder->expr()->eq('storage', $builder->createParameter('storage')))
-				->andWhere($builder->expr()->eq('path_hash', $builder->createParameter('path_hash')));
-		}
-
-		$this->getIdQuery->setParameter('storage', $storage, IQueryBuilder::PARAM_INT);
-		$this->getIdQuery->setParameter('path_hash', md5($path));
-
-		return $this->getIdQuery->execute()->fetchColumn();
-	}
-
-	/**
-	 * @param string $fileid
-	 * @param string $newPath
-	 * @param string $newStorage
-	 * @suppress SqlInjectionChecker
-	 */
-	private function update($fileid, $newPath, $newStorage) {
-		if (!$this->updateQuery) {
-			$builder = $this->connection->getQueryBuilder();
-
-			$this->updateQuery = $builder->update('filecache')
-				->set('path', $builder->createParameter('newpath'))
-				->set('path_hash', $builder->func()->md5($builder->createParameter('newpath')))
-				->set('storage', $builder->createParameter('newstorage'))
-				->where($builder->expr()->eq('fileid', $builder->createParameter('fileid')));
-		}
-
-		$this->updateQuery->setParameter('newpath', $newPath);
-		$this->updateQuery->setParameter('newstorage', $newStorage);
-		$this->updateQuery->setParameter('fileid', $fileid, IQueryBuilder::PARAM_INT);
-
-		$this->updateQuery->execute();
-	}
-
-	private function reparent($from, $to) {
-		if (!$this->reparentQuery) {
-			$builder = $this->connection->getQueryBuilder();
-
-			$this->reparentQuery = $builder->update('filecache')
-				->set('parent', $builder->createParameter('to'))
-				->where($builder->expr()->eq('fileid', $builder->createParameter('from')));
-		}
-
-		$this->reparentQuery->setParameter('from', $from);
-		$this->reparentQuery->setParameter('to', $to);
-
-		$this->reparentQuery->execute();
-	}
-
-	private function delete($fileid) {
-		if (!$this->deleteQuery) {
-			$builder = $this->connection->getQueryBuilder();
-
-			$this->deleteQuery = $builder->delete('filecache')
-				->where($builder->expr()->eq('fileid', $builder->createParameter('fileid')));
-		}
-
-		$this->deleteQuery->setParameter('fileid', $fileid, IQueryBuilder::PARAM_INT);
-
-		$this->deleteQuery->execute();
-	}
-
-	private function repair() {
-		$this->connection->beginTransaction();
-		$entries = $this->getInvalidEntries();
-		$count = 0;
-		foreach ($entries as $entry) {
-			$count++;
-			$calculatedPath = $entry['parent_path'] . '/' . $entry['name'];
-			if ($newId = $this->getId($entry['parent_storage'], $calculatedPath)) {
-				// a new entry with the correct path has already been created, reuse that one and delete the incorrect entry
-				$this->reparent($entry['fileid'], $newId);
-				$this->delete($entry['fileid']);
-			} else {
-				$this->update($entry['fileid'], $calculatedPath, $entry['parent_storage']);
-			}
-		}
-		$this->connection->commit();
-		return $count;
-	}
-
-	private function shouldRun() {
-		$versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
-
-		// was added to 11.0.5.2, 12.0.0.30 and 13.0.0.1
-		$shouldRun = version_compare($versionFromBeforeUpdate, '11.0.5.2', '<');
-		$shouldRun |= version_compare($versionFromBeforeUpdate, '12.0.0.0', '>=') && version_compare($versionFromBeforeUpdate, '12.0.0.30', '<');
-		$shouldRun |= version_compare($versionFromBeforeUpdate, '13.0.0.0', '==');
-		return $shouldRun;
-	}
-
-	public function run(IOutput $output) {
-		if ($this->shouldRun()) {
-			$count = $this->repair();
-
-			$output->info('Repaired ' . $count . ' paths');
-		}
-	}
+    const MAX_ROWS = 1000;
+
+    /** @var IDBConnection */
+    private $connection;
+    /** @var IConfig */
+    private $config;
+
+    private $getIdQuery;
+    private $updateQuery;
+    private $reparentQuery;
+    private $deleteQuery;
+
+    public function __construct(IDBConnection $connection, IConfig $config) {
+        $this->connection = $connection;
+        $this->config = $config;
+    }
+
+
+    public function getName() {
+        return 'Repair invalid paths in file cache';
+    }
+
+    /**
+     * @return \Generator
+     * @suppress SqlInjectionChecker
+     */
+    private function getInvalidEntries() {
+        $builder = $this->connection->getQueryBuilder();
+
+        $computedPath = $builder->func()->concat(
+            'p.path',
+            $builder->func()->concat($builder->createNamedParameter('/'), 'f.name')
+        );
+
+        //select f.path, f.parent,p.path from oc_filecache f inner join oc_filecache p on f.parent=p.fileid and p.path!='' where f.path != p.path || '/' || f.name;
+        $builder->select('f.fileid', 'f.path', 'f.name', 'f.parent', 'f.storage')
+            ->selectAlias('p.path', 'parent_path')
+            ->selectAlias('p.storage', 'parent_storage')
+            ->from('filecache', 'f')
+            ->innerJoin('f', 'filecache', 'p', $builder->expr()->andX(
+                $builder->expr()->eq('f.parent', 'p.fileid'),
+                $builder->expr()->nonEmptyString('p.name')
+            ))
+            ->where($builder->expr()->neq('f.path', $computedPath))
+            ->setMaxResults(self::MAX_ROWS);
+
+        do {
+            $result = $builder->execute();
+            $rows = $result->fetchAll();
+            foreach ($rows as $row) {
+                yield $row;
+            }
+            $result->closeCursor();
+        } while (count($rows) > 0);
+    }
+
+    private function getId($storage, $path) {
+        if (!$this->getIdQuery) {
+            $builder = $this->connection->getQueryBuilder();
+
+            $this->getIdQuery = $builder->select('fileid')
+                ->from('filecache')
+                ->where($builder->expr()->eq('storage', $builder->createParameter('storage')))
+                ->andWhere($builder->expr()->eq('path_hash', $builder->createParameter('path_hash')));
+        }
+
+        $this->getIdQuery->setParameter('storage', $storage, IQueryBuilder::PARAM_INT);
+        $this->getIdQuery->setParameter('path_hash', md5($path));
+
+        return $this->getIdQuery->execute()->fetchColumn();
+    }
+
+    /**
+     * @param string $fileid
+     * @param string $newPath
+     * @param string $newStorage
+     * @suppress SqlInjectionChecker
+     */
+    private function update($fileid, $newPath, $newStorage) {
+        if (!$this->updateQuery) {
+            $builder = $this->connection->getQueryBuilder();
+
+            $this->updateQuery = $builder->update('filecache')
+                ->set('path', $builder->createParameter('newpath'))
+                ->set('path_hash', $builder->func()->md5($builder->createParameter('newpath')))
+                ->set('storage', $builder->createParameter('newstorage'))
+                ->where($builder->expr()->eq('fileid', $builder->createParameter('fileid')));
+        }
+
+        $this->updateQuery->setParameter('newpath', $newPath);
+        $this->updateQuery->setParameter('newstorage', $newStorage);
+        $this->updateQuery->setParameter('fileid', $fileid, IQueryBuilder::PARAM_INT);
+
+        $this->updateQuery->execute();
+    }
+
+    private function reparent($from, $to) {
+        if (!$this->reparentQuery) {
+            $builder = $this->connection->getQueryBuilder();
+
+            $this->reparentQuery = $builder->update('filecache')
+                ->set('parent', $builder->createParameter('to'))
+                ->where($builder->expr()->eq('fileid', $builder->createParameter('from')));
+        }
+
+        $this->reparentQuery->setParameter('from', $from);
+        $this->reparentQuery->setParameter('to', $to);
+
+        $this->reparentQuery->execute();
+    }
+
+    private function delete($fileid) {
+        if (!$this->deleteQuery) {
+            $builder = $this->connection->getQueryBuilder();
+
+            $this->deleteQuery = $builder->delete('filecache')
+                ->where($builder->expr()->eq('fileid', $builder->createParameter('fileid')));
+        }
+
+        $this->deleteQuery->setParameter('fileid', $fileid, IQueryBuilder::PARAM_INT);
+
+        $this->deleteQuery->execute();
+    }
+
+    private function repair() {
+        $this->connection->beginTransaction();
+        $entries = $this->getInvalidEntries();
+        $count = 0;
+        foreach ($entries as $entry) {
+            $count++;
+            $calculatedPath = $entry['parent_path'] . '/' . $entry['name'];
+            if ($newId = $this->getId($entry['parent_storage'], $calculatedPath)) {
+                // a new entry with the correct path has already been created, reuse that one and delete the incorrect entry
+                $this->reparent($entry['fileid'], $newId);
+                $this->delete($entry['fileid']);
+            } else {
+                $this->update($entry['fileid'], $calculatedPath, $entry['parent_storage']);
+            }
+        }
+        $this->connection->commit();
+        return $count;
+    }
+
+    private function shouldRun() {
+        $versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
+
+        // was added to 11.0.5.2, 12.0.0.30 and 13.0.0.1
+        $shouldRun = version_compare($versionFromBeforeUpdate, '11.0.5.2', '<');
+        $shouldRun |= version_compare($versionFromBeforeUpdate, '12.0.0.0', '>=') && version_compare($versionFromBeforeUpdate, '12.0.0.30', '<');
+        $shouldRun |= version_compare($versionFromBeforeUpdate, '13.0.0.0', '==');
+        return $shouldRun;
+    }
+
+    public function run(IOutput $output) {
+        if ($this->shouldRun()) {
+            $count = $this->repair();
+
+            $output->info('Repaired ' . $count . ' paths');
+        }
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -159,7 +159,7 @@ 
 		$count = 0;
 		foreach ($entries as $entry) {
 			$count++;
-			$calculatedPath = $entry['parent_path'] . '/' . $entry['name'];
+			$calculatedPath = $entry['parent_path'].'/'.$entry['name'];
 			if ($newId = $this->getId($entry['parent_storage'], $calculatedPath)) {
 				// a new entry with the correct path has already been created, reuse that one and delete the incorrect entry
 				$this->reparent($entry['fileid'], $newId);
@@ -186,7 +186,7 @@ 
 		if ($this->shouldRun()) {
 			$count = $this->repair();
 
-			$output->info('Repaired ' . $count . ' paths');
+			$output->info('Repaired '.$count.' paths');
 		}
 	}
 }

lib/private/App/InfoParser.php

Spacing +8 added lines, -8 removed lines

@@ -49,8 +49,8 @@ 
 			return null;
 		}
 
-		if(!is_null($this->cache)) {
-			$fileCacheKey = $file . filemtime($file);
+		if (!is_null($this->cache)) {
+			$fileCacheKey = $file.filemtime($file);
 			if ($cachedValue = $this->cache->get($fileCacheKey)) {
 				return json_decode($cachedValue, true);
 			}
@@ -199,7 +199,7 @@ 
 			$array['settings']['personal-section'] = [$array['settings']['personal-section']];
 		}
 
-		if(!is_null($this->cache)) {
+		if (!is_null($this->cache)) {
 			$this->cache->set($fileCacheKey, json_encode($array));
 		}
 		return $array;
@@ -211,7 +211,7 @@ 
 	 */
 	public function xmlToArray($xml) {
 		if (!$xml->children()) {
-			return (string)$xml;
+			return (string) $xml;
 		}
 
 		$array = [];
@@ -227,16 +227,16 @@ 
 				$data = [
 					'@attributes' => [],
 				];
-				if (!count($node->children())){
-					$value = (string)$node;
+				if (!count($node->children())) {
+					$value = (string) $node;
 					if (!empty($value)) {
-						$data['@value'] = (string)$node;
+						$data['@value'] = (string) $node;
 					}
 				} else {
 					$data = array_merge($data, $this->xmlToArray($node));
 				}
 				foreach ($attributes as $attr => $value) {
-					$data['@attributes'][$attr] = (string)$value;
+					$data['@attributes'][$attr] = (string) $value;
 				}
 
 				if ($totalElement > 1) {

Indentation +215 added lines, -215 removed lines

@@ -33,233 +33,233 @@
 use OCP\ICache;
 
 class InfoParser {
-	/** @var \OCP\ICache|null */
-	private $cache;
+    /** @var \OCP\ICache|null */
+    private $cache;
 
-	/**
-	 * @param ICache|null $cache
-	 */
-	public function __construct(ICache $cache = null) {
-		$this->cache = $cache;
-	}
+    /**
+     * @param ICache|null $cache
+     */
+    public function __construct(ICache $cache = null) {
+        $this->cache = $cache;
+    }
 
-	/**
-	 * @param string $file the xml file to be loaded
-	 * @return null|array where null is an indicator for an error
-	 */
-	public function parse($file) {
-		if (!file_exists($file)) {
-			return null;
-		}
+    /**
+     * @param string $file the xml file to be loaded
+     * @return null|array where null is an indicator for an error
+     */
+    public function parse($file) {
+        if (!file_exists($file)) {
+            return null;
+        }
 
-		if(!is_null($this->cache)) {
-			$fileCacheKey = $file . filemtime($file);
-			if ($cachedValue = $this->cache->get($fileCacheKey)) {
-				return json_decode($cachedValue, true);
-			}
-		}
+        if(!is_null($this->cache)) {
+            $fileCacheKey = $file . filemtime($file);
+            if ($cachedValue = $this->cache->get($fileCacheKey)) {
+                return json_decode($cachedValue, true);
+            }
+        }
 
-		libxml_use_internal_errors(true);
-		$loadEntities = libxml_disable_entity_loader(false);
-		$xml = simplexml_load_file($file);
+        libxml_use_internal_errors(true);
+        $loadEntities = libxml_disable_entity_loader(false);
+        $xml = simplexml_load_file($file);
 
-		libxml_disable_entity_loader($loadEntities);
-		if ($xml === false) {
-			libxml_clear_errors();
-			return null;
-		}
-		$array = $this->xmlToArray($xml);
+        libxml_disable_entity_loader($loadEntities);
+        if ($xml === false) {
+            libxml_clear_errors();
+            return null;
+        }
+        $array = $this->xmlToArray($xml);
 
-		if (is_null($array)) {
-			return null;
-		}
+        if (is_null($array)) {
+            return null;
+        }
 
-		if (!array_key_exists('info', $array)) {
-			$array['info'] = [];
-		}
-		if (!array_key_exists('remote', $array)) {
-			$array['remote'] = [];
-		}
-		if (!array_key_exists('public', $array)) {
-			$array['public'] = [];
-		}
-		if (!array_key_exists('types', $array)) {
-			$array['types'] = [];
-		}
-		if (!array_key_exists('repair-steps', $array)) {
-			$array['repair-steps'] = [];
-		}
-		if (!array_key_exists('install', $array['repair-steps'])) {
-			$array['repair-steps']['install'] = [];
-		}
-		if (!array_key_exists('pre-migration', $array['repair-steps'])) {
-			$array['repair-steps']['pre-migration'] = [];
-		}
-		if (!array_key_exists('post-migration', $array['repair-steps'])) {
-			$array['repair-steps']['post-migration'] = [];
-		}
-		if (!array_key_exists('live-migration', $array['repair-steps'])) {
-			$array['repair-steps']['live-migration'] = [];
-		}
-		if (!array_key_exists('uninstall', $array['repair-steps'])) {
-			$array['repair-steps']['uninstall'] = [];
-		}
-		if (!array_key_exists('background-jobs', $array)) {
-			$array['background-jobs'] = [];
-		}
-		if (!array_key_exists('two-factor-providers', $array)) {
-			$array['two-factor-providers'] = [];
-		}
-		if (!array_key_exists('commands', $array)) {
-			$array['commands'] = [];
-		}
-		if (!array_key_exists('activity', $array)) {
-			$array['activity'] = [];
-		}
-		if (!array_key_exists('filters', $array['activity'])) {
-			$array['activity']['filters'] = [];
-		}
-		if (!array_key_exists('settings', $array['activity'])) {
-			$array['activity']['settings'] = [];
-		}
-		if (!array_key_exists('providers', $array['activity'])) {
-			$array['activity']['providers'] = [];
-		}
-		if (!array_key_exists('settings', $array)) {
-			$array['settings'] = [];
-		}
-		if (!array_key_exists('admin', $array['settings'])) {
-			$array['settings']['admin'] = [];
-		}
-		if (!array_key_exists('admin-section', $array['settings'])) {
-			$array['settings']['admin-section'] = [];
-		}
-		if (!array_key_exists('personal', $array['settings'])) {
-			$array['settings']['personal'] = [];
-		}
-		if (!array_key_exists('personal-section', $array['settings'])) {
-			$array['settings']['personal-section'] = [];
-		}
+        if (!array_key_exists('info', $array)) {
+            $array['info'] = [];
+        }
+        if (!array_key_exists('remote', $array)) {
+            $array['remote'] = [];
+        }
+        if (!array_key_exists('public', $array)) {
+            $array['public'] = [];
+        }
+        if (!array_key_exists('types', $array)) {
+            $array['types'] = [];
+        }
+        if (!array_key_exists('repair-steps', $array)) {
+            $array['repair-steps'] = [];
+        }
+        if (!array_key_exists('install', $array['repair-steps'])) {
+            $array['repair-steps']['install'] = [];
+        }
+        if (!array_key_exists('pre-migration', $array['repair-steps'])) {
+            $array['repair-steps']['pre-migration'] = [];
+        }
+        if (!array_key_exists('post-migration', $array['repair-steps'])) {
+            $array['repair-steps']['post-migration'] = [];
+        }
+        if (!array_key_exists('live-migration', $array['repair-steps'])) {
+            $array['repair-steps']['live-migration'] = [];
+        }
+        if (!array_key_exists('uninstall', $array['repair-steps'])) {
+            $array['repair-steps']['uninstall'] = [];
+        }
+        if (!array_key_exists('background-jobs', $array)) {
+            $array['background-jobs'] = [];
+        }
+        if (!array_key_exists('two-factor-providers', $array)) {
+            $array['two-factor-providers'] = [];
+        }
+        if (!array_key_exists('commands', $array)) {
+            $array['commands'] = [];
+        }
+        if (!array_key_exists('activity', $array)) {
+            $array['activity'] = [];
+        }
+        if (!array_key_exists('filters', $array['activity'])) {
+            $array['activity']['filters'] = [];
+        }
+        if (!array_key_exists('settings', $array['activity'])) {
+            $array['activity']['settings'] = [];
+        }
+        if (!array_key_exists('providers', $array['activity'])) {
+            $array['activity']['providers'] = [];
+        }
+        if (!array_key_exists('settings', $array)) {
+            $array['settings'] = [];
+        }
+        if (!array_key_exists('admin', $array['settings'])) {
+            $array['settings']['admin'] = [];
+        }
+        if (!array_key_exists('admin-section', $array['settings'])) {
+            $array['settings']['admin-section'] = [];
+        }
+        if (!array_key_exists('personal', $array['settings'])) {
+            $array['settings']['personal'] = [];
+        }
+        if (!array_key_exists('personal-section', $array['settings'])) {
+            $array['settings']['personal-section'] = [];
+        }
 
-		if (array_key_exists('types', $array)) {
-			if (is_array($array['types'])) {
-				foreach ($array['types'] as $type => $v) {
-					unset($array['types'][$type]);
-					if (is_string($type)) {
-						$array['types'][] = $type;
-					}
-				}
-			} else {
-				$array['types'] = [];
-			}
-		}
-		if (isset($array['repair-steps']['install']['step']) && is_array($array['repair-steps']['install']['step'])) {
-			$array['repair-steps']['install'] = $array['repair-steps']['install']['step'];
-		}
-		if (isset($array['repair-steps']['pre-migration']['step']) && is_array($array['repair-steps']['pre-migration']['step'])) {
-			$array['repair-steps']['pre-migration'] = $array['repair-steps']['pre-migration']['step'];
-		}
-		if (isset($array['repair-steps']['post-migration']['step']) && is_array($array['repair-steps']['post-migration']['step'])) {
-			$array['repair-steps']['post-migration'] = $array['repair-steps']['post-migration']['step'];
-		}
-		if (isset($array['repair-steps']['live-migration']['step']) && is_array($array['repair-steps']['live-migration']['step'])) {
-			$array['repair-steps']['live-migration'] = $array['repair-steps']['live-migration']['step'];
-		}
-		if (isset($array['repair-steps']['uninstall']['step']) && is_array($array['repair-steps']['uninstall']['step'])) {
-			$array['repair-steps']['uninstall'] = $array['repair-steps']['uninstall']['step'];
-		}
-		if (isset($array['background-jobs']['job']) && is_array($array['background-jobs']['job'])) {
-			$array['background-jobs'] = $array['background-jobs']['job'];
-		}
-		if (isset($array['commands']['command']) && is_array($array['commands']['command'])) {
-			$array['commands'] = $array['commands']['command'];
-		}
-		if (isset($array['two-factor-providers']['provider']) && is_array($array['two-factor-providers']['provider'])) {
-			$array['two-factor-providers'] = $array['two-factor-providers']['provider'];
-		}
-		if (isset($array['activity']['filters']['filter']) && is_array($array['activity']['filters']['filter'])) {
-			$array['activity']['filters'] = $array['activity']['filters']['filter'];
-		}
-		if (isset($array['activity']['settings']['setting']) && is_array($array['activity']['settings']['setting'])) {
-			$array['activity']['settings'] = $array['activity']['settings']['setting'];
-		}
-		if (isset($array['activity']['providers']['provider']) && is_array($array['activity']['providers']['provider'])) {
-			$array['activity']['providers'] = $array['activity']['providers']['provider'];
-		}
-		if (isset($array['collaboration']['collaborators']['searchPlugins']['searchPlugin'])
-			&& is_array($array['collaboration']['collaborators']['searchPlugins']['searchPlugin'])
-			&& !isset($array['collaboration']['collaborators']['searchPlugins']['searchPlugin']['class'])
-		) {
-			$array['collaboration']['collaborators']['searchPlugins'] = $array['collaboration']['collaborators']['searchPlugins']['searchPlugin'];
-		}
-		if (isset($array['settings']['admin']) && !is_array($array['settings']['admin'])) {
-			$array['settings']['admin'] = [$array['settings']['admin']];
-		}
-		if (isset($array['settings']['admin-section']) && !is_array($array['settings']['admin-section'])) {
-			$array['settings']['admin-section'] = [$array['settings']['admin-section']];
-		}
-		if (isset($array['settings']['personal']) && !is_array($array['settings']['personal'])) {
-			$array['settings']['personal'] = [$array['settings']['personal']];
-		}
-		if (isset($array['settings']['personal-section']) && !is_array($array['settings']['personal-section'])) {
-			$array['settings']['personal-section'] = [$array['settings']['personal-section']];
-		}
+        if (array_key_exists('types', $array)) {
+            if (is_array($array['types'])) {
+                foreach ($array['types'] as $type => $v) {
+                    unset($array['types'][$type]);
+                    if (is_string($type)) {
+                        $array['types'][] = $type;
+                    }
+                }
+            } else {
+                $array['types'] = [];
+            }
+        }
+        if (isset($array['repair-steps']['install']['step']) && is_array($array['repair-steps']['install']['step'])) {
+            $array['repair-steps']['install'] = $array['repair-steps']['install']['step'];
+        }
+        if (isset($array['repair-steps']['pre-migration']['step']) && is_array($array['repair-steps']['pre-migration']['step'])) {
+            $array['repair-steps']['pre-migration'] = $array['repair-steps']['pre-migration']['step'];
+        }
+        if (isset($array['repair-steps']['post-migration']['step']) && is_array($array['repair-steps']['post-migration']['step'])) {
+            $array['repair-steps']['post-migration'] = $array['repair-steps']['post-migration']['step'];
+        }
+        if (isset($array['repair-steps']['live-migration']['step']) && is_array($array['repair-steps']['live-migration']['step'])) {
+            $array['repair-steps']['live-migration'] = $array['repair-steps']['live-migration']['step'];
+        }
+        if (isset($array['repair-steps']['uninstall']['step']) && is_array($array['repair-steps']['uninstall']['step'])) {
+            $array['repair-steps']['uninstall'] = $array['repair-steps']['uninstall']['step'];
+        }
+        if (isset($array['background-jobs']['job']) && is_array($array['background-jobs']['job'])) {
+            $array['background-jobs'] = $array['background-jobs']['job'];
+        }
+        if (isset($array['commands']['command']) && is_array($array['commands']['command'])) {
+            $array['commands'] = $array['commands']['command'];
+        }
+        if (isset($array['two-factor-providers']['provider']) && is_array($array['two-factor-providers']['provider'])) {
+            $array['two-factor-providers'] = $array['two-factor-providers']['provider'];
+        }
+        if (isset($array['activity']['filters']['filter']) && is_array($array['activity']['filters']['filter'])) {
+            $array['activity']['filters'] = $array['activity']['filters']['filter'];
+        }
+        if (isset($array['activity']['settings']['setting']) && is_array($array['activity']['settings']['setting'])) {
+            $array['activity']['settings'] = $array['activity']['settings']['setting'];
+        }
+        if (isset($array['activity']['providers']['provider']) && is_array($array['activity']['providers']['provider'])) {
+            $array['activity']['providers'] = $array['activity']['providers']['provider'];
+        }
+        if (isset($array['collaboration']['collaborators']['searchPlugins']['searchPlugin'])
+            && is_array($array['collaboration']['collaborators']['searchPlugins']['searchPlugin'])
+            && !isset($array['collaboration']['collaborators']['searchPlugins']['searchPlugin']['class'])
+        ) {
+            $array['collaboration']['collaborators']['searchPlugins'] = $array['collaboration']['collaborators']['searchPlugins']['searchPlugin'];
+        }
+        if (isset($array['settings']['admin']) && !is_array($array['settings']['admin'])) {
+            $array['settings']['admin'] = [$array['settings']['admin']];
+        }
+        if (isset($array['settings']['admin-section']) && !is_array($array['settings']['admin-section'])) {
+            $array['settings']['admin-section'] = [$array['settings']['admin-section']];
+        }
+        if (isset($array['settings']['personal']) && !is_array($array['settings']['personal'])) {
+            $array['settings']['personal'] = [$array['settings']['personal']];
+        }
+        if (isset($array['settings']['personal-section']) && !is_array($array['settings']['personal-section'])) {
+            $array['settings']['personal-section'] = [$array['settings']['personal-section']];
+        }
 
-		if(!is_null($this->cache)) {
-			$this->cache->set($fileCacheKey, json_encode($array));
-		}
-		return $array;
-	}
+        if(!is_null($this->cache)) {
+            $this->cache->set($fileCacheKey, json_encode($array));
+        }
+        return $array;
+    }
 
-	/**
-	 * @param \SimpleXMLElement $xml
-	 * @return array
-	 */
-	public function xmlToArray($xml) {
-		if (!$xml->children()) {
-			return (string)$xml;
-		}
+    /**
+     * @param \SimpleXMLElement $xml
+     * @return array
+     */
+    public function xmlToArray($xml) {
+        if (!$xml->children()) {
+            return (string)$xml;
+        }
 
-		$array = [];
-		foreach ($xml->children() as $element => $node) {
-			$totalElement = count($xml->{$element});
+        $array = [];
+        foreach ($xml->children() as $element => $node) {
+            $totalElement = count($xml->{$element});
 
-			if (!isset($array[$element])) {
-				$array[$element] = $totalElement > 1 ? [] : "";
-			}
-			/** @var \SimpleXMLElement $node */
-			// Has attributes
-			if ($attributes = $node->attributes()) {
-				$data = [
-					'@attributes' => [],
-				];
-				if (!count($node->children())){
-					$value = (string)$node;
-					if (!empty($value)) {
-						$data['@value'] = (string)$node;
-					}
-				} else {
-					$data = array_merge($data, $this->xmlToArray($node));
-				}
-				foreach ($attributes as $attr => $value) {
-					$data['@attributes'][$attr] = (string)$value;
-				}
+            if (!isset($array[$element])) {
+                $array[$element] = $totalElement > 1 ? [] : "";
+            }
+            /** @var \SimpleXMLElement $node */
+            // Has attributes
+            if ($attributes = $node->attributes()) {
+                $data = [
+                    '@attributes' => [],
+                ];
+                if (!count($node->children())){
+                    $value = (string)$node;
+                    if (!empty($value)) {
+                        $data['@value'] = (string)$node;
+                    }
+                } else {
+                    $data = array_merge($data, $this->xmlToArray($node));
+                }
+                foreach ($attributes as $attr => $value) {
+                    $data['@attributes'][$attr] = (string)$value;
+                }
 
-				if ($totalElement > 1) {
-					$array[$element][] = $data;
-				} else {
-					$array[$element] = $data;
-				}
-				// Just a value
-			} else {
-				if ($totalElement > 1) {
-					$array[$element][] = $this->xmlToArray($node);
-				} else {
-					$array[$element] = $this->xmlToArray($node);
-				}
-			}
-		}
+                if ($totalElement > 1) {
+                    $array[$element][] = $data;
+                } else {
+                    $array[$element] = $data;
+                }
+                // Just a value
+            } else {
+                if ($totalElement > 1) {
+                    $array[$element][] = $this->xmlToArray($node);
+                } else {
+                    $array[$element] = $this->xmlToArray($node);
+                }
+            }
+        }
 
-		return $array;
-	}
+        return $array;
+    }
 }

lib/private/Remote/Credentials.php

Indentation +24 added lines, -24 removed lines

@@ -25,31 +25,31 @@
 use OCP\Remote\ICredentials;
 
 class Credentials implements ICredentials {
-	/** @var string */
-	private $user;
-	/** @var string */
-	private $password;
+    /** @var string */
+    private $user;
+    /** @var string */
+    private $password;
 
-	/**
-	 * @param string $user
-	 * @param string $password
-	 */
-	public function __construct($user, $password) {
-		$this->user = $user;
-		$this->password = $password;
-	}
+    /**
+     * @param string $user
+     * @param string $password
+     */
+    public function __construct($user, $password) {
+        $this->user = $user;
+        $this->password = $password;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getUsername() {
-		return $this->user;
-	}
+    /**
+     * @return string
+     */
+    public function getUsername() {
+        return $this->user;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getPassword() {
-		return $this->password;
-	}
+    /**
+     * @return string
+     */
+    public function getPassword() {
+        return $this->password;
+    }
 }

lib/public/Remote/Api/IUserApi.php

Indentation +7 added lines, -7 removed lines

@@ -27,11 +27,11 @@
  * @since 13.0.0
  */
 interface IUserApi {
-	/**
-	 * @param string $userId
-	 * @return IUser
-	 *
-	 * @since 13.0.0
-	 */
-	public function getUser($userId);
+    /**
+     * @param string $userId
+     * @return IUser
+     *
+     * @since 13.0.0
+     */
+    public function getUser($userId);
 }

lib/public/Remote/Api/ICapabilitiesApi.php

Indentation +6 added lines, -6 removed lines

@@ -25,10 +25,10 @@
  * @since 13.0.0
  */
 interface ICapabilitiesApi {
-	/**
-	 * @return array The capabilities in the form of [$appId => [$capability => $value]]
-	 *
-	 * @since 13.0.0
-	 */
-	public function getCapabilities();
+    /**
+     * @return array The capabilities in the form of [$appId => [$capability => $value]]
+     *
+     * @since 13.0.0
+     */
+    public function getCapabilities();
 }

lib/public/Remote/Api/IApiFactory.php

Indentation +8 added lines, -8 removed lines

@@ -28,12 +28,12 @@
  * @since 13.0.0
  */
 interface IApiFactory {
-	/**
-	 * @param IInstance $instance
-	 * @param ICredentials $credentials
-	 * @return IApiCollection
-	 *
-	 * @since 13.0.0
-	 */
-	public function getApiCollection(IInstance $instance, ICredentials $credentials);
+    /**
+     * @param IInstance $instance
+     * @param ICredentials $credentials
+     * @return IApiCollection
+     *
+     * @since 13.0.0
+     */
+    public function getApiCollection(IInstance $instance, ICredentials $credentials);
 }