Completed
Pull Request — master (#4617)
by Julius
14:00
created
lib/public/AppFramework/Http/FileDisplayResponse.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -43,12 +43,12 @@  discard block
 block discarded – undo
43 43
 	 * @param array $headers
44 44
 	 * @since 11.0.0
45 45
 	 */
46
-	public function __construct($file, $statusCode=Http::STATUS_OK,
47
-								$headers=[]) {
46
+	public function __construct($file, $statusCode = Http::STATUS_OK,
47
+								$headers = []) {
48 48
 		$this->file = $file;
49 49
 		$this->setStatus($statusCode);
50 50
 		$this->setHeaders(array_merge($this->getHeaders(), $headers));
51
-		$this->addHeader('Content-Disposition', 'inline; filename="' . rawurldecode($file->getName()) . '"');
51
+		$this->addHeader('Content-Disposition', 'inline; filename="'.rawurldecode($file->getName()).'"');
52 52
 
53 53
 		$this->setETag($file->getEtag());
54 54
 		$lastModified = new \DateTime();
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 	 */
63 63
 	public function callback(IOutput $output) {
64 64
 		if ($output->getHttpResponseCode() !== Http::STATUS_NOT_MODIFIED) {
65
-			$output->setHeader('Content-Length: ' . $this->file->getSize());
65
+			$output->setHeader('Content-Length: '.$this->file->getSize());
66 66
 			$output->setOutput($this->file->getContent());
67 67
 		}
68 68
 	}
Please login to merge, or discard this patch.
lib/public/AppFramework/Http/TemplateResponse.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -70,8 +70,8 @@  discard block
 block discarded – undo
70 70
 	 * @param string $renderAs how the page should be rendered, defaults to user
71 71
 	 * @since 6.0.0 - parameters $params and $renderAs were added in 7.0.0
72 72
 	 */
73
-	public function __construct($appName, $templateName, array $params=array(),
74
-	                            $renderAs='user') {
73
+	public function __construct($appName, $templateName, array $params = array(),
74
+	                            $renderAs = 'user') {
75 75
 		$this->templateName = $templateName;
76 76
 		$this->appName = $appName;
77 77
 		$this->params = $params;
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
 	 * @return TemplateResponse Reference to this object
87 87
 	 * @since 6.0.0 - return value was added in 7.0.0
88 88
 	 */
89
-	public function setParams(array $params){
89
+	public function setParams(array $params) {
90 90
 		$this->params = $params;
91 91
 
92 92
 		return $this;
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
 	 * @return array the params
99 99
 	 * @since 6.0.0
100 100
 	 */
101
-	public function getParams(){
101
+	public function getParams() {
102 102
 		return $this->params;
103 103
 	}
104 104
 
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
 	 * @return string the name of the used template
109 109
 	 * @since 6.0.0
110 110
 	 */
111
-	public function getTemplateName(){
111
+	public function getTemplateName() {
112 112
 		return $this->templateName;
113 113
 	}
114 114
 
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
 	 * @return TemplateResponse Reference to this object
123 123
 	 * @since 6.0.0 - return value was added in 7.0.0
124 124
 	 */
125
-	public function renderAs($renderAs){
125
+	public function renderAs($renderAs) {
126 126
 		$this->renderAs = $renderAs;
127 127
 
128 128
 		return $this;
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
134 134
 	 * @return string the renderAs value
135 135
 	 * @since 6.0.0
136 136
 	 */
137
-	public function getRenderAs(){
137
+	public function getRenderAs() {
138 138
 		return $this->renderAs;
139 139
 	}
140 140
 
@@ -144,13 +144,13 @@  discard block
 block discarded – undo
144 144
 	 * @return string the rendered html
145 145
 	 * @since 6.0.0
146 146
 	 */
147
-	public function render(){
147
+	public function render() {
148 148
 		// \OCP\Template needs an empty string instead of 'blank' for an unwrapped response
149 149
 		$renderAs = $this->renderAs === 'blank' ? '' : $this->renderAs;
150 150
 
151 151
 		$template = new \OCP\Template($this->appName, $this->templateName, $renderAs);
152 152
 
153
-		foreach($this->params as $key => $value){
153
+		foreach ($this->params as $key => $value) {
154 154
 			$template->assign($key, $value);
155 155
 		}
156 156
 
Please login to merge, or discard this patch.
lib/public/AppFramework/Http/StreamResponse.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 	 * @param string|resource $filePath the path to the file or a file handle which should be streamed
41 41
 	 * @since 8.1.0
42 42
 	 */
43
-	public function __construct ($filePath) {
43
+	public function __construct($filePath) {
44 44
 		$this->filePath = $filePath;
45 45
 	}
46 46
 
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
 	 * @param IOutput $output a small wrapper that handles output
52 52
 	 * @since 8.1.0
53 53
 	 */
54
-	public function callback (IOutput $output) {
54
+	public function callback(IOutput $output) {
55 55
 		// handle caching
56 56
 		if ($output->getHttpResponseCode() !== Http::STATUS_NOT_MODIFIED) {
57 57
 			if (!(is_resource($this->filePath) || file_exists($this->filePath))) {
Please login to merge, or discard this patch.
lib/public/AppFramework/Http/DownloadResponse.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@
 block discarded – undo
45 45
 		$this->filename = $filename;
46 46
 		$this->contentType = $contentType;
47 47
 
48
-		$this->addHeader('Content-Disposition', 'attachment; filename="' . $filename . '"');
48
+		$this->addHeader('Content-Disposition', 'attachment; filename="'.$filename.'"');
49 49
 		$this->addHeader('Content-Type', $contentType);
50 50
 	}
51 51
 
Please login to merge, or discard this patch.
lib/public/AppFramework/App.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@
 block discarded – undo
55 55
 	 * @return string the starting namespace for the app
56 56
 	 * @since 8.0.0
57 57
 	 */
58
-	public static function buildAppNamespace($appId, $topNamespace='OCA\\') {
58
+	public static function buildAppNamespace($appId, $topNamespace = 'OCA\\') {
59 59
 		return \OC\AppFramework\App::buildAppNamespace($appId, $topNamespace);
60 60
 	}
61 61
 
Please login to merge, or discard this patch.
lib/public/AppFramework/Middleware.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 	 *                           the controller
54 54
 	 * @since 6.0.0
55 55
 	 */
56
-	public function beforeController($controller, $methodName){
56
+	public function beforeController($controller, $methodName) {
57 57
 
58 58
 	}
59 59
 
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 	 * @return Response a Response object in case that the exception was handled
74 74
 	 * @since 6.0.0
75 75
 	 */
76
-	public function afterException($controller, $methodName, \Exception $exception){
76
+	public function afterException($controller, $methodName, \Exception $exception) {
77 77
 		throw $exception;
78 78
 	}
79 79
 
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
 	 * @return Response a Response object
90 90
 	 * @since 6.0.0
91 91
 	 */
92
-	public function afterController($controller, $methodName, Response $response){
92
+	public function afterController($controller, $methodName, Response $response) {
93 93
 		return $response;
94 94
 	}
95 95
 
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
 	 * @return string the output that should be printed
106 106
 	 * @since 6.0.0
107 107
 	 */
108
-	public function beforeOutput($controller, $methodName, $output){
108
+	public function beforeOutput($controller, $methodName, $output) {
109 109
 		return $output;
110 110
 	}
111 111
 
Please login to merge, or discard this patch.
lib/public/AppFramework/Controller.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 
79 79
 		// default responders
80 80
 		$this->responders = array(
81
-			'json' => function ($data) {
81
+			'json' => function($data) {
82 82
 				if ($data instanceof DataResponse) {
83 83
 					$response = new JSONResponse(
84 84
 						$data->getData(),
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
 	 * @since 7.0.0
107 107
 	 * @since 9.1.0 Added default parameter
108 108
 	 */
109
-	public function getResponderByHTTPHeader($acceptHeader, $default='json') {
109
+	public function getResponderByHTTPHeader($acceptHeader, $default = 'json') {
110 110
 		$headers = explode(',', $acceptHeader);
111 111
 
112 112
 		// return the first matching responder
@@ -145,8 +145,8 @@  discard block
 block discarded – undo
145 145
 	 * @return Response
146 146
 	 * @since 7.0.0
147 147
 	 */
148
-	public function buildResponse($response, $format='json') {
149
-		if(array_key_exists($format, $this->responders)) {
148
+	public function buildResponse($response, $format = 'json') {
149
+		if (array_key_exists($format, $this->responders)) {
150 150
 
151 151
 			$responder = $this->responders[$format];
152 152
 
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
 
155 155
 		}
156 156
 		throw new \DomainException('No responder registered for format '.
157
-			$format . '!');
157
+			$format.'!');
158 158
 	}
159 159
 
160 160
 
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
 	 * @return mixed the content of the array
172 172
 	 * @since 6.0.0
173 173
 	 */
174
-	public function params($key, $default=null){
174
+	public function params($key, $default = null) {
175 175
 		return $this->request->getParam($key, $default);
176 176
 	}
177 177
 
@@ -246,13 +246,13 @@  discard block
 block discarded – undo
246 246
 	 * @return \OCP\AppFramework\Http\TemplateResponse containing the page
247 247
 	 * @since 6.0.0
248 248
 	 */
249
-	public function render($templateName, array $params=array(),
250
-							$renderAs='user', array $headers=array()){
249
+	public function render($templateName, array $params = array(),
250
+							$renderAs = 'user', array $headers = array()) {
251 251
 		$response = new TemplateResponse($this->appName, $templateName);
252 252
 		$response->setParams($params);
253 253
 		$response->renderAs($renderAs);
254 254
 
255
-		foreach($headers as $name => $value){
255
+		foreach ($headers as $name => $value) {
256 256
 			$response->addHeader($name, $value);
257 257
 		}
258 258
 
Please login to merge, or discard this patch.
lib/public/AppFramework/ApiController.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -59,9 +59,9 @@  discard block
 block discarded – undo
59 59
      */
60 60
     public function __construct($appName,
61 61
                                 IRequest $request,
62
-                                $corsMethods='PUT, POST, GET, DELETE, PATCH',
63
-                                $corsAllowedHeaders='Authorization, Content-Type, Accept',
64
-                                $corsMaxAge=1728000){
62
+                                $corsMethods = 'PUT, POST, GET, DELETE, PATCH',
63
+                                $corsAllowedHeaders = 'Authorization, Content-Type, Accept',
64
+                                $corsMaxAge = 1728000) {
65 65
         parent::__construct($appName, $request);
66 66
         $this->corsMethods = $corsMethods;
67 67
         $this->corsAllowedHeaders = $corsAllowedHeaders;
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
 	 * @since 7.0.0
80 80
      */
81 81
     public function preflightedCors() {
82
-        if(isset($this->request->server['HTTP_ORIGIN'])) {
82
+        if (isset($this->request->server['HTTP_ORIGIN'])) {
83 83
             $origin = $this->request->server['HTTP_ORIGIN'];
84 84
         } else {
85 85
             $origin = '*';
Please login to merge, or discard this patch.
lib/public/AppFramework/Db/MultipleObjectsReturnedException.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@
 block discarded – undo
37 37
 	 * @param string $msg the error message
38 38
 	 * @since 7.0.0
39 39
 	 */
40
-	public function __construct($msg){
40
+	public function __construct($msg) {
41 41
 		parent::__construct($msg);
42 42
 	}
43 43
 
Please login to merge, or discard this patch.