Php cs fix

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

.gitattributes

@@ -0,0 +1 @@
+/js/* binary

.gitignore

@@ -27,3 +27,6 @@ js/
 
 # Compile-Cache
 v8-compile-cache-0/
+
+# php-cs cache
+.php_cs.cache

.php_cs.dist

@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+require_once './vendor/autoload.php';
+
+use Nextcloud\CodingStandard\Config;
+
+$config = new Config();
+$config
+	->getFinder()
+	->notPath('build')
+	->notPath('l10n')
+	->notPath('src')
+	->notPath('vendor')
+	->in(__DIR__);
+return $config;

lib/AppInfo/Application.php

@@ -28,13 +28,9 @@ declare(strict_types=1);
 namespace OCA\Forms\AppInfo;
 
 use OCP\AppFramework\App;
-use OCP\IL10N;
-use OCP\INavigationManager;
-use OCP\IURLGenerator;
 
 class Application extends App {
-
+	public const APP_ID = 'forms';
-	const APP_ID = 'forms';
 
 	/**
 	 * Application constructor.

lib/Controller/ApiController.php

@@ -47,7 +47,6 @@ use OCP\IUserSession;
 use OCP\Security\ISecureRandom;
 
 class ApiController extends Controller {
-
 	protected $appName;
 
 	/** @var SubmissionMapper */
@@ -324,7 +323,6 @@ class ApiController extends Controller {
 
 		// Store array of Question-Entities and check the Questions FormId & old Order.
 		foreach ($newOrder as $arrayKey => $questionId) {
-
 			try {
 				$questions[$arrayKey] = $this->questionMapper->findById($questionId);
 			} catch (IMapperException $e) {
@@ -489,7 +487,7 @@ class ApiController extends Controller {
 	/**
 	 * @NoAdminRequired
 	 * Writes the given key-value pairs into Database.
-
+	 *
 	 * @param int $id OptionId of option to update
 	 * @param array $keyValuePairs Array of key=>value pairs to update.
 	 */
@@ -650,7 +648,6 @@ class ApiController extends Controller {
 
 					// Load option-text
 					$answerText = $option['text'];
-
 				} else {
 					$answerText = $answer; // Not a multiple-question, answerText is given answer
 				}

lib/Controller/PageController.php

@@ -44,7 +44,6 @@ use OCP\IUserSession;
 use OCP\Util;
 
 class PageController extends Controller {
-
 	protected $appName;
 
 	/** @var FormMapper */

lib/Controller/SystemController.php

@@ -29,13 +29,10 @@ use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
 
 use OCP\IGroupManager;
-use OCP\IUser;
 use OCP\IUserManager;
-use OCP\IConfig;
 use OCP\IRequest;
 
 class SystemController extends Controller {
-
 	public function __construct(
 		string $appName,
 		IGroupManager $groupManager,
@@ -52,9 +49,9 @@ class SystemController extends Controller {
 	 * @NoAdminRequired
 	 * @return DataResponse
 	 */
-	public function getSiteUsersAndGroups($query = '', $getGroups = true, $getUsers = true, $skipGroups = array(), $skipUsers = array()) {
+	public function getSiteUsersAndGroups($query = '', $getGroups = true, $getUsers = true, $skipGroups = [], $skipUsers = []) {
-		$list = array();
+		$list = [];
-		$data = array();
+		$data = [];
 		if ($getGroups) {
 			$groups = $this->groupManager->search($query);
 			foreach ($groups as $group) {

lib/Db/Answer.php

@@ -59,5 +59,4 @@ class Answer extends Entity {
 			'text' => htmlspecialchars_decode($this->getText()),
 		];
 	}
-
 }

lib/Db/AnswerMapper.php

@@ -70,5 +70,4 @@ class AnswerMapper extends QBMapper {
 
 		$qb->execute();
 	}
-
 }

lib/Db/Form.php

@@ -50,7 +50,6 @@ use OCP\AppFramework\Db\Entity;
  * @method void setSubmitOnce(bool $value)
  */
 class Form extends Entity {
-
 	protected $hash;
 	protected $title;
 	protected $description;

lib/Db/FormMapper.php

@@ -102,5 +102,4 @@ class FormMapper extends QBMapper {
 
 		return $this->findEntities($qb);
 	}
-
 }

lib/Db/OptionMapper.php

@@ -26,7 +26,6 @@ declare(strict_types=1);
 
 namespace OCA\Forms\Db;
 
-use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 use OCP\AppFramework\Db\QBMapper;
 
@@ -80,5 +79,4 @@ class OptionMapper extends QBMapper {
 
 		return $this->findEntity($qb);
 	}
-
 }

lib/Db/Question.php

@@ -48,7 +48,7 @@ class Question extends Entity {
 	protected $mandatory;
 	protected $text;
 
-	const TYPES = [
+	public const TYPES = [
 		'short',
 		'long',
 		'multiple',

lib/Db/QuestionMapper.php

@@ -30,10 +30,7 @@ use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 use OCP\AppFramework\Db\QBMapper;
 
-use OCA\Forms\Db\OptionMapper;
-
 class QuestionMapper extends QBMapper {
-
 	private $optionMapper;
 
 	public function __construct(IDBConnection $db, OptionMapper $optionMapper) {
@@ -102,5 +99,4 @@ class QuestionMapper extends QBMapper {
 
 		return $this->findEntity($qb);
 	}
-
 }

lib/Db/Submission.php

@@ -59,5 +59,4 @@ class Submission extends Entity {
 			'timestamp' => $this->getTimestamp(),
 		];
 	}
-
 }

lib/Db/SubmissionMapper.php

@@ -29,10 +29,7 @@ use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 use OCP\AppFramework\Db\QBMapper;
 
-use OCA\Forms\Db\AnswerMapper;
-
 class SubmissionMapper extends QBMapper {
-
 	private $answerMapper;
 
 	/**

lib/Migration/Version0010Date20190000000007.php

@@ -23,11 +23,8 @@
 
 namespace OCA\Forms\Migration;
 
-use Doctrine\DBAL\Exception\TableNotFoundException;
-use Doctrine\DBAL\Platforms\PostgreSqlPlatform;
 use Doctrine\DBAL\Types\Type;
 use OCP\DB\ISchemaWrapper;
-use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IConfig;
 use OCP\IDBConnection;
 use OCP\Migration\SimpleMigrationStep;

lib/Migration/Version010200Date20200323141300.php

@@ -24,8 +24,6 @@
 
 namespace OCA\Forms\Migration;
 
-use Doctrine\DBAL\Exception\TableNotFoundException;
-use Doctrine\DBAL\Platforms\PostgreSqlPlatform;
 use Doctrine\DBAL\Types\Type;
 use OCP\DB\ISchemaWrapper;
 use OCP\DB\QueryBuilder\IQueryBuilder;

lib/Service/FormsService.php

@@ -59,7 +59,6 @@ class FormsService {
 			foreach ($optionEntities as $optionEntity) {
 				$optionList[] = $optionEntity->read();
 			}
-
 		} catch (DoesNotExistException $e) {
 			//handle silently
 		} finally {
@@ -76,7 +75,6 @@ class FormsService {
 				$question['options'] = $this->getOptions($question['id']);
 				$questionList[] =  $question;
 			}
-
 		} catch (DoesNotExistException $e) {
 			//handle silently
 		} finally {
@@ -98,5 +96,4 @@ class FormsService {
 
 		return $result;
 	}
-
 }