From 34475d84d7ebbc9b6ccfbe627dace13162d762b7 Mon Sep 17 00:00:00 2001
From: shvlv <v.shelmuk@inpsyde.com>
Date: Fri, 26 Jan 2024 23:17:25 +0200
Subject: [PATCH 1/7] feat: introduce InpsydeTemplate standard; add
 TrailingSemicolonSniff

---
 .../Formatting/TrailingSemicolonSniff.php     | 109 ++++++++++++++++++
 InpsydeTemplates/ruleset.xml                  |   6 +
 2 files changed, 115 insertions(+)
 create mode 100644 InpsydeTemplates/Sniffs/Formatting/TrailingSemicolonSniff.php
 create mode 100644 InpsydeTemplates/ruleset.xml

diff --git a/InpsydeTemplates/Sniffs/Formatting/TrailingSemicolonSniff.php b/InpsydeTemplates/Sniffs/Formatting/TrailingSemicolonSniff.php
new file mode 100644
index 0000000..0496c74
--- /dev/null
+++ b/InpsydeTemplates/Sniffs/Formatting/TrailingSemicolonSniff.php
@@ -0,0 +1,109 @@
+<?php
+
+/*
+ * This file is part of the "php-coding-standards" package.
+ *
+ * Copyright (c) 2023 Inpsyde GmbH
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+declare(strict_types=1);
+
+namespace InpsydeTemplates\Sniffs\Formatting;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Util\Tokens;
+
+/**
+ * @psalm-type Token = array{
+ *     type: string,
+ *     code: string|int,
+ *     line: int
+ *     }
+ */
+final class TrailingSemicolonSniff implements Sniff
+{
+    /**
+     * @return list<int|string>
+     */
+    public function register(): array
+    {
+        return [
+            T_SEMICOLON,
+        ];
+    }
+
+    /**
+     * @param File $phpcsFile
+     * @param int $stackPtr
+     *
+     * phpcs:disable Inpsyde.CodeQuality.ArgumentTypeDeclaration
+     */
+    public function process(File $phpcsFile, $stackPtr): void
+    {
+        // phpcs:enable Inpsyde.CodeQuality.ArgumentTypeDeclaration
+
+        /** @var array<int, Token> $tokens */
+        $tokens = $phpcsFile->getTokens();
+        $currentLine = $tokens[$stackPtr]['line'];
+
+        $nextNonEmptyPosition = $phpcsFile->findNext(
+            Tokens::$emptyTokens,
+            ($stackPtr + 1),
+            null,
+            true
+        );
+
+        if (!is_int($nextNonEmptyPosition) || !isset($tokens[$nextNonEmptyPosition])) {
+            return;
+        }
+
+        $nextNonEmptyToken = $tokens[$nextNonEmptyPosition];
+
+        if ($nextNonEmptyToken['line'] !== $currentLine) {
+            return;
+        }
+
+        if ($nextNonEmptyToken['code'] !== T_CLOSE_TAG) {
+            return;
+        }
+
+        $message = sprintf('Trailing semicolon found at line %d.', $currentLine);
+
+        if ($phpcsFile->addFixableWarning($message, $stackPtr, 'Found')) {
+            $this->fix($stackPtr, $phpcsFile);
+        }
+    }
+
+    /**
+     * @param int $position
+     * @param File $file
+     */
+    private function fix(int $position, File $file): void
+    {
+        $fixer = $file->fixer;
+        $fixer->beginChangeset();
+
+        $fixer->replaceToken($position, '');
+
+        $fixer->endChangeset();
+    }
+}
diff --git a/InpsydeTemplates/ruleset.xml b/InpsydeTemplates/ruleset.xml
new file mode 100644
index 0000000..8b23714
--- /dev/null
+++ b/InpsydeTemplates/ruleset.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<ruleset name="Inpsyde PHP Templates Coding Standard">
+
+    <description>Coding standards for PHP templates.</description>
+
+</ruleset>

From 441f7ceca8d0df4ea6bfab9798630cd2031c3fe5 Mon Sep 17 00:00:00 2001
From: shvlv <v.shelmuk@inpsyde.com>
Date: Fri, 26 Jan 2024 23:20:23 +0200
Subject: [PATCH 2/7] test: add support for multiple ruleset; add trailing
 semicolon fixture

