Completed
Pull Request — stable9 (#4232)
by Lukas
25:41 queued 15:25
created
lib/public/user.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -65,8 +65,8 @@  discard block
 block discarded – undo
65 65
 	 * @deprecated 8.1.0 use method search() of \OCP\IUserManager - \OC::$server->getUserManager()
66 66
 	 * @since 5.0.0
67 67
 	 */
68
-	public static function getUsers( $search = '', $limit = null, $offset = null ) {
69
-		return \OC_User::getUsers( $search, $limit, $offset );
68
+	public static function getUsers($search = '', $limit = null, $offset = null) {
69
+		return \OC_User::getUsers($search, $limit, $offset);
70 70
 	}
71 71
 
72 72
 	/**
@@ -77,8 +77,8 @@  discard block
 block discarded – undo
77 77
 	 *                   get() of \OCP\IUserManager - \OC::$server->getUserManager()
78 78
 	 * @since 5.0.0
79 79
 	 */
80
-	public static function getDisplayName( $user = null ) {
81
-		return \OC_User::getDisplayName( $user );
80
+	public static function getDisplayName($user = null) {
81
+		return \OC_User::getDisplayName($user);
82 82
 	}
83 83
 
84 84
 	/**
@@ -90,8 +90,8 @@  discard block
 block discarded – undo
90 90
 	 * @deprecated 8.1.0 use method searchDisplayName() of \OCP\IUserManager - \OC::$server->getUserManager()
91 91
 	 * @since 5.0.0
92 92
 	 */
93
-	public static function getDisplayNames( $search = '', $limit = null, $offset = null ) {
94
-		return \OC_User::getDisplayNames( $search, $limit, $offset );
93
+	public static function getDisplayNames($search = '', $limit = null, $offset = null) {
94
+		return \OC_User::getDisplayNames($search, $limit, $offset);
95 95
 	}
96 96
 
97 97
 	/**
@@ -111,8 +111,8 @@  discard block
 block discarded – undo
111 111
 	 * @deprecated 8.1.0 use method userExists() of \OCP\IUserManager - \OC::$server->getUserManager()
112 112
 	 * @since 5.0.0
113 113
 	 */
114
-	public static function userExists( $uid, $excludingBackend = null ) {
115
-		return \OC_User::userExists( $uid, $excludingBackend );
114
+	public static function userExists($uid, $excludingBackend = null) {
115
+		return \OC_User::userExists($uid, $excludingBackend);
116 116
 	}
117 117
 	/**
118 118
 	 * Logs the user out including all the session data
@@ -134,8 +134,8 @@  discard block
 block discarded – undo
134 134
 	 * @deprecated 8.0.0 Use \OC::$server->getUserManager()->checkPassword();
135 135
 	 * @since 5.0.0
136 136
 	 */
137
-	public static function checkPassword( $uid, $password ) {
138
-		return \OC_User::checkPassword( $uid, $password );
137
+	public static function checkPassword($uid, $password) {
138
+		return \OC_User::checkPassword($uid, $password);
139 139
 	}
140 140
 
141 141
 	/**
Please login to merge, or discard this patch.
lib/public/config.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -57,8 +57,8 @@  discard block
 block discarded – undo
57 57
 	 * This function gets the value from config.php. If it does not exist,
58 58
 	 * $default will be returned.
59 59
 	 */
60
-	public static function getSystemValue( $key, $default = null ) {
61
-		return \OC::$server->getConfig()->getSystemValue( $key, $default );
60
+	public static function getSystemValue($key, $default = null) {
61
+		return \OC::$server->getConfig()->getSystemValue($key, $default);
62 62
 	}
63 63
 
64 64
 	/**
@@ -71,9 +71,9 @@  discard block
 block discarded – undo
71 71
 	 * This function sets the value and writes the config.php. If the file can
72 72
 	 * not be written, false will be returned.
73 73
 	 */
74
-	public static function setSystemValue( $key, $value ) {
74
+	public static function setSystemValue($key, $value) {
75 75
 		try {
76
-			\OC::$server->getConfig()->setSystemValue( $key, $value );
76
+			\OC::$server->getConfig()->setSystemValue($key, $value);
77 77
 		} catch (\Exception $e) {
78 78
 			return false;
79 79
 		}
@@ -87,8 +87,8 @@  discard block
 block discarded – undo
87 87
 	 *
88 88
 	 * This function deletes the value from config.php.
89 89
 	 */
90
-	public static function deleteSystemValue( $key ) {
91
-		\OC::$server->getConfig()->deleteSystemValue( $key );
90
+	public static function deleteSystemValue($key) {
91
+		\OC::$server->getConfig()->deleteSystemValue($key);
92 92
 	}
93 93
 
94 94
 	/**
@@ -102,8 +102,8 @@  discard block
 block discarded – undo
102 102
 	 * This function gets a value from the appconfig table. If the key does
103 103
 	 * not exist the default value will be returned
104 104
 	 */
105
-	public static function getAppValue( $app, $key, $default = null ) {
106
-		return \OC::$server->getConfig()->getAppValue( $app, $key, $default );
105
+	public static function getAppValue($app, $key, $default = null) {
106
+		return \OC::$server->getConfig()->getAppValue($app, $key, $default);
107 107
 	}
108 108
 
109 109
 	/**
@@ -116,9 +116,9 @@  discard block
 block discarded – undo
116 116
 	 *
117 117
 	 * Sets a value. If the key did not exist before it will be created.
118 118
 	 */
119
-	public static function setAppValue( $app, $key, $value ) {
119
+	public static function setAppValue($app, $key, $value) {
120 120
 		try {
121
-			\OC::$server->getConfig()->setAppValue( $app, $key, $value );
121
+			\OC::$server->getConfig()->setAppValue($app, $key, $value);
122 122
 		} catch (\Exception $e) {
123 123
 			return false;
124 124
 		}
@@ -137,8 +137,8 @@  discard block
 block discarded – undo
137 137
 	 * This function gets a value from the preferences table. If the key does
138 138
 	 * not exist the default value will be returned
139 139
 	 */
140
-	public static function getUserValue( $user, $app, $key, $default = null ) {
141
-		return \OC::$server->getConfig()->getUserValue( $user, $app, $key, $default );
140
+	public static function getUserValue($user, $app, $key, $default = null) {
141
+		return \OC::$server->getConfig()->getUserValue($user, $app, $key, $default);
142 142
 	}
143 143
 
144 144
 	/**
@@ -153,9 +153,9 @@  discard block
 block discarded – undo
153 153
 	 * Adds a value to the preferences. If the key did not exist before, it
154 154
 	 * will be added automagically.
155 155
 	 */
156
-	public static function setUserValue( $user, $app, $key, $value ) {
156
+	public static function setUserValue($user, $app, $key, $value) {
157 157
 		try {
158
-			\OC::$server->getConfig()->setUserValue( $user, $app, $key, $value );
158
+			\OC::$server->getConfig()->setUserValue($user, $app, $key, $value);
159 159
 		} catch (\Exception $e) {
160 160
 			return false;
161 161
 		}
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(),
@@ -145,16 +145,16 @@  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
 
153 153
 			return $responder($response);
154 154
 
155 155
 		} else {
156
-			throw new \DomainException('No responder registered for format ' .
157
-				$format . '!');
156
+			throw new \DomainException('No responder registered for format '.
157
+				$format.'!');
158 158
 		}
159 159
 	}
160 160
 
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
172 172
 	 * @return mixed the content of the array
173 173
 	 * @since 6.0.0
174 174
 	 */
175
-	public function params($key, $default=null){
175
+	public function params($key, $default = null) {
176 176
 		return $this->request->getParam($key, $default);
177 177
 	}
178 178
 
@@ -247,13 +247,13 @@  discard block
 block discarded – undo
247 247
 	 * @return \OCP\AppFramework\Http\TemplateResponse containing the page
248 248
 	 * @since 6.0.0
249 249
 	 */
250
-	public function render($templateName, array $params=array(),
251
-							$renderAs='user', array $headers=array()){
250
+	public function render($templateName, array $params = array(),
251
+							$renderAs = 'user', array $headers = array()) {
252 252
 		$response = new TemplateResponse($this->appName, $templateName);
253 253
 		$response->setParams($params);
254 254
 		$response->renderAs($renderAs);
255 255
 
256
-		foreach($headers as $name => $value){
256
+		foreach ($headers as $name => $value) {
257 257
 			$response->addHeader($name, $value);
258 258
 		}
259 259
 
Please login to merge, or discard this patch.
lib/public/appframework/db/doesnotexistexception.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.
lib/public/appframework/db/mapper.php 1 patch
Spacing   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -49,13 +49,13 @@  discard block
 block discarded – undo
49 49
 	 * mapped to queries without using sql
50 50
 	 * @since 7.0.0
51 51
 	 */
52
-	public function __construct(IDBConnection $db, $tableName, $entityClass=null){
52
+	public function __construct(IDBConnection $db, $tableName, $entityClass = null) {
53 53
 		$this->db = $db;
54
-		$this->tableName = '*PREFIX*' . $tableName;
54
+		$this->tableName = '*PREFIX*'.$tableName;
55 55
 
56 56
 		// if not given set the entity name to the class without the mapper part
57 57
 		// cache it here for later use since reflection is slow
58
-		if($entityClass === null) {
58
+		if ($entityClass === null) {
59 59
 			$this->entityClass = str_replace('Mapper', '', get_class($this));
60 60
 		} else {
61 61
 			$this->entityClass = $entityClass;
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
 	 * @return string the table name
68 68
 	 * @since 7.0.0
69 69
 	 */
70
-	public function getTableName(){
70
+	public function getTableName() {
71 71
 		return $this->tableName;
72 72
 	}
73 73
 
@@ -78,8 +78,8 @@  discard block
 block discarded – undo
78 78
 	 * @return Entity the deleted entity
79 79
 	 * @since 7.0.0 - return value added in 8.1.0
80 80
 	 */
81
-	public function delete(Entity $entity){
82
-		$sql = 'DELETE FROM `' . $this->tableName . '` WHERE `id` = ?';
81
+	public function delete(Entity $entity) {
82
+		$sql = 'DELETE FROM `'.$this->tableName.'` WHERE `id` = ?';
83 83
 		$stmt = $this->execute($sql, [$entity->getId()]);
84 84
 		$stmt->closeCursor();
85 85
 		return $entity;
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 	 * @return Entity the saved entity with the set id
93 93
 	 * @since 7.0.0
94 94
 	 */
95
-	public function insert(Entity $entity){
95
+	public function insert(Entity $entity) {
96 96
 		// get updated fields to save, fields have to be set using a setter to
97 97
 		// be saved
98 98
 		$properties = $entity->getUpdatedFields();
@@ -102,15 +102,15 @@  discard block
 block discarded – undo
102 102
 
103 103
 		// build the fields
104 104
 		$i = 0;
105
-		foreach($properties as $property => $updated) {
105
+		foreach ($properties as $property => $updated) {
106 106
 			$column = $entity->propertyToColumn($property);
107
-			$getter = 'get' . ucfirst($property);
107
+			$getter = 'get'.ucfirst($property);
108 108
 
109
-			$columns .= '`' . $column . '`';
109
+			$columns .= '`'.$column.'`';
110 110
 			$values .= '?';
111 111
 
112 112
 			// only append colon if there are more entries
113
-			if($i < count($properties)-1){
113
+			if ($i < count($properties) - 1) {
114 114
 				$columns .= ',';
115 115
 				$values .= ',';
116 116
 			}
@@ -120,8 +120,8 @@  discard block
 block discarded – undo
120 120
 
121 121
 		}
122 122
 
123
-		$sql = 'INSERT INTO `' . $this->tableName . '`(' .
124
-				$columns . ') VALUES(' . $values . ')';
123
+		$sql = 'INSERT INTO `'.$this->tableName.'`('.
124
+				$columns.') VALUES('.$values.')';
125 125
 
126 126
 		$stmt = $this->execute($sql, $params);
127 127
 
@@ -141,16 +141,16 @@  discard block
 block discarded – undo
141 141
 	 * @return Entity the saved entity with the set id
142 142
 	 * @since 7.0.0 - return value was added in 8.0.0
143 143
 	 */
144
-	public function update(Entity $entity){
144
+	public function update(Entity $entity) {
145 145
 		// if entity wasn't changed it makes no sense to run a db query
146 146
 		$properties = $entity->getUpdatedFields();
147
-		if(count($properties) === 0) {
147
+		if (count($properties) === 0) {
148 148
 			return $entity;
149 149
 		}
150 150
 
151 151
 		// entity needs an id
152 152
 		$id = $entity->getId();
153
-		if($id === null){
153
+		if ($id === null) {
154 154
 			throw new \InvalidArgumentException(
155 155
 				'Entity which should be updated has no id');
156 156
 		}
@@ -165,15 +165,15 @@  discard block
 block discarded – undo
165 165
 
166 166
 		// build the fields
167 167
 		$i = 0;
168
-		foreach($properties as $property => $updated) {
168
+		foreach ($properties as $property => $updated) {
169 169
 
170 170
 			$column = $entity->propertyToColumn($property);
171
-			$getter = 'get' . ucfirst($property);
171
+			$getter = 'get'.ucfirst($property);
172 172
 
173
-			$columns .= '`' . $column . '` = ?';
173
+			$columns .= '`'.$column.'` = ?';
174 174
 
175 175
 			// only append colon if there are more entries
176
-			if($i < count($properties)-1){
176
+			if ($i < count($properties) - 1) {
177 177
 				$columns .= ',';
178 178
 			}
179 179
 
@@ -181,8 +181,8 @@  discard block
 block discarded – undo
181 181
 			$i++;
182 182
 		}
183 183
 
184
-		$sql = 'UPDATE `' . $this->tableName . '` SET ' .
185
-				$columns . ' WHERE `id` = ?';
184
+		$sql = 'UPDATE `'.$this->tableName.'` SET '.
185
+				$columns.' WHERE `id` = ?';
186 186
 		$params[] = $id;
187 187
 
188 188
 		$stmt = $this->execute($sql, $params);
@@ -228,7 +228,7 @@  discard block
 block discarded – undo
228 228
 	 * @return \PDOStatement the database query result
229 229
 	 * @since 7.0.0
230 230
 	 */
231
-	protected function execute($sql, array $params=[], $limit=null, $offset=null){
231
+	protected function execute($sql, array $params = [], $limit = null, $offset = null) {
232 232
 		if ($this->db instanceof IDb) {
233 233
 			$query = $this->db->prepareQuery($sql, $limit, $offset);
234 234
 		} else {
@@ -241,7 +241,7 @@  discard block
 block discarded – undo
241 241
 				$query->bindValue($key, $param, $pdoConstant);
242 242
 			}
243 243
 		} else {
244
-			$index = 1;  // bindParam is 1 indexed
244
+			$index = 1; // bindParam is 1 indexed
245 245
 			foreach ($params as $param) {
246 246
 				$pdoConstant = $this->getPDOType($param);
247 247
 				$query->bindValue($index, $param, $pdoConstant);
@@ -277,18 +277,18 @@  discard block
 block discarded – undo
277 277
 	 * @return array the result as row
278 278
 	 * @since 7.0.0
279 279
 	 */
280
-	protected function findOneQuery($sql, array $params=[], $limit=null, $offset=null){
280
+	protected function findOneQuery($sql, array $params = [], $limit = null, $offset = null) {
281 281
 		$stmt = $this->execute($sql, $params, $limit, $offset);
282 282
 		$row = $stmt->fetch();
283 283
 
284
-		if($row === false || $row === null){
284
+		if ($row === false || $row === null) {
285 285
 			$stmt->closeCursor();
286 286
 			throw new DoesNotExistException('No matching entry found');
287 287
 		}
288 288
 		$row2 = $stmt->fetch();
289 289
 		$stmt->closeCursor();
290 290
 		//MDB2 returns null, PDO and doctrine false when no row is available
291
-		if( ! ($row2 === false || $row2 === null )) {
291
+		if (!($row2 === false || $row2 === null)) {
292 292
 			throw new MultipleObjectsReturnedException('More than one result');
293 293
 		} else {
294 294
 			return $row;
@@ -304,7 +304,7 @@  discard block
 block discarded – undo
304 304
 	 * @since 7.0.0
305 305
 	 */
306 306
 	protected function mapRowToEntity($row) {
307
-		return call_user_func($this->entityClass .'::fromRow', $row);
307
+		return call_user_func($this->entityClass.'::fromRow', $row);
308 308
 	}
309 309
 
310 310
 
@@ -317,12 +317,12 @@  discard block
 block discarded – undo
317 317
 	 * @return array all fetched entities
318 318
 	 * @since 7.0.0
319 319
 	 */
320
-	protected function findEntities($sql, array $params=[], $limit=null, $offset=null) {
320
+	protected function findEntities($sql, array $params = [], $limit = null, $offset = null) {
321 321
 		$stmt = $this->execute($sql, $params, $limit, $offset);
322 322
 
323 323
 		$entities = [];
324 324
 
325
-		while($row = $stmt->fetch()){
325
+		while ($row = $stmt->fetch()) {
326 326
 			$entities[] = $this->mapRowToEntity($row);
327 327
 		}
328 328
 
@@ -344,7 +344,7 @@  discard block
 block discarded – undo
344 344
 	 * @return Entity the entity
345 345
 	 * @since 7.0.0
346 346
 	 */
347
-	protected function findEntity($sql, array $params=[], $limit=null, $offset=null){
347
+	protected function findEntity($sql, array $params = [], $limit = null, $offset = null) {
348 348
 		return $this->mapRowToEntity($this->findOneQuery($sql, $params, $limit, $offset));
349 349
 	}
350 350
 
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.
lib/public/appframework/db/entity.php 1 patch
Spacing   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -47,8 +47,8 @@  discard block
 block discarded – undo
47 47
 	public static function fromParams(array $params) {
48 48
 		$instance = new static();
49 49
 
50
-		foreach($params as $key => $value) {
51
-			$method = 'set' . ucfirst($key);
50
+		foreach ($params as $key => $value) {
51
+			$method = 'set'.ucfirst($key);
52 52
 			$instance->$method($value);
53 53
 		}
54 54
 
@@ -61,12 +61,12 @@  discard block
 block discarded – undo
61 61
 	 * @param array $row the row to map onto the entity
62 62
 	 * @since 7.0.0
63 63
 	 */
64
-	public static function fromRow(array $row){
64
+	public static function fromRow(array $row) {
65 65
 		$instance = new static();
66 66
 
67
-		foreach($row as $key => $value){
67
+		foreach ($row as $key => $value) {
68 68
 			$prop = ucfirst($instance->columnToProperty($key));
69
-			$setter = 'set' . $prop;
69
+			$setter = 'set'.$prop;
70 70
 			$instance->$setter($value);
71 71
 		}
72 72
 
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
 	 * Marks the entity as clean needed for setting the id after the insertion
90 90
 	 * @since 7.0.0
91 91
 	 */
92
-	public function resetUpdatedFields(){
92
+	public function resetUpdatedFields() {
93 93
 		$this->_updatedFields = array();
94 94
 	}
95 95
 
@@ -99,20 +99,20 @@  discard block
 block discarded – undo
99 99
 	 */
100 100
 	protected function setter($name, $args) {
101 101
 		// setters should only work for existing attributes
102
-		if(property_exists($this, $name)){
103
-			if($this->$name === $args[0]) {
102
+		if (property_exists($this, $name)) {
103
+			if ($this->$name === $args[0]) {
104 104
 				return;
105 105
 			}
106 106
 			$this->markFieldUpdated($name);
107 107
 
108 108
 			// if type definition exists, cast to correct type
109
-			if($args[0] !== null && array_key_exists($name, $this->_fieldTypes)) {
109
+			if ($args[0] !== null && array_key_exists($name, $this->_fieldTypes)) {
110 110
 				settype($args[0], $this->_fieldTypes[$name]);
111 111
 			}
112 112
 			$this->$name = $args[0];
113 113
 
114 114
 		} else {
115
-			throw new \BadFunctionCallException($name . 
115
+			throw new \BadFunctionCallException($name. 
116 116
 				' is not a valid attribute');
117 117
 		}
118 118
 	}
@@ -123,10 +123,10 @@  discard block
 block discarded – undo
123 123
 	 */
124 124
 	protected function getter($name) {
125 125
 		// getters should only work for existing attributes
126
-		if(property_exists($this, $name)){
126
+		if (property_exists($this, $name)) {
127 127
 			return $this->$name;
128 128
 		} else {
129
-			throw new \BadFunctionCallException($name . 
129
+			throw new \BadFunctionCallException($name. 
130 130
 				' is not a valid attribute');
131 131
 		}
132 132
 	}
@@ -139,15 +139,15 @@  discard block
 block discarded – undo
139 139
 	 * getter method
140 140
 	 * @since 7.0.0
141 141
 	 */
142
-	public function __call($methodName, $args){
143
-		$attr = lcfirst( substr($methodName, 3) );
142
+	public function __call($methodName, $args) {
143
+		$attr = lcfirst(substr($methodName, 3));
144 144
 
145
-		if(strpos($methodName, 'set') === 0){
145
+		if (strpos($methodName, 'set') === 0) {
146 146
 			$this->setter($attr, $args);
147
-		} elseif(strpos($methodName, 'get') === 0) {
147
+		} elseif (strpos($methodName, 'get') === 0) {
148 148
 			return $this->getter($attr);
149 149
 		} else {
150
-			throw new \BadFunctionCallException($methodName . 
150
+			throw new \BadFunctionCallException($methodName. 
151 151
 					' does not exist');
152 152
 		}
153 153
 
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
 	 * @param string $attribute the name of the attribute
160 160
 	 * @since 7.0.0
161 161
 	 */
162
-	protected function markFieldUpdated($attribute){
162
+	protected function markFieldUpdated($attribute) {
163 163
 		$this->_updatedFields[$attribute] = true;
164 164
 	}
165 165
 
@@ -170,12 +170,12 @@  discard block
 block discarded – undo
170 170
 	 * @return string the property name
171 171
 	 * @since 7.0.0
172 172
 	 */
173
-	public function columnToProperty($columnName){
173
+	public function columnToProperty($columnName) {
174 174
 		$parts = explode('_', $columnName);
175 175
 		$property = null;
176 176
 
177
-		foreach($parts as $part){
178
-			if($property === null){
177
+		foreach ($parts as $part) {
178
+			if ($property === null) {
179 179
 				$property = $part;
180 180
 			} else {
181 181
 				$property .= ucfirst($part);
@@ -192,15 +192,15 @@  discard block
 block discarded – undo
192 192
 	 * @return string the column name
193 193
 	 * @since 7.0.0
194 194
 	 */
195
-	public function propertyToColumn($property){
195
+	public function propertyToColumn($property) {
196 196
 		$parts = preg_split('/(?=[A-Z])/', $property);
197 197
 		$column = null;
198 198
 
199
-		foreach($parts as $part){
200
-			if($column === null){
199
+		foreach ($parts as $part) {
200
+			if ($column === null) {
201 201
 				$column = $part;
202 202
 			} else {
203
-				$column .= '_' . lcfirst($part);
203
+				$column .= '_'.lcfirst($part);
204 204
 			}
205 205
 		}
206 206
 
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
212 212
 	 * @return array array of updated fields for update query
213 213
 	 * @since 7.0.0
214 214
 	 */
215
-	public function getUpdatedFields(){
215
+	public function getUpdatedFields() {
216 216
 		return $this->_updatedFields;
217 217
 	}
218 218
 
@@ -224,7 +224,7 @@  discard block
 block discarded – undo
224 224
 	 * @param string $type the type which will be used to call settype()
225 225
 	 * @since 7.0.0
226 226
 	 */
227
-	protected function addType($fieldName, $type){
227
+	protected function addType($fieldName, $type) {
228 228
 		$this->_fieldTypes[$fieldName] = $type;
229 229
 	}
230 230
 
@@ -236,9 +236,9 @@  discard block
 block discarded – undo
236 236
 	 * @return string slugified value
237 237
 	 * @since 7.0.0
238 238
 	 */
239
-	public function slugify($attributeName){
239
+	public function slugify($attributeName) {
240 240
 		// toSlug should only work for existing attributes
241
-		if(property_exists($this, $attributeName)){
241
+		if (property_exists($this, $attributeName)) {
242 242
 			$value = $this->$attributeName;
243 243
 			// replace everything except alphanumeric with a single '-'
244 244
 			$value = preg_replace('/[^A-Za-z0-9]+/', '-', $value);
@@ -246,7 +246,7 @@  discard block
 block discarded – undo
246 246
 			// trim '-'
247 247
 			return trim($value, '-');
248 248
 		} else {
249
-			throw new \BadFunctionCallException($attributeName .
249
+			throw new \BadFunctionCallException($attributeName.
250 250
 				' is not a valid attribute');
251 251
 		}
252 252
 	}
Please login to merge, or discard this patch.
lib/public/appframework/http/response.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -91,8 +91,8 @@  discard block
 block discarded – undo
91 91
 	 */
92 92
 	public function cacheFor($cacheSeconds) {
93 93
 
94
-		if($cacheSeconds > 0) {
95
-			$this->addHeader('Cache-Control', 'max-age=' . $cacheSeconds .
94
+		if ($cacheSeconds > 0) {
95
+			$this->addHeader('Cache-Control', 'max-age='.$cacheSeconds.
96 96
 				', must-revalidate');
97 97
 		} else {
98 98
 			$this->addHeader('Cache-Control', 'no-cache, no-store, must-revalidate');
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
 	 * @since 8.0.0
148 148
 	 */
149 149
 	public function invalidateCookies(array $cookieNames) {
150
-		foreach($cookieNames as $cookieName) {
150
+		foreach ($cookieNames as $cookieName) {
151 151
 			$this->invalidateCookie($cookieName);
152 152
 		}
153 153
 		return $this;
@@ -171,11 +171,11 @@  discard block
 block discarded – undo
171 171
 	 * @since 6.0.0 - return value was added in 7.0.0
172 172
 	 */
173 173
 	public function addHeader($name, $value) {
174
-		$name = trim($name);  // always remove leading and trailing whitespace
174
+		$name = trim($name); // always remove leading and trailing whitespace
175 175
 		                      // to be able to reliably check for security
176 176
 		                      // headers
177 177
 
178
-		if(is_null($value)) {
178
+		if (is_null($value)) {
179 179
 			unset($this->headers[$name]);
180 180
 		} else {
181 181
 			$this->headers[$name] = $value;
@@ -206,19 +206,19 @@  discard block
 block discarded – undo
206 206
 	public function getHeaders() {
207 207
 		$mergeWith = [];
208 208
 
209
-		if($this->lastModified) {
209
+		if ($this->lastModified) {
210 210
 			$mergeWith['Last-Modified'] =
211 211
 				$this->lastModified->format(\DateTime::RFC2822);
212 212
 		}
213 213
 
214 214
 		// Build Content-Security-Policy and use default if none has been specified
215
-		if(is_null($this->contentSecurityPolicy)) {
215
+		if (is_null($this->contentSecurityPolicy)) {
216 216
 			$this->setContentSecurityPolicy(new ContentSecurityPolicy());
217 217
 		}
218 218
 		$this->headers['Content-Security-Policy'] = $this->contentSecurityPolicy->buildPolicy();
219 219
 
220
-		if($this->ETag) {
221
-			$mergeWith['ETag'] = '"' . $this->ETag . '"';
220
+		if ($this->ETag) {
221
+			$mergeWith['ETag'] = '"'.$this->ETag.'"';
222 222
 		}
223 223
 
224 224
 		return array_merge($mergeWith, $this->headers);
Please login to merge, or discard this patch.