Merge pull request #191 from pdsinterop/fix/php-codesniffer

Fix/php codesniffer

Author: ylebre

solid/appinfo/routes.php

@@ -1,11 +1,4 @@
 <?php
-
-use OC\AllConfig;
-use OC\AppConfig;
-use OCA\Solid\AppInfo\Application;
-use OCP\IConfig;
-use OCP\IRequest;
-
 /**
  * Create your routes in here. The name is the lowercase name of the controller
  * without the controller part, the stuff after the hash is the method.
@@ -15,6 +8,12 @@
  * it's instantiated in there
  */
 
+use OC\AllConfig;
+use OC\AppConfig;
+use OCA\Solid\AppInfo\Application;
+use OCP\IConfig;
+use OCP\IRequest;
+
 $routes = [
 	['name' => 'page#approval', 'url' => '/sharing/{clientId}', 'verb' => 'GET'],
 	['name' => 'page#handleRevoke', 'url' => '/revoke/{clientId}', 'verb' => 'DELETE'],

solid/lib/BaseServerConfig.php

@@ -5,7 +5,6 @@
 	use OCP\IConfig;
 
 	class BaseServerConfig {
-
 		////////////////////////////// CLASS PROPERTIES \\\\\\\\\\\\\\\\\\\\\\\\\\\\
 
 		public const ERROR_INVALID_ARGUMENT = 'Invalid %s for %s: %s. Must be one of %s.';

solid/lib/Controller/AppController.php

@@ -23,8 +23,7 @@ class AppController extends Controller {
 	private $userId;
 	private $userManager;
 
-	public function __construct($AppName, IRequest $request, IConfig $config, IUserManager $userManager, IManager $contactsManager, IURLGenerator $urlGenerator, $userId
-	){
+	public function __construct($AppName, IRequest $request, IConfig $config, IUserManager $userManager, IManager $contactsManager, IURLGenerator $urlGenerator, $userId) {
 		parent::__construct($AppName, $request);
 		$this->userId = $userId;
 		$this->userManager = $userManager;

solid/lib/Controller/GetStorageUrlTrait.php

@@ -50,7 +50,7 @@ public function getStorageUrl($userId) {
 			}
 
 			$url['host'] = $userId . '.' . $url['host']; // $storageUrl = $userId . '.' . $storageUrl;
-			$storageUrl = $this->build_url($url);
+			$storageUrl = $this->buildUrl($url);
 		}
 
 		return $storageUrl;
@@ -79,7 +79,7 @@ public function validateUrl(RequestInterface $request): bool {
 
 	////////////////////////////// UTILITY METHODS \\\\\\\\\\\\\\\\\\\\\\\\\\\\\
 
-	private function build_url(array $parts) {
+	private function buildUrl(array $parts) {
 		// @FIXME: Replace with existing more robust URL builder
 		return (isset($parts['scheme']) ? "{$parts['scheme']}:" : '') .
 			(isset($parts['host']) ? "//{$parts['host']}" : '') .

solid/tests/Unit/Controller/GetStorageUrlTraitTest.php

@@ -20,8 +20,8 @@ class GetStorageUrlTraitTest extends TestCase
 {
 	////////////////////////////////// FIXTURES \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
 
-	const MOCK_URL = 'mock url';
-	const MOCK_USER_ID = 'mock user id';
+	private const MOCK_URL = 'mock url';
+	private const MOCK_USER_ID = 'mock user id';
 
 	private $trait;
 
@@ -83,7 +83,7 @@ public function testGetStorageUrlWithUserSubDomainsDisabled($url, $userId, $expe
 	/**
 	 * @testdox GetStorageUrlTrait should return a string when called with a UrlGenerator and Configuration
 	 * @covers ::getStorageUrl
-	 * @covers ::build_url
+	 * @covers ::buildUrl
 	 *
 	 * @dataProvider provideSubDomainsEnabledUrls
 	 */