---
 tests/bootstrap.php                           |  2 +-
 tests/cases/FixturesTest.php                  | 24 ++++++++++++-----
 tests/fixtures/Psr4Fixture.php                |  2 +-
 tests/fixtures/argument-type-declaration.php  |  2 +-
 tests/fixtures/disable-call-user-func.php     |  2 +-
 tests/fixtures/disallow-magic-serialize.php   |  2 +-
 tests/fixtures/disallow-short-open-tag.php    |  2 +-
 .../fixtures/element-name-minimal-length.php  |  2 +-
 tests/fixtures/encoding-comment.php           |  4 +--
 tests/fixtures/forbidden-public-property.php  |  2 +-
 tests/fixtures/function-body-start.php        |  2 +-
 .../function-length-no-blank-lines.php        |  4 +--
 .../fixtures/function-length-no-comments.php  |  4 +--
 tests/fixtures/function-length.php            |  4 +--
 tests/fixtures/hook-closure-return.php        |  2 +-
 tests/fixtures/hook-priority.php              |  2 +-
 tests/fixtures/line-length.php                |  3 +--
 tests/fixtures/nesting-level.php              |  2 +-
 tests/fixtures/no-accessors.php               |  2 +-
 tests/fixtures/no-else.php                    |  4 +--
 .../no-root-namespace-functions-multi.php     |  2 +-
 .../no-root-namespace-functions-single.php    |  2 +-
 tests/fixtures/no-top-level-define.php        |  4 +--
 tests/fixtures/property-per-class-limit.php   |  4 +--
 tests/fixtures/return-type-declaration.php    |  2 +-
 tests/fixtures/static-closure.php             |  2 +-
 tests/fixtures/trailing-semicolon.php         | 27 +++++++++++++++++++
 tests/fixtures/var-names-camel-case.php       |  4 +--
 tests/fixtures/var-names-no-local.php         |  4 +--
 tests/fixtures/var-names-no-props.php         |  4 +--
 tests/fixtures/var-names-snake-case.php       |  4 +--
 31 files changed, 85 insertions(+), 47 deletions(-)
 create mode 100644 tests/fixtures/trailing-semicolon.php

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index d1ec1a4..ea8ee05 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -35,7 +35,7 @@
     die('Please install via Composer before running tests.');
 }
 
-putenv("SNIFFS_PATH={$libDir}/Inpsyde/Sniffs");
+putenv("LIB_PATH={$libDir}");
 putenv('SNIFFS_NAMESPACE=Inpsyde\\Sniffs');
 putenv("FIXTURES_PATH={$testsDir}/fixtures");
 
diff --git a/tests/cases/FixturesTest.php b/tests/cases/FixturesTest.php
index d8d7631..1dfab1b 100644
--- a/tests/cases/FixturesTest.php
+++ b/tests/cases/FixturesTest.php
@@ -209,24 +209,36 @@ private function createPhpcsForFixture(
         array $properties
     ): File {
 
-        $sniffFile = str_replace('.', '/', "{$sniffName}Sniff");
-        $sniffPath = getenv('SNIFFS_PATH') . "/{$sniffFile}.php";
+        $sniffFile = $this->buildSniffFile($sniffName);
+        $sniffPath = getenv('LIB_PATH') . "/{$sniffFile}.php";
         if (!file_exists($sniffPath) || !is_readable($sniffPath)) {
             // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
             throw new Exception("Non-existent of unreadable sniff file '{$sniffPath}' found.");
         }
 
+        $standard = strtok($sniffName, '.');
         $config = new Config();
-        $config->standards = [dirname(getenv('SNIFFS_PATH'))];
-        $config->sniffs = ["Inpsyde.{$sniffName}"];
+        $config->standards = [getenv('LIB_PATH') . "/{$standard}"];
+        $config->sniffs = [$sniffName];
         $ruleset = new Ruleset($config);
 
-        $baseSniffNamespace = getenv('SNIFFS_NAMESPACE');
         $sniffFqn = str_replace('/', '\\', $sniffFile);
         foreach ($properties as $name => $value) {
-            $ruleset->setSniffProperty("{$baseSniffNamespace}\\{$sniffFqn}", $name, $value);
+            $ruleset->setSniffProperty(
+                $sniffFqn,
+                $name,
+                ['scope' => 'sniff', 'value' => $value],
+            );
         }
 
         return new LocalFile($fixtureFile, $ruleset, $config);
     }
+
+    private function buildSniffFile(string $sniffName): string
+    {
+        $parts = explode('.', $sniffName);
+        array_splice($parts, 1, 0, 'Sniffs');
+
+        return implode('/', $parts) . 'Sniff';
+    }
 }
diff --git a/tests/fixtures/Psr4Fixture.php b/tests/fixtures/Psr4Fixture.php
index acaec22..f3b1f60 100644
--- a/tests/fixtures/Psr4Fixture.php
+++ b/tests/fixtures/Psr4Fixture.php
@@ -1,5 +1,5 @@
 <?php # -*- coding: utf-8 -*-
