From b7adb97cbcce1fa1ee19173483889fdd5ddc42a4 Mon Sep 17 00:00:00 2001
From: Daniel Siepmann <coding@daniel-siepmann.de>
Date: Thu, 7 Jan 2021 08:54:42 +0100
Subject: [PATCH] Adjust code and config to pass php code sniffer

Relates: #8092
---
 Classes/Domain/Repository/EventRepository.php     |  9 ++++-----
 Classes/Domain/Repository/OrganizerRepository.php |  6 ++----
 Classes/Domain/Repository/RegionRepository.php    |  6 ++----
 phpcs.xml.dist                                    | 11 ++++++++---
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Classes/Domain/Repository/EventRepository.php b/Classes/Domain/Repository/EventRepository.php
index 551e08e..ebcfcc2 100644
--- a/Classes/Domain/Repository/EventRepository.php
+++ b/Classes/Domain/Repository/EventRepository.php
@@ -2,9 +2,7 @@
 
 namespace Wrm\Events\Domain\Repository;
 
-use TYPO3\CMS\Extbase\Persistence\Repository;
-
-/**
+/*
  * This file is part of the TYPO3 CMS project.
  *
  * It is free software; you can redistribute it and/or modify it under
@@ -17,11 +15,12 @@ use TYPO3\CMS\Extbase\Persistence\Repository;
  * The TYPO3 project - inspiring people to share!
  */
 
-use Wrm\Events\Domain\Model\Dto\EventDemand;
-use Wrm\Events\Service\CategoryService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Persistence\QueryInterface;
 use TYPO3\CMS\Extbase\Persistence\QueryResultInterface;
+use TYPO3\CMS\Extbase\Persistence\Repository;
+use Wrm\Events\Domain\Model\Dto\EventDemand;
+use Wrm\Events\Service\CategoryService;
 
 class EventRepository extends Repository
 {
diff --git a/Classes/Domain/Repository/OrganizerRepository.php b/Classes/Domain/Repository/OrganizerRepository.php
index 87d7cc2..e43570f 100644
--- a/Classes/Domain/Repository/OrganizerRepository.php
+++ b/Classes/Domain/Repository/OrganizerRepository.php
@@ -2,9 +2,7 @@
 
 namespace Wrm\Events\Domain\Repository;
 
-use TYPO3\CMS\Extbase\Persistence\Repository;
-
-/**
+/*
  * This file is part of the TYPO3 CMS project.
  *
  * It is free software; you can redistribute it and/or modify it under
@@ -17,7 +15,7 @@ use TYPO3\CMS\Extbase\Persistence\Repository;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Extbase\Persistence\QueryResultInterface;
+use TYPO3\CMS\Extbase\Persistence\Repository;
 
 class OrganizerRepository extends Repository
 {
diff --git a/Classes/Domain/Repository/RegionRepository.php b/Classes/Domain/Repository/RegionRepository.php
index 17fa7b0..213154a 100644
--- a/Classes/Domain/Repository/RegionRepository.php
+++ b/Classes/Domain/Repository/RegionRepository.php
@@ -2,9 +2,7 @@
 
 namespace Wrm\Events\Domain\Repository;
 
-use TYPO3\CMS\Extbase\Persistence\Repository;
-
-/**
+/*
  * This file is part of the TYPO3 CMS project.
  *
  * It is free software; you can redistribute it and/or modify it under
@@ -17,7 +15,7 @@ use TYPO3\CMS\Extbase\Persistence\Repository;
  * The TYPO3 project - inspiring people to share!
  */
 
-use TYPO3\CMS\Extbase\Persistence\QueryResultInterface;
+use TYPO3\CMS\Extbase\Persistence\Repository;
 
 class RegionRepository extends Repository
 {
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index 8f39ece..0c873f7 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -14,8 +14,13 @@
     <arg name="extensions" value="php" />
 
     <!-- Base rules -->
-    <rule ref="PSR12" />
-    <rule ref="Generic.Files.LineLength.TooLong">
-        <exclude-pattern>/Tests/*</exclude-pattern>
+    <rule ref="PSR12">
+        <!-- Ignore some rules for now. -->
+        <!-- Otherwise we would need some more adjustments to the code. -->
+        <!-- We can clean these rules up in the future -->
+        <exclude name="Generic.Files.LineLength.TooLong" />
+        <exclude name="PSR1.Methods.CamelCapsMethodName.NotCamelCaps" />
+        <exclude name="PSR12.Properties.ConstantVisibility.NotFound" />
+        <exclude name="PSR2.Classes.PropertyDeclaration.Underscore" />
     </rule>
 </ruleset>