Completed
Pull Request — master (#4617)
by Julius
14:00
created
lib/public/Search/Provider.php 1 patch
Indentation   +51 added lines, -51 removed lines patch added patch discarded remove patch
@@ -32,60 +32,60 @@
 block discarded – undo
32 32
  */
33 33
 abstract class Provider {
34 34
 
35
-	/**
36
-	 * @since 8.0.0
37
-	 */
38
-	const OPTION_APPS = 'apps';
35
+    /**
36
+     * @since 8.0.0
37
+     */
38
+    const OPTION_APPS = 'apps';
39 39
 
40
-	/**
41
-	 * List of options
42
-	 * @var array
43
-	 * @since 7.0.0
44
-	 */
45
-	protected $options;
40
+    /**
41
+     * List of options
42
+     * @var array
43
+     * @since 7.0.0
44
+     */
45
+    protected $options;
46 46
 
47
-	/**
48
-	 * Constructor
49
-	 * @param array $options as key => value
50
-	 * @since 7.0.0 - default value for $options was added in 8.0.0
51
-	 */
52
-	public function __construct($options = array()) {
53
-		$this->options = $options;
54
-	}
47
+    /**
48
+     * Constructor
49
+     * @param array $options as key => value
50
+     * @since 7.0.0 - default value for $options was added in 8.0.0
51
+     */
52
+    public function __construct($options = array()) {
53
+        $this->options = $options;
54
+    }
55 55
 
56
-	/**
57
-	 * get a value from the options array or null
58
-	 * @param string $key
59
-	 * @return mixed
60
-	 * @since 8.0.0
61
-	 */
62
-	public function getOption($key) {
63
-		if (is_array($this->options) && isset($this->options[$key])) {
64
-			return $this->options[$key];
65
-		} else {
66
-			return null;
67
-		}
68
-	}
56
+    /**
57
+     * get a value from the options array or null
58
+     * @param string $key
59
+     * @return mixed
60
+     * @since 8.0.0
61
+     */
62
+    public function getOption($key) {
63
+        if (is_array($this->options) && isset($this->options[$key])) {
64
+            return $this->options[$key];
65
+        } else {
66
+            return null;
67
+        }
68
+    }
69 69
 
70
-	/**
71
-	 * checks if the given apps and the apps this provider has results for intersect
72
-	 * returns true if the given array is empty (all apps)
73
-	 * or if this provider does not have a list of apps it provides results for (legacy search providers)
74
-	 * or if the two above arrays have elements in common (intersect)
75
-	 * @param string[] $apps
76
-	 * @return bool
77
-	 * @since 8.0.0
78
-	 */
79
-	public function providesResultsFor(array $apps = array()) {
80
-		$forApps = $this->getOption(self::OPTION_APPS);
81
-		return empty($apps) || empty($forApps) || array_intersect($forApps, $apps);
82
-	}
70
+    /**
71
+     * checks if the given apps and the apps this provider has results for intersect
72
+     * returns true if the given array is empty (all apps)
73
+     * or if this provider does not have a list of apps it provides results for (legacy search providers)
74
+     * or if the two above arrays have elements in common (intersect)
75
+     * @param string[] $apps
76
+     * @return bool
77
+     * @since 8.0.0
78
+     */
79
+    public function providesResultsFor(array $apps = array()) {
80
+        $forApps = $this->getOption(self::OPTION_APPS);
81
+        return empty($apps) || empty($forApps) || array_intersect($forApps, $apps);
82
+    }
83 83
 
84
-	/**
85
-	 * Search for $query
86
-	 * @param string $query
87
-	 * @return array An array of OCP\Search\Result's
88
-	 * @since 7.0.0
89
-	 */
90
-	abstract public function search($query);
84
+    /**
85
+     * Search for $query
86
+     * @param string $query
87
+     * @return array An array of OCP\Search\Result's
88
+     * @since 7.0.0
89
+     */
90
+    abstract public function search($query);
91 91
 }
Please login to merge, or discard this patch.
lib/public/Search/Result.php 1 patch
Indentation   +39 added lines, -39 removed lines patch added patch discarded remove patch
@@ -31,47 +31,47 @@
 block discarded – undo
31 31
  */
32 32
 class Result {
33 33
 
34
-	/**
35
-	 * A unique identifier for the result, usually given as the item ID in its
36
-	 * corresponding application.
37
-	 * @var string
38
-	 * @since 7.0.0
39
-	 */
40
-	public $id;
34
+    /**
35
+     * A unique identifier for the result, usually given as the item ID in its
36
+     * corresponding application.
37
+     * @var string
38
+     * @since 7.0.0
39
+     */
40
+    public $id;
41 41
 
42
-	/**
43
-	 * The name of the item returned; this will be displayed in the search
44
-	 * results.
45
-	 * @var string
46
-	 * @since 7.0.0
47
-	 */
48
-	public $name;
42
+    /**
43
+     * The name of the item returned; this will be displayed in the search
44
+     * results.
45
+     * @var string
46
+     * @since 7.0.0
47
+     */
48
+    public $name;
49 49
 
50
-	/**
51
-	 * URL to the application item.
52
-	 * @var string
53
-	 * @since 7.0.0
54
-	 */
55
-	public $link;
50
+    /**
51
+     * URL to the application item.
52
+     * @var string
53
+     * @since 7.0.0
54
+     */
55
+    public $link;
56 56
 
57
-	/**
58
-	 * The type of search result returned; for consistency, name this the same
59
-	 * as the class name (e.g. \OC\Search\File -> 'file') in lowercase. 
60
-	 * @var string
61
-	 * @since 7.0.0
62
-	 */
63
-	public $type = 'generic';
57
+    /**
58
+     * The type of search result returned; for consistency, name this the same
59
+     * as the class name (e.g. \OC\Search\File -> 'file') in lowercase. 
60
+     * @var string
61
+     * @since 7.0.0
62
+     */
63
+    public $type = 'generic';
64 64
 
65
-	/**
66
-	 * Create a new search result
67
-	 * @param string $id unique identifier from application: '[app_name]/[item_identifier_in_app]'
68
-	 * @param string $name displayed text of result
69
-	 * @param string $link URL to the result within its app
70
-	 * @since 7.0.0
71
-	 */
72
-	public function __construct($id = null, $name = null, $link = null) {
73
-		$this->id = $id;
74
-		$this->name = $name;
75
-		$this->link = $link;
76
-	}
65
+    /**
66
+     * Create a new search result
67
+     * @param string $id unique identifier from application: '[app_name]/[item_identifier_in_app]'
68
+     * @param string $name displayed text of result
69
+     * @param string $link URL to the result within its app
70
+     * @since 7.0.0
71
+     */
72
+    public function __construct($id = null, $name = null, $link = null) {
73
+        $this->id = $id;
74
+        $this->name = $name;
75
+        $this->link = $link;
76
+    }
77 77
 }
Please login to merge, or discard this patch.
lib/public/Search/PagedProvider.php 1 patch
Indentation   +32 added lines, -32 removed lines patch added patch discarded remove patch
@@ -30,39 +30,39 @@
 block discarded – undo
30 30
  */
31 31
 abstract class PagedProvider extends Provider {
32 32
 
33
-	/**
34
-	 * show all results
35
-	 * @since 8.0.0
36
-	 */
37
-	const SIZE_ALL = 0;
33
+    /**
34
+     * show all results
35
+     * @since 8.0.0
36
+     */
37
+    const SIZE_ALL = 0;
38 38
 
39
-	/**
40
-	 * Constructor
41
-	 * @param array $options
42
-	 * @since 8.0.0
43
-	 */
44
-	public function __construct($options) {
45
-		$this->options = $options;
46
-	}
39
+    /**
40
+     * Constructor
41
+     * @param array $options
42
+     * @since 8.0.0
43
+     */
44
+    public function __construct($options) {
45
+        $this->options = $options;
46
+    }
47 47
 
48
-	/**
49
-	 * Search for $query
50
-	 * @param string $query
51
-	 * @return array An array of OCP\Search\Result's
52
-	 * @since 8.0.0
53
-	 */
54
-	public function search($query) {
55
-		// old apps might assume they get all results, so we use SIZE_ALL
56
-		$this->searchPaged($query, 1, self::SIZE_ALL);
57
-	}
48
+    /**
49
+     * Search for $query
50
+     * @param string $query
51
+     * @return array An array of OCP\Search\Result's
52
+     * @since 8.0.0
53
+     */
54
+    public function search($query) {
55
+        // old apps might assume they get all results, so we use SIZE_ALL
56
+        $this->searchPaged($query, 1, self::SIZE_ALL);
57
+    }
58 58
 
59
-	/**
60
-	 * Search for $query
61
-	 * @param string $query
62
-	 * @param int $page pages start at page 1
63
-	 * @param int $size 0 = SIZE_ALL
64
-	 * @return array An array of OCP\Search\Result's
65
-	 * @since 8.0.0
66
-	 */
67
-	abstract public function searchPaged($query, $page, $size);
59
+    /**
60
+     * Search for $query
61
+     * @param string $query
62
+     * @param int $page pages start at page 1
63
+     * @param int $size 0 = SIZE_ALL
64
+     * @return array An array of OCP\Search\Result's
65
+     * @since 8.0.0
66
+     */
67
+    abstract public function searchPaged($query, $page, $size);
68 68
 }
Please login to merge, or discard this patch.
lib/public/Share_Backend_Collection.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -31,11 +31,11 @@
 block discarded – undo
31 31
  * @since 5.0.0
32 32
  */
33 33
 interface Share_Backend_Collection extends Share_Backend {
34
-	/**
35
-	 * Get the sources of the children of the item
36
-	 * @param string $itemSource
37
-	 * @return array Returns an array of children each inside an array with the keys: source, target, and file_path if applicable
38
-	 * @since 5.0.0
39
-	 */
40
-	public function getChildren($itemSource);
34
+    /**
35
+     * Get the sources of the children of the item
36
+     * @param string $itemSource
37
+     * @return array Returns an array of children each inside an array with the keys: source, target, and file_path if applicable
38
+     * @since 5.0.0
39
+     */
40
+    public function getChildren($itemSource);
41 41
 }
Please login to merge, or discard this patch.
lib/public/AppFramework/Utility/ITimeFactory.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -31,10 +31,10 @@
 block discarded – undo
31 31
  */
32 32
 interface ITimeFactory {
33 33
 
34
-	/**
35
-	 * @return int the result of a call to time()
36
-	 * @since 8.0.0
37
-	 */
38
-	public function getTime();
34
+    /**
35
+     * @return int the result of a call to time()
36
+     * @since 8.0.0
37
+     */
38
+    public function getTime();
39 39
 
40 40
 }
Please login to merge, or discard this patch.
lib/public/AppFramework/Utility/IControllerMethodReflector.php 1 patch
Indentation   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -34,38 +34,38 @@
 block discarded – undo
34 34
  */
35 35
 interface IControllerMethodReflector {
36 36
 
37
-	/**
38
-	 * @param object $object an object or classname
39
-	 * @param string $method the method which we want to inspect
40
-	 * @return void
41
-	 * @since 8.0.0
42
-	 */
43
-	public function reflect($object, $method);
37
+    /**
38
+     * @param object $object an object or classname
39
+     * @param string $method the method which we want to inspect
40
+     * @return void
41
+     * @since 8.0.0
42
+     */
43
+    public function reflect($object, $method);
44 44
 
45
-	/**
46
-	 * Inspects the PHPDoc parameters for types
47
-	 *
48
-	 * @param string $parameter the parameter whose type comments should be
49
-	 * parsed
50
-	 * @return string|null type in the type parameters (@param int $something)
51
-	 * would return int or null if not existing
52
-	 * @since 8.0.0
53
-	 */
54
-	public function getType($parameter);
45
+    /**
46
+     * Inspects the PHPDoc parameters for types
47
+     *
48
+     * @param string $parameter the parameter whose type comments should be
49
+     * parsed
50
+     * @return string|null type in the type parameters (@param int $something)
51
+     * would return int or null if not existing
52
+     * @since 8.0.0
53
+     */
54
+    public function getType($parameter);
55 55
 
56
-	/**
57
-	 * @return array the arguments of the method with key => default value
58
-	 * @since 8.0.0
59
-	 */
60
-	public function getParameters();
56
+    /**
57
+     * @return array the arguments of the method with key => default value
58
+     * @since 8.0.0
59
+     */
60
+    public function getParameters();
61 61
 
62
-	/**
63
-	 * Check if a method contains an annotation
64
-	 *
65
-	 * @param string $name the name of the annotation
66
-	 * @return bool true if the annotation is found
67
-	 * @since 8.0.0
68
-	 */
69
-	public function hasAnnotation($name);
62
+    /**
63
+     * Check if a method contains an annotation
64
+     *
65
+     * @param string $name the name of the annotation
66
+     * @return bool true if the annotation is found
67
+     * @since 8.0.0
68
+     */
69
+    public function hasAnnotation($name);
70 70
 
71 71
 }
Please login to merge, or discard this patch.
lib/public/AppFramework/OCSController.php 1 patch
Indentation   +64 added lines, -64 removed lines patch added patch discarded remove patch
@@ -42,73 +42,73 @@
 block discarded – undo
42 42
  */
43 43
 abstract class OCSController extends ApiController {
44 44
 
45
-	/** @var int */
46
-	private $ocsVersion;
45
+    /** @var int */
46
+    private $ocsVersion;
47 47
 
48
-	/**
49
-	 * constructor of the controller
50
-	 * @param string $appName the name of the app
51
-	 * @param IRequest $request an instance of the request
52
-	 * @param string $corsMethods comma separated string of HTTP verbs which
53
-	 * should be allowed for websites or webapps when calling your API, defaults to
54
-	 * 'PUT, POST, GET, DELETE, PATCH'
55
-	 * @param string $corsAllowedHeaders comma separated string of HTTP headers
56
-	 * which should be allowed for websites or webapps when calling your API,
57
-	 * defaults to 'Authorization, Content-Type, Accept'
58
-	 * @param int $corsMaxAge number in seconds how long a preflighted OPTIONS
59
-	 * request should be cached, defaults to 1728000 seconds
60
-	 * @since 8.1.0
61
-	 */
62
-	public function __construct($appName,
63
-								IRequest $request,
64
-								$corsMethods='PUT, POST, GET, DELETE, PATCH',
65
-								$corsAllowedHeaders='Authorization, Content-Type, Accept',
66
-								$corsMaxAge=1728000){
67
-		parent::__construct($appName, $request, $corsMethods,
68
-							$corsAllowedHeaders, $corsMaxAge);
69
-		$this->registerResponder('json', function ($data) {
70
-			return $this->buildOCSResponse('json', $data);
71
-		});
72
-		$this->registerResponder('xml', function ($data) {
73
-			return $this->buildOCSResponse('xml', $data);
74
-		});
75
-	}
48
+    /**
49
+     * constructor of the controller
50
+     * @param string $appName the name of the app
51
+     * @param IRequest $request an instance of the request
52
+     * @param string $corsMethods comma separated string of HTTP verbs which
53
+     * should be allowed for websites or webapps when calling your API, defaults to
54
+     * 'PUT, POST, GET, DELETE, PATCH'
55
+     * @param string $corsAllowedHeaders comma separated string of HTTP headers
56
+     * which should be allowed for websites or webapps when calling your API,
57
+     * defaults to 'Authorization, Content-Type, Accept'
58
+     * @param int $corsMaxAge number in seconds how long a preflighted OPTIONS
59
+     * request should be cached, defaults to 1728000 seconds
60
+     * @since 8.1.0
61
+     */
62
+    public function __construct($appName,
63
+                                IRequest $request,
64
+                                $corsMethods='PUT, POST, GET, DELETE, PATCH',
65
+                                $corsAllowedHeaders='Authorization, Content-Type, Accept',
66
+                                $corsMaxAge=1728000){
67
+        parent::__construct($appName, $request, $corsMethods,
68
+                            $corsAllowedHeaders, $corsMaxAge);
69
+        $this->registerResponder('json', function ($data) {
70
+            return $this->buildOCSResponse('json', $data);
71
+        });
72
+        $this->registerResponder('xml', function ($data) {
73
+            return $this->buildOCSResponse('xml', $data);
74
+        });
75
+    }
76 76
 
77
-	/**
78
-	 * @param int $version
79
-	 * @since 11.0.0
80
-	 * @internal
81
-	 */
82
-	public function setOCSVersion($version) {
83
-		$this->ocsVersion = $version;
84
-	}
77
+    /**
78
+     * @param int $version
79
+     * @since 11.0.0
80
+     * @internal
81
+     */
82
+    public function setOCSVersion($version) {
83
+        $this->ocsVersion = $version;
84
+    }
85 85
 
86
-	/**
87
-	 * Since the OCS endpoints default to XML we need to find out the format
88
-	 * again
89
-	 * @param mixed $response the value that was returned from a controller and
90
-	 * is not a Response instance
91
-	 * @param string $format the format for which a formatter has been registered
92
-	 * @throws \DomainException if format does not match a registered formatter
93
-	 * @return Response
94
-	 * @since 9.1.0
95
-	 */
96
-	public function buildResponse($response, $format = 'xml') {
97
-		return parent::buildResponse($response, $format);
98
-	}
86
+    /**
87
+     * Since the OCS endpoints default to XML we need to find out the format
88
+     * again
89
+     * @param mixed $response the value that was returned from a controller and
90
+     * is not a Response instance
91
+     * @param string $format the format for which a formatter has been registered
92
+     * @throws \DomainException if format does not match a registered formatter
93
+     * @return Response
94
+     * @since 9.1.0
95
+     */
96
+    public function buildResponse($response, $format = 'xml') {
97
+        return parent::buildResponse($response, $format);
98
+    }
99 99
 
100
-	/**
101
-	 * Unwrap data and build ocs response
102
-	 * @param string $format json or xml
103
-	 * @param DataResponse $data the data which should be transformed
104
-	 * @since 8.1.0
105
-	 * @return \OC\AppFramework\OCS\BaseResponse
106
-	 */
107
-	private function buildOCSResponse($format, DataResponse $data) {
108
-		if ($this->ocsVersion === 1) {
109
-			return new \OC\AppFramework\OCS\V1Response($data, $format);
110
-		}
111
-		return new \OC\AppFramework\OCS\V2Response($data, $format);
112
-	}
100
+    /**
101
+     * Unwrap data and build ocs response
102
+     * @param string $format json or xml
103
+     * @param DataResponse $data the data which should be transformed
104
+     * @since 8.1.0
105
+     * @return \OC\AppFramework\OCS\BaseResponse
106
+     */
107
+    private function buildOCSResponse($format, DataResponse $data) {
108
+        if ($this->ocsVersion === 1) {
109
+            return new \OC\AppFramework\OCS\V1Response($data, $format);
110
+        }
111
+        return new \OC\AppFramework\OCS\V2Response($data, $format);
112
+    }
113 113
 
114 114
 }
Please login to merge, or discard this patch.
lib/public/AppFramework/Http/OCSResponse.php 1 patch
Indentation   +48 added lines, -48 removed lines patch added patch discarded remove patch
@@ -36,58 +36,58 @@
 block discarded – undo
36 36
  */
37 37
 class OCSResponse extends Response {
38 38
 
39
-	private $data;
40
-	private $format;
41
-	private $statuscode;
42
-	private $message;
43
-	private $itemscount;
44
-	private $itemsperpage;
39
+    private $data;
40
+    private $format;
41
+    private $statuscode;
42
+    private $message;
43
+    private $itemscount;
44
+    private $itemsperpage;
45 45
 
46
-	/**
47
-	 * generates the xml or json response for the API call from an multidimenional data array.
48
-	 * @param string $format
49
-	 * @param int $statuscode
50
-	 * @param string $message
51
-	 * @param array $data
52
-	 * @param int|string $itemscount
53
-	 * @param int|string $itemsperpage
54
-	 * @since 8.1.0
55
-	 * @deprecated 9.2.0 To implement an OCS endpoint extend the OCSController
56
-	 */
57
-	public function __construct($format, $statuscode, $message,
58
-								$data=[], $itemscount='',
59
-								$itemsperpage='') {
60
-		$this->format = $format;
61
-		$this->statuscode = $statuscode;
62
-		$this->message = $message;
63
-		$this->data = $data;
64
-		$this->itemscount = $itemscount;
65
-		$this->itemsperpage = $itemsperpage;
46
+    /**
47
+     * generates the xml or json response for the API call from an multidimenional data array.
48
+     * @param string $format
49
+     * @param int $statuscode
50
+     * @param string $message
51
+     * @param array $data
52
+     * @param int|string $itemscount
53
+     * @param int|string $itemsperpage
54
+     * @since 8.1.0
55
+     * @deprecated 9.2.0 To implement an OCS endpoint extend the OCSController
56
+     */
57
+    public function __construct($format, $statuscode, $message,
58
+                                $data=[], $itemscount='',
59
+                                $itemsperpage='') {
60
+        $this->format = $format;
61
+        $this->statuscode = $statuscode;
62
+        $this->message = $message;
63
+        $this->data = $data;
64
+        $this->itemscount = $itemscount;
65
+        $this->itemsperpage = $itemsperpage;
66 66
 
67
-		// set the correct header based on the format parameter
68
-		if ($format === 'json') {
69
-			$this->addHeader(
70
-				'Content-Type', 'application/json; charset=utf-8'
71
-			);
72
-		} else {
73
-			$this->addHeader(
74
-				'Content-Type', 'application/xml; charset=utf-8'
75
-			);
76
-		}
77
-	}
67
+        // set the correct header based on the format parameter
68
+        if ($format === 'json') {
69
+            $this->addHeader(
70
+                'Content-Type', 'application/json; charset=utf-8'
71
+            );
72
+        } else {
73
+            $this->addHeader(
74
+                'Content-Type', 'application/xml; charset=utf-8'
75
+            );
76
+        }
77
+    }
78 78
 
79
-	/**
80
-	 * @return string
81
-	 * @since 8.1.0
82
-	 * @deprecated 9.2.0 To implement an OCS endpoint extend the OCSController
83
-	 */
84
-	public function render() {
85
-		$r = new \OC_OCS_Result($this->data, $this->statuscode, $this->message);
86
-		$r->setTotalItems($this->itemscount);
87
-		$r->setItemsPerPage($this->itemsperpage);
79
+    /**
80
+     * @return string
81
+     * @since 8.1.0
82
+     * @deprecated 9.2.0 To implement an OCS endpoint extend the OCSController
83
+     */
84
+    public function render() {
85
+        $r = new \OC_OCS_Result($this->data, $this->statuscode, $this->message);
86
+        $r->setTotalItems($this->itemscount);
87
+        $r->setItemsPerPage($this->itemsperpage);
88 88
 
89
-		return \OC_API::renderResult($this->format, $r->getMeta(), $r->getData());
90
-	}
89
+        return \OC_API::renderResult($this->format, $r->getMeta(), $r->getData());
90
+    }
91 91
 
92 92
 
93 93
 }
Please login to merge, or discard this patch.
lib/public/AppFramework/Http/RedirectResponse.php 1 patch
Indentation   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -36,27 +36,27 @@
 block discarded – undo
36 36
  */
37 37
 class RedirectResponse extends Response {
38 38
 
39
-	private $redirectURL;
40
-
41
-	/**
42
-	 * Creates a response that redirects to a url
43
-	 * @param string $redirectURL the url to redirect to
44
-	 * @since 7.0.0
45
-	 */
46
-	public function __construct($redirectURL) {
47
-		$this->redirectURL = $redirectURL;
48
-		$this->setStatus(Http::STATUS_SEE_OTHER);
49
-		$this->addHeader('Location', $redirectURL);
50
-	}
51
-
52
-
53
-	/**
54
-	 * @return string the url to redirect
55
-	 * @since 7.0.0
56
-	 */
57
-	public function getRedirectURL() {
58
-		return $this->redirectURL;
59
-	}
39
+    private $redirectURL;
40
+
41
+    /**
42
+     * Creates a response that redirects to a url
43
+     * @param string $redirectURL the url to redirect to
44
+     * @since 7.0.0
45
+     */
46
+    public function __construct($redirectURL) {
47
+        $this->redirectURL = $redirectURL;
48
+        $this->setStatus(Http::STATUS_SEE_OTHER);
49
+        $this->addHeader('Location', $redirectURL);
50
+    }
51
+
52
+
53
+    /**
54
+     * @return string the url to redirect
55
+     * @since 7.0.0
56
+     */
57
+    public function getRedirectURL() {
58
+        return $this->redirectURL;
59
+    }
60 60
 
61 61
 
62 62
 }
Please login to merge, or discard this patch.