-// @phpcsSniff CodeQuality.Psr4
+// @phpcsSniff Inpsyde.CodeQuality.Psr4
 
 namespace {
 
diff --git a/tests/fixtures/argument-type-declaration.php b/tests/fixtures/argument-type-declaration.php
index 499be2b..8f48158 100644
--- a/tests/fixtures/argument-type-declaration.php
+++ b/tests/fixtures/argument-type-declaration.php
@@ -1,5 +1,5 @@
 <?php
-// @phpcsSniff CodeQuality.ArgumentTypeDeclaration
+// @phpcsSniff Inpsyde.CodeQuality.ArgumentTypeDeclaration
 
 use Psr\Container as PsrContainer;
 
diff --git a/tests/fixtures/disable-call-user-func.php b/tests/fixtures/disable-call-user-func.php
index 7f2374a..f98ec22 100644
--- a/tests/fixtures/disable-call-user-func.php
+++ b/tests/fixtures/disable-call-user-func.php
@@ -1,5 +1,5 @@
 <?php
-// @phpcsSniff CodeQuality.DisableCallUserFunc
+// @phpcsSniff Inpsyde.CodeQuality.DisableCallUserFunc
 
 function test() {
     // @phpcsErrorOnNextLine
diff --git a/tests/fixtures/disallow-magic-serialize.php b/tests/fixtures/disallow-magic-serialize.php
index cf7f2ea..c66710e 100644
--- a/tests/fixtures/disallow-magic-serialize.php
+++ b/tests/fixtures/disallow-magic-serialize.php
@@ -1,6 +1,6 @@
 <?php
 
-// @phpcsSniff CodeQuality.DisableMagicSerialize
+// @phpcsSniff Inpsyde.CodeQuality.DisableMagicSerialize
 
 class Foo {
 
diff --git a/tests/fixtures/disallow-short-open-tag.php b/tests/fixtures/disallow-short-open-tag.php
index a353d68..17d8e06 100644
--- a/tests/fixtures/disallow-short-open-tag.php
+++ b/tests/fixtures/disallow-short-open-tag.php
@@ -13,7 +13,7 @@ function (string $sniff, array $messages, array $warnings, array $errors, array
 }
 // @phpcsProcessFixtureEnd
 
-// @phpcsSniff CodeQuality.DisallowShortOpenTag
+// @phpcsSniff Inpsyde.CodeQuality.DisallowShortOpenTag
 ?>
 <div>
     <?= strtolower($x) ?>
diff --git a/tests/fixtures/element-name-minimal-length.php b/tests/fixtures/element-name-minimal-length.php
index 350ddc4..cc36ab0 100644
--- a/tests/fixtures/element-name-minimal-length.php
+++ b/tests/fixtures/element-name-minimal-length.php
@@ -1,5 +1,5 @@
 <?php
-// @phpcsSniff CodeQuality.ElementNameMinimalLength
+// @phpcsSniff Inpsyde.CodeQuality.ElementNameMinimalLength
 
 namespace {
 
diff --git a/tests/fixtures/encoding-comment.php b/tests/fixtures/encoding-comment.php
index 98b9ce3..6ccf639 100644
--- a/tests/fixtures/encoding-comment.php
+++ b/tests/fixtures/encoding-comment.php
@@ -3,7 +3,7 @@
 namespace Inpsyde\CodingStandard\Tests\Fixtures;
 
 
-// @phpcsSniff CodeQuality.EncodingComment
+// @phpcsSniff Inpsyde.CodeQuality.EncodingComment
 
 // @phpcsWarningCodeOnNextLine EncodingComment
 // -*- coding: utf-8 -*-
@@ -15,4 +15,4 @@
 
 <?php //-*- coding: utf-8 -*-
 // @phpcsWarningOnPreviousLine CodeQuality.EncodingComment
-?>
\ No newline at end of file
+?>
diff --git a/tests/fixtures/forbidden-public-property.php b/tests/fixtures/forbidden-public-property.php
index 8c0a65d..8d6de37 100644
--- a/tests/fixtures/forbidden-public-property.php
+++ b/tests/fixtures/forbidden-public-property.php
@@ -1,5 +1,5 @@
 <?php
-// @phpcsSniff CodeQuality.ForbiddenPublicProperty
+// @phpcsSniff Inpsyde.CodeQuality.ForbiddenPublicProperty
 
 $foo = 'foo';
 
diff --git a/tests/fixtures/function-body-start.php b/tests/fixtures/function-body-start.php
index edb6f74..459968f 100644
--- a/tests/fixtures/function-body-start.php
+++ b/tests/fixtures/function-body-start.php
@@ -1,5 +1,5 @@
 <?php
-// @phpcsSniff CodeQuality.FunctionBodyStart
+// @phpcsSniff Inpsyde.CodeQuality.FunctionBodyStart
 
 namespace FunctionBodyStartTest;
 
diff --git a/tests/fixtures/function-length-no-blank-lines.php b/tests/fixtures/function-length-no-blank-lines.php
index 8dd23a0..6ce25f3 100644
--- a/tests/fixtures/function-length-no-blank-lines.php
+++ b/tests/fixtures/function-length-no-blank-lines.php
@@ -1,5 +1,5 @@
 <?php
-// @phpcsSniff CodeQuality.FunctionLength
+// @phpcsSniff Inpsyde.CodeQuality.FunctionLength
 
 // @phpcsSniffPropertiesStart
 // $ignoreBlankLines = false;
@@ -339,4 +339,4 @@ function test_comments()
     #8
     #9
     #10
-}
\ No newline at end of file
+}
diff --git a/tests/fixtures/function-length-no-comments.php b/tests/fixtures/function-length-no-comments.php
index a839587..a120a66 100644
--- a/tests/fixtures/function-length-no-comments.php
+++ b/tests/fixtures/function-length-no-comments.php
@@ -1,5 +1,5 @@
 <?php
-// @phpcsSniff CodeQuality.FunctionLength
+// @phpcsSniff Inpsyde.CodeQuality.FunctionLength
 
 // @phpcsSniffPropertiesStart
 // $ignoreComments = false;
@@ -197,4 +197,4 @@ function test_whitespaces() {
 
 
 
-}
\ No newline at end of file
+}
diff --git a/tests/fixtures/function-length.php b/tests/fixtures/function-length.php
index 1b05baa..8a79563 100644
--- a/tests/fixtures/function-length.php
+++ b/tests/fixtures/function-length.php
@@ -1,5 +1,5 @@
 <?php
-// @phpcsSniff CodeQuality.FunctionLength
+// @phpcsSniff Inpsyde.CodeQuality.FunctionLength
 
 // @phpcsErrorOnNextLine
 function test() {
@@ -597,4 +597,4 @@ function testCommentsWhitespaces() {
         #9
         #10
     }
-}
\ No newline at end of file
+}
diff --git a/tests/fixtures/hook-closure-return.php b/tests/fixtures/hook-closure-return.php
index e86f530..c563555 100644
--- a/tests/fixtures/hook-closure-return.php
+++ b/tests/fixtures/hook-closure-return.php
@@ -1,6 +1,6 @@
 <?php
 
