QA: codesniffer

contributte · Apr 11, 2023 · a1371b3 · a1371b3
1 parent c21237d
commit a1371b3
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 24 deletions.
diff --git a/ruleset.xml b/ruleset.xml
@@ -1,10 +1,7 @@
-<?xml version="1.0"?>
-<ruleset>
-	<!-- Contributte Coding Standard -->
-	<rule ref="./vendor/ninjify/coding-standard/contributte.xml">
-		<exclude name="SlevomatCodingStandard.ControlStructures.ControlStructureSpacing.IncorrectLinesCountBeforeControlStructure"/>
-		<exclude name="SlevomatCodingStandard.Operators.RequireOnlyStandaloneIncrementAndDecrementOperators.PostIncrementOperatorNotUsedStandalone"/>
-	</rule>
+<?xml version="1.0" encoding="UTF-8"?>
+<ruleset name="Contributte" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="vendor/squizlabs/php_codesniffer/phpcs.xsd">
+	<!-- Rulesets -->
+	<rule ref="./vendor/contributte/qa/ruleset-8.0.xml"/>
 
 	<!-- Specific rules -->
 	<rule ref="SlevomatCodingStandard.Files.TypeNameMatchesFileName">

diff --git a/src/Mailer/CompositeMailer.php b/src/Mailer/CompositeMailer.php
@@ -10,10 +10,9 @@ final class CompositeMailer implements Mailer
 {
 
 	/** @var Mailer[] */
-	private $mailers = [];
+	private array $mailers = [];
 
-	/** @var bool */
-	private $silent;
+	private bool $silent;
 
 	public function __construct(bool $silent = false)
 	{

diff --git a/src/Mailer/DevOpsMailer.php b/src/Mailer/DevOpsMailer.php
@@ -8,11 +8,9 @@
 final class DevOpsMailer implements Mailer
 {
 
-	/** @var Mailer */
-	private $mailer;
+	private Mailer $mailer;
 
-	/** @var string */
-	private $mail;
+	private string $mail;
 
 	public function __construct(Mailer $mailer, string $mail)
 	{

diff --git a/src/Mailer/FileMailer.php b/src/Mailer/FileMailer.php
@@ -9,8 +9,7 @@
 final class FileMailer implements Mailer
 {
 
-	/** @var string */
-	private $path;
+	private string $path;
 
 	public function __construct(string $path)
 	{

diff --git a/src/Mailer/SendmailMailer.php b/src/Mailer/SendmailMailer.php
@@ -11,10 +11,9 @@ class SendmailMailer extends NSendmailMailer
 {
 
 	/** @var callable[] function (SendmailMailer $mailer, Message $mail); */
-	public $onSend = [];
+	public array $onSend = [];
 
-	/** @var string|null */
-	private $bounceMail;
+	private ?string $bounceMail = null;
 
 	public function setBounceMail(string $bounceMail): void
 	{

diff --git a/src/Mailer/TraceableMailer.php b/src/Mailer/TraceableMailer.php
@@ -8,11 +8,10 @@
 final class TraceableMailer implements Mailer
 {
 
-	/** @var Mailer */
-	private $mailer;
+	private Mailer $mailer;
 
 	/** @var Message[] */
-	private $mails = [];
+	private array $mails = [];
 
 	public function __construct(Mailer $mailer)
 	{

diff --git a/src/Tracy/MailPanel.php b/src/Tracy/MailPanel.php
@@ -8,8 +8,7 @@
 final class MailPanel implements IBarPanel
 {
 
-	/** @var TraceableMailer */
-	private $traceableMailer;
+	private TraceableMailer $traceableMailer;
 
 	public function setTraceableMailer(TraceableMailer $traceableMailer): void
 	{