-// @phpcsSniff CodeQuality.HookClosureReturn
+// @phpcsSniff Inpsyde.CodeQuality.HookClosureReturn
 
 add_action('foo', 'bar');
 
diff --git a/tests/fixtures/hook-priority.php b/tests/fixtures/hook-priority.php
index 72f297f..ad81cd1 100644
--- a/tests/fixtures/hook-priority.php
+++ b/tests/fixtures/hook-priority.php
@@ -2,7 +2,7 @@
 
 namespace Inpsyde\CodingStandard\Tests\Fixtures;
 
-// @phpcsSniff CodeQuality.HookPriority
+// @phpcsSniff Inpsyde.CodeQuality.HookPriority
 add_action('foo', 'bar');
 
 add_filter('foo', [ArrayObject::class, 'meh']);
diff --git a/tests/fixtures/line-length.php b/tests/fixtures/line-length.php
index b381a1c..3214c4b 100644
--- a/tests/fixtures/line-length.php
+++ b/tests/fixtures/line-length.php
@@ -1,5 +1,5 @@
 <?php
-// @phpcsSniff CodeQuality.LineLength
+// @phpcsSniff Inpsyde.CodeQuality.LineLength
 
 ?>
     <!-- Warning two lines below: multiple attributes can go each in one line -->
@@ -117,4 +117,3 @@ function longComment() {
             </div>
         </div>
     </div>
-
diff --git a/tests/fixtures/nesting-level.php b/tests/fixtures/nesting-level.php
index d5dc871..669f30c 100644
--- a/tests/fixtures/nesting-level.php
+++ b/tests/fixtures/nesting-level.php
@@ -1,5 +1,5 @@
 <?php
-// @phpcsSniff CodeQuality.NestingLevel
+// @phpcsSniff Inpsyde.CodeQuality.NestingLevel
 
 // @phpcsErrorOnNextLine
 function a()
diff --git a/tests/fixtures/no-accessors.php b/tests/fixtures/no-accessors.php
index f692420..0f8e22b 100644
--- a/tests/fixtures/no-accessors.php
+++ b/tests/fixtures/no-accessors.php
@@ -1,6 +1,6 @@
 <?php
 
-// @phpcsSniff CodeQuality.NoAccessors
+// @phpcsSniff Inpsyde.CodeQuality.NoAccessors
 
 function getting() {
 
diff --git a/tests/fixtures/no-else.php b/tests/fixtures/no-else.php
index bc5c843..8f0e1d0 100644
--- a/tests/fixtures/no-else.php
+++ b/tests/fixtures/no-else.php
@@ -1,6 +1,6 @@
 <?php
 
-// @phpcsSniff CodeQuality.NoElse
+// @phpcsSniff Inpsyde.CodeQuality.NoElse
 
 if ('x') {
 
@@ -36,4 +36,4 @@ public function test()
             die();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/fixtures/no-root-namespace-functions-multi.php b/tests/fixtures/no-root-namespace-functions-multi.php
index caa3f38..79bde32 100644
--- a/tests/fixtures/no-root-namespace-functions-multi.php
+++ b/tests/fixtures/no-root-namespace-functions-multi.php
@@ -1,5 +1,5 @@
 <?php
-// @phpcsSniff CodeQuality.NoRootNamespaceFunctions
+// @phpcsSniff Inpsyde.CodeQuality.NoRootNamespaceFunctions
 
 namespace Foo {
 
diff --git a/tests/fixtures/no-root-namespace-functions-single.php b/tests/fixtures/no-root-namespace-functions-single.php
index e66f502..0fee65c 100644
--- a/tests/fixtures/no-root-namespace-functions-single.php
+++ b/tests/fixtures/no-root-namespace-functions-single.php
@@ -1,5 +1,5 @@
 <?php
-// @phpcsSniff CodeQuality.NoRootNamespaceFunctions
+// @phpcsSniff Inpsyde.CodeQuality.NoRootNamespaceFunctions
 
 class Foo
 {
diff --git a/tests/fixtures/no-top-level-define.php b/tests/fixtures/no-top-level-define.php
index 36a324e..429aa5d 100644
--- a/tests/fixtures/no-top-level-define.php
+++ b/tests/fixtures/no-top-level-define.php
@@ -2,7 +2,7 @@
 
 namespace Inpsyde\CodingStandard\Tests\Fixtures;
 
-// @phpcsSniff CodeQuality.NoTopLevelDefine
+// @phpcsSniff Inpsyde.CodeQuality.NoTopLevelDefine
 
 if (!defined('X')) {
     define('X', 1);
@@ -15,4 +15,4 @@
 // @phpcsWarningOnNextLine
 define('Z', 1);
 
-const ZZZ = 1;
\ No newline at end of file
+const ZZZ = 1;
diff --git a/tests/fixtures/property-per-class-limit.php b/tests/fixtures/property-per-class-limit.php
index 39bcbca..40e7faa 100644
--- a/tests/fixtures/property-per-class-limit.php
+++ b/tests/fixtures/property-per-class-limit.php
@@ -1,5 +1,5 @@
 <?php
-// @phpcsSniff CodeQuality.PropertyPerClassLimit
+// @phpcsSniff Inpsyde.CodeQuality.PropertyPerClassLimit
 
 class Reasonable {
 
@@ -59,4 +59,4 @@ trait TooMuchPropsTrait {
     protected $_11;
     public $_12;
     private $_13;
-}
\ No newline at end of file
+}
diff --git a/tests/fixtures/return-type-declaration.php b/tests/fixtures/return-type-declaration.php
index e70dde3..885749c 100644
--- a/tests/fixtures/return-type-declaration.php
+++ b/tests/fixtures/return-type-declaration.php
@@ -1,5 +1,5 @@
 <?php
-// @phpcsSniff CodeQuality.ReturnTypeDeclaration
+// @phpcsSniff Inpsyde.CodeQuality.ReturnTypeDeclaration
 
 use Psr\Container\ContainerInterface as PsrContainer;
 
diff --git a/tests/fixtures/static-closure.php b/tests/fixtures/static-closure.php
index d4b2fc3..c90814a 100644
--- a/tests/fixtures/static-closure.php
+++ b/tests/fixtures/static-closure.php
@@ -1,5 +1,5 @@
 <?php
-// @phpcsSniff CodeQuality.StaticClosure
+// @phpcsSniff Inpsyde.CodeQuality.StaticClosure
 
 /**
  * @return string
diff --git a/tests/fixtures/trailing-semicolon.php b/tests/fixtures/trailing-semicolon.php
new file mode 100644
index 0000000..ce95cda
--- /dev/null
+++ b/tests/fixtures/trailing-semicolon.php
@@ -0,0 +1,27 @@
+<?php
+// @phpcsSniff InpsydeTemplates.Formatting.TrailingSemicolon
+
+?>
+
+<?= 'Test content'; // @phpcsWarningOnThisLine ?>
+<?= 'Without trailing semicolon' ?>
+
+<?php
+
+$content = 'New content';
+if ($content) {
+    echo $content;
+}
+?>
+
+<?php if ($content) : ?>
+    <?= $content ?>
+<?php endif; // @phpcsWarningOnThisLine ?>
+
+<?php // @phpcsWarningOnNextLine ?>
+<div aria-label="<?php echo $content; ?>">
+<?php // @phpcsWarningOnNextLine ?>
+    <?= $content; ?>
+</div>
+
+<?php
diff --git a/tests/fixtures/var-names-camel-case.php b/tests/fixtures/var-names-camel-case.php
index a495186..078bd4d 100644
--- a/tests/fixtures/var-names-camel-case.php
+++ b/tests/fixtures/var-names-camel-case.php
@@ -1,5 +1,5 @@
 <?php
-// @phpcsSniff CodeQuality.VariablesName
+// @phpcsSniff Inpsyde.CodeQuality.VariablesName
 
 // @phpcsSniffPropertiesStart
 // $checkType = "camelCase";
@@ -53,4 +53,4 @@ trait Bar {
 
     // @phpcsWarningOnNextLine
     var $foo_Bar = 'foo_Bar';
-}
\ No newline at end of file
+}
diff --git a/tests/fixtures/var-names-no-local.php b/tests/fixtures/var-names-no-local.php
index c304823..f646e05 100644
--- a/tests/fixtures/var-names-no-local.php
+++ b/tests/fixtures/var-names-no-local.php
@@ -1,5 +1,5 @@
 <?php
-// @phpcsSniff CodeQuality.VariablesName
+// @phpcsSniff Inpsyde.CodeQuality.VariablesName
 
 // @phpcsSniffPropertiesStart
 // $checkType = 'snake_case';
@@ -52,4 +52,4 @@ trait Bar {
 
     // @phpcsWarningOnNextLine
     var $foo_Bar = 'foo_Bar';
-}
\ No newline at end of file
+}
diff --git a/tests/fixtures/var-names-no-props.php b/tests/fixtures/var-names-no-props.php
index bf44746..17aa415 100644
--- a/tests/fixtures/var-names-no-props.php
+++ b/tests/fixtures/var-names-no-props.php
@@ -1,5 +1,5 @@
 <?php
-// @phpcsSniff CodeQuality.VariablesName
+// @phpcsSniff Inpsyde.CodeQuality.VariablesName
 
 // @phpcsSniffPropertiesStart
 // $ignoreProperties = "true";
@@ -47,4 +47,4 @@ trait Bar {
     protected $fooBar = 'fooBar';
 
     var $foo_Bar = 'foo_Bar';
-}
\ No newline at end of file
+}
diff --git a/tests/fixtures/var-names-snake-case.php b/tests/fixtures/var-names-snake-case.php
index 3f4f88d..57321f5 100644
--- a/tests/fixtures/var-names-snake-case.php
+++ b/tests/fixtures/var-names-snake-case.php
@@ -1,5 +1,5 @@
 <?php
-// @phpcsSniff CodeQuality.VariablesName
+// @phpcsSniff Inpsyde.CodeQuality.VariablesName
 
 // @phpcsSniffPropertiesStart
 // $checkType = 'snake_case';
@@ -60,4 +60,4 @@ trait Bar {
 
     // @phpcsWarningOnNextLine
     var $foo_Bar = 'foo_Bar';
-}
\ No newline at end of file
+}

From 847824ab199449837e442a6560acf95b5795e151 Mon Sep 17 00:00:00 2001
From: shvlv <v.shelmuk@inpsyde.com>
Date: Fri, 26 Jan 2024 23:30:57 +0200
Subject: [PATCH 3/7] docs: add TrailingSemicolon sniff documentation

---
 README.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/README.md b/README.md
index 7cc6a65..e914e55 100644
--- a/README.md
+++ b/README.md
@@ -182,6 +182,24 @@ For **notes and configuration** see [`/inpsyde-custom-sniffs.md`](/inpsyde-custo
 
 -------------
 
+## Templates Rules
+
+InpsydeTemplates ruleset contains custom rules targeted to the PHP templates and views.
+To enable the ruleset only for templates the following configuration could be used:
+
+```xml
+<rule ref="InpsydeTemplates">
+    <include-pattern>*/templates/*</include-pattern>
+    <include-pattern>*/views/*</include-pattern>
+</rule>
+```
+
+The following templates-specific rules are available:
+
+| Sniff name          | Description                                     | Has Config | Auto-Fixable |
+|:--------------------|:------------------------------------------------|:----------:|:------------:|
+| `TrailingSemicolon` | Remove trailing semicolon before close PHP tag. |            |      ✓       |
+
 # Removing or Disabling Rules
 
 ## Rules Tree

From 26c9ac5e814cf64f0992a1721d0a381aa2d501cf Mon Sep 17 00:00:00 2001
From: shvlv <v.shelmuk@inpsyde.com>
Date: Fri, 9 Feb 2024 09:47:03 +0200
Subject: [PATCH 4/7] feat: InpsydeTemplates inherits Inpsyde ruleset

---
 InpsydeTemplates/ruleset.xml |  4 ++++
 README.md                    | 28 ++++++++++++++++++++++------
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/InpsydeTemplates/ruleset.xml b/InpsydeTemplates/ruleset.xml
index 8b23714..098918e 100644
--- a/InpsydeTemplates/ruleset.xml
+++ b/InpsydeTemplates/ruleset.xml
@@ -3,4 +3,8 @@
 
     <description>Coding standards for PHP templates.</description>
 
+    <rule ref="Inpsyde">
+        <exclude name="Inpsyde.CodeQuality.NoElse" />
+    </rule>
+
 </ruleset>
diff --git a/README.md b/README.md
index e914e55..dd7ec6c 100644
--- a/README.md
+++ b/README.md
@@ -184,15 +184,31 @@ For **notes and configuration** see [`/inpsyde-custom-sniffs.md`](/inpsyde-custo
 
 ## Templates Rules
 
-InpsydeTemplates ruleset contains custom rules targeted to the PHP templates and views.
-To enable the ruleset only for templates the following configuration could be used:
+InpsydeTemplates ruleset extends Inpsyde ruleset apart from several rules that doesn't make sense in
+the templating context. Several template-specific sniffs are added.
+
+The recommended way of using InpsydeTemplates ruleset:
 
 ```xml
-<rule ref="InpsydeTemplates">
-    <include-pattern>*/templates/*</include-pattern>
-    <include-pattern>*/views/*</include-pattern>
-</rule>
+<ruleset>
+    <file>./src/</file>
+    <file>./tests</file>
+    <file>./templates</file>
+    <file>./block-views</file>
+
+    <rule ref="Inpsyde">
+        <exclude-pattern>*/templates/*</exclude-pattern>
+        <exclude-pattern>*/views/*</exclude-pattern>
+    </rule>
+
+    <rule ref="InpsydeTemplates">
+        <include-pattern>*/templates/*</include-pattern>
+        <include-pattern>*/views/*</include-pattern>
+    </rule>
+</ruleset>
 ```
+The following Inpsyde rules are disabled:
+* NoElse
 
 The following templates-specific rules are available:
 

From 6b9960e1aa34cbfba1472edefb0c4cf78c9f96a8 Mon Sep 17 00:00:00 2001
From: shvlv <v.shelmuk@inpsyde.com>
Date: Fri, 9 Feb 2024 15:09:57 +0200
Subject: [PATCH 5/7] docs: improve "Template Rules" section

---
 README.md | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index dd7ec6c..c20146b 100644
--- a/README.md
+++ b/README.md
@@ -182,12 +182,12 @@ For **notes and configuration** see [`/inpsyde-custom-sniffs.md`](/inpsyde-custo
 
 -------------
 
-## Templates Rules
+## Template Rules
 
-InpsydeTemplates ruleset extends Inpsyde ruleset apart from several rules that doesn't make sense in
-the templating context. Several template-specific sniffs are added.
+The `InpsydeTemplates` ruleset extends the standard `Inpsyde` ruleset with some template-specific
+sniffs while disabling some rules that are not useful in templating context.
 
-The recommended way of using InpsydeTemplates ruleset:
+The recommended way to use the `InpsydeTemplates` ruleset is as follows:
 
 ```xml
 <ruleset>
@@ -208,13 +208,13 @@ The recommended way of using InpsydeTemplates ruleset:
 </ruleset>
 ```
 The following Inpsyde rules are disabled:
-* NoElse
+* `NoElse`
 
 The following templates-specific rules are available:
 
-| Sniff name          | Description                                     | Has Config | Auto-Fixable |
-|:--------------------|:------------------------------------------------|:----------:|:------------:|
-| `TrailingSemicolon` | Remove trailing semicolon before close PHP tag. |            |      ✓       |
+| Sniff name          | Description                                       | Has Config | Auto-Fixable |
+|:--------------------|:--------------------------------------------------|:----------:|:------------:|
+| `TrailingSemicolon` | Remove trailing semicolon before closing PHP tag. |            |      ✓       |
 
 # Removing or Disabling Rules
 

From 827d5cd17b8c625a520f85de785779b0d1e8906f Mon Sep 17 00:00:00 2001
From: shvlv <v.shelmuk@inpsyde.com>
Date: Mon, 19 Feb 2024 22:02:41 +0200
Subject: [PATCH 6/7] style: format code; improve documentation

---
 InpsydeTemplates/Sniffs/Formatting/TrailingSemicolonSniff.php | 2 +-
 README.md                                                     | 4 ++--
 tests/fixtures/encoding-comment.php                           | 1 -
 tests/fixtures/trailing-semicolon.php                         | 1 -
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/InpsydeTemplates/Sniffs/Formatting/TrailingSemicolonSniff.php b/InpsydeTemplates/Sniffs/Formatting/TrailingSemicolonSniff.php
index 0496c74..caa7a96 100644
--- a/InpsydeTemplates/Sniffs/Formatting/TrailingSemicolonSniff.php
+++ b/InpsydeTemplates/Sniffs/Formatting/TrailingSemicolonSniff.php
@@ -86,7 +86,7 @@ public function process(File $phpcsFile, $stackPtr): void
             return;
         }
 
-        $message = sprintf('Trailing semicolon found at line %d.', $currentLine);
+        $message = sprintf('Trailing semicolon found in line %d.', $currentLine);
 
         if ($phpcsFile->addFixableWarning($message, $stackPtr, 'Found')) {
             $this->fix($stackPtr, $phpcsFile);
diff --git a/README.md b/README.md
index c20146b..9938325 100644
--- a/README.md
+++ b/README.md
@@ -194,7 +194,7 @@ The recommended way to use the `InpsydeTemplates` ruleset is as follows:
     <file>./src/</file>
     <file>./tests</file>
     <file>./templates</file>
-    <file>./block-views</file>
+    <file>./views</file>
 
     <rule ref="Inpsyde">
         <exclude-pattern>*/templates/*</exclude-pattern>
@@ -207,7 +207,7 @@ The recommended way to use the `InpsydeTemplates` ruleset is as follows:
     </rule>
 </ruleset>
 ```
-The following Inpsyde rules are disabled:
+The following `Inpsyde` rules are disabled:
 * `NoElse`
 
 The following templates-specific rules are available:
diff --git a/tests/fixtures/encoding-comment.php b/tests/fixtures/encoding-comment.php
index 6ccf639..f400d92 100644
--- a/tests/fixtures/encoding-comment.php
+++ b/tests/fixtures/encoding-comment.php
@@ -15,4 +15,3 @@
 
 <?php //-*- coding: utf-8 -*-
 // @phpcsWarningOnPreviousLine CodeQuality.EncodingComment
-?>
diff --git a/tests/fixtures/trailing-semicolon.php b/tests/fixtures/trailing-semicolon.php
index ce95cda..89a6a9b 100644
--- a/tests/fixtures/trailing-semicolon.php
+++ b/tests/fixtures/trailing-semicolon.php
@@ -7,7 +7,6 @@
 <?= 'Without trailing semicolon' ?>
 
 <?php
-
 $content = 'New content';
 if ($content) {
     echo $content;

From b6a1599ea426813c98dcd45d1f449710edfe7db1 Mon Sep 17 00:00:00 2001
From: Giuseppe Mazzapica <giuseppe.mazzapica@gmail.com>
Date: Sun, 25 Feb 2024 18:16:51 +0100
Subject: [PATCH 7/7] Fix Psalm for PHP 7.4

---
 Inpsyde/Helpers/FunctionDocBlock.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Inpsyde/Helpers/FunctionDocBlock.php b/Inpsyde/Helpers/FunctionDocBlock.php
index 605a7ff..72a2e5f 100644
--- a/Inpsyde/Helpers/FunctionDocBlock.php
+++ b/Inpsyde/Helpers/FunctionDocBlock.php
@@ -170,11 +170,10 @@ public static function normalizeTypesString(string $typesString): array
             if (strpos($splitType, '&') !== false) {
                 $splitType = rtrim(ltrim($splitType, '('), ')');
             } elseif (strpos($splitType, '?') === 0) {
-                $splitType = substr($splitType, 1);
-                $hasNull = $hasNull || (($splitType !== '') && ($splitType !== false));
+                $splitType = (string) substr($splitType, 1);
+                $hasNull = $hasNull || ($splitType !== '');
             }
-            /** @psalm-suppress DocblockTypeContradiction */
-            if (($splitType === false) || ($splitType === '')) {
+            if ($splitType === '') {
                 continue;
             }
             if (strtolower($splitType) === 'null') {