From a6116b775ad5257aa48b657b060bff454219bdc4 Mon Sep 17 00:00:00 2001
From: Volodymyr Shelmuk <v.shelmuk@inpsyde.com>
Date: Thu, 7 Mar 2024 09:37:39 +0200
Subject: [PATCH 1/6] tests: add E2E tests

---
 composer.json                                 |  3 +-
 phpunit.xml.dist                              |  3 +
 tests/e2e/E2eTest.php                         | 97 +++++++++++++++++++
 tests/e2e/test-package/index.php              | 14 +++
 tests/e2e/test-package/phpcs.xml              | 20 ++++
 tests/e2e/test-package/templates/template.php | 15 +++
 6 files changed, 151 insertions(+), 1 deletion(-)
 create mode 100644 tests/e2e/E2eTest.php
 create mode 100644 tests/e2e/test-package/index.php
 create mode 100644 tests/e2e/test-package/phpcs.xml
 create mode 100644 tests/e2e/test-package/templates/template.php

diff --git a/composer.json b/composer.json
index fe89f1a..4bb7262 100644
--- a/composer.json
+++ b/composer.json
@@ -50,7 +50,8 @@
         "psr-4": {
             "Inpsyde\\CodingStandard\\Tests\\": [
                 "tests/src/",
-                "tests/cases/"
+                "tests/cases/",
+                "tests/e2e/"
             ]
         }
     },
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 826c5fa..0be95d0 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -16,5 +16,8 @@
         <testsuite name="helpers">
             <directory>tests/cases/Helpers</directory>
         </testsuite>
+        <testsuite name="e2e">
+            <directory>tests/e2e/E2eTest.php</directory>
+        </testsuite>
     </testsuites>
 </phpunit>
diff --git a/tests/e2e/E2eTest.php b/tests/e2e/E2eTest.php
new file mode 100644
index 0000000..9c1d8b5
--- /dev/null
+++ b/tests/e2e/E2eTest.php
@@ -0,0 +1,97 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Inpsyde\CodingStandard\Tests;
+
+use RuntimeException;
+
+class E2eTest extends TestCase
+{
+    private string $testPackagePath = '';
+    private string $phpCsBinary = '';
+
+    protected function setUp(): void
+    {
+        $libPath = (string) getenv('LIB_PATH');
+        $this->testPackagePath = $libPath . '/tests/e2e/test-package';
+        $this->phpCsBinary = $libPath . '/vendor/bin/phpcs';
+    }
+
+    public function testInpsydeAndTemplatesRulesets(): void
+    {
+        $output = [];
+        exec(
+            sprintf(
+                'cd %s && %s',
+                $this->testPackagePath,
+                $this->phpCsBinary
+            ),
+            $output
+        );
+
+        /** @var array<string> $output> */
+        if ($output[0] !== 'EE 2 / 2 (100%)') {
+            throw new RuntimeException(implode("\n", $output));
+        }
+
+        $json = end($output);
+
+        self::assertSame([
+            'index.php' => [
+                [
+                    'source' => 'Inpsyde.CodeQuality.NoElse.ElseFound',
+                    'line' => 12,
+                ],
+                [
+                    'source' => 'WordPress.Security.EscapeOutput.OutputNotEscaped',
+                    'line' => 13,
+                ],
+            ],
+            'template.php' => [
+
+                [
+                    'source' => 'WordPress.Security.EscapeOutput.OutputNotEscaped',
+                    'line' => 12,
+                ],
+                [
+                    'source' => 'InpsydeTemplates.Formatting.TrailingSemicolon.Found',
+                    'line' => 12,
+                ],
+                [
+                    'source' => 'Inpsyde.CodeQuality.DisableCallUserFunc.call_user_func_call_user_func',
+                    'line' => 15,
+                ],
+
+            ],
+        ], $this->phpCsNormalizedOutput($json));
+    }
+
+    /**
+     * @psalm-return array<string, list<array{source: string, line: positive-int}>>
+     */
+    private function phpCsNormalizedOutput(string $json): array
+    {
+        /** @var array{
+         *     files: array<string, array{
+         *         messages: list<array{
+         *             source: string,
+         *             line: positive-int,
+         *             ...
+         *             }>
+         *        }>
+         *     } $data */
+        $data = json_decode($json, true, 512, JSON_THROW_ON_ERROR);
+
+        $result = [];
+        foreach ($data['files'] as $fileName => $fileData) {
+            $baseName = basename($fileName);
+            $result[$baseName] = [];
+            foreach ($fileData['messages'] as ['source' => $source, 'line' => $line]) {
+                $result[$baseName][] = ['source' => $source, 'line' => $line];
+            }
+        }
+
+        return $result;
+    }
+}
diff --git a/tests/e2e/test-package/index.php b/tests/e2e/test-package/index.php
new file mode 100644
index 0000000..9193c39
--- /dev/null
+++ b/tests/e2e/test-package/index.php
@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+$value = rand(0, 1);
+
+$successMessage = 'Success!';
+$errorMessage = 'Error!';
+
+if ($value > 0.5) {
+    echo esc_html($successMessage);
+} else {
+    echo $errorMessage;
+}
diff --git a/tests/e2e/test-package/phpcs.xml b/tests/e2e/test-package/phpcs.xml
new file mode 100644
index 0000000..70eccce
--- /dev/null
+++ b/tests/e2e/test-package/phpcs.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<ruleset name="Coding Standard Test">
+
+    <file>./index.php</file>
+    <file>./templates</file>
+
+    <arg value="sp"/>
+    <arg name="report" value="json"/>
+
+    <rule ref="Inpsyde"/>
+
+    <rule ref="Inpsyde.CodeQuality.NoElse">
+        <exclude-pattern>*/templates/*</exclude-pattern>
+    </rule>
+
+    <rule ref="InpsydeTemplates">
+        <include-pattern>*/templates/*</include-pattern>
+    </rule>
+
+</ruleset>
diff --git a/tests/e2e/test-package/templates/template.php b/tests/e2e/test-package/templates/template.php
new file mode 100644
index 0000000..2ebddc0
--- /dev/null
+++ b/tests/e2e/test-package/templates/template.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+$value = rand(0, 1);
+$successMessage = 'Success!';
+$errorMessage = 'Error!' ?>
+
+<?php if ($value > 0.5) : ?>
+    <?= esc_html($successMessage) ?>
+<?php else : ?>
+    <?= $errorMessage; ?>
+<?php endif;
+
+call_user_func('strtolower', 'foo');
\ No newline at end of file

From 5ef5fa7bdcc12f501ee2b658f4a116b628b33638 Mon Sep 17 00:00:00 2001
From: Volodymyr Shelmuk <v.shelmuk@inpsyde.com>
Date: Thu, 7 Mar 2024 09:44:46 +0200
Subject: [PATCH 2/6] style: format code

---
 phpcs.xml             |  1 +
 tests/e2e/E2eTest.php | 11 ++++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/phpcs.xml b/phpcs.xml
index deef883..d86df83 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -7,6 +7,7 @@
     <file>./Inpsyde/Sniffs</file>
     <file>./tests/src</file>
     <file>./tests/cases</file>
+    <file>./tests/e2e/E2eTest.php</file>
 
     <!--
     PHP 7.4 and higher.
diff --git a/tests/e2e/E2eTest.php b/tests/e2e/E2eTest.php
index 9c1d8b5..244c070 100644
--- a/tests/e2e/E2eTest.php
+++ b/tests/e2e/E2eTest.php
@@ -21,6 +21,7 @@ protected function setUp(): void
     public function testInpsydeAndTemplatesRulesets(): void
     {
         $output = [];
+        // phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions.system_calls_exec
         exec(
             sprintf(
                 'cd %s && %s',
@@ -37,7 +38,8 @@ public function testInpsydeAndTemplatesRulesets(): void
 
         $json = end($output);
 
-        self::assertSame([
+        // phpcs:disable Inpsyde.CodeQuality.LineLength.TooLong
+        $expectedMessages = [
             'index.php' => [
                 [
                     'source' => 'Inpsyde.CodeQuality.NoElse.ElseFound',
@@ -64,13 +66,16 @@ public function testInpsydeAndTemplatesRulesets(): void
                 ],
 
             ],
-        ], $this->phpCsNormalizedOutput($json));
+        ];
+        // phpcs:enable Inpsyde.CodeQuality.LineLength.TooLong
+
+        self::assertSame($expectedMessages, $this->phpCsMessages($json));
     }
 
     /**
      * @psalm-return array<string, list<array{source: string, line: positive-int}>>
      */
-    private function phpCsNormalizedOutput(string $json): array
+    private function phpCsMessages(string $json): array
     {
         /** @var array{
          *     files: array<string, array{

From 9693025f14e3c098050ce8a0c03a1b401f114b19 Mon Sep 17 00:00:00 2001
From: Volodymyr Shelmuk <v.shelmuk@inpsyde.com>
Date: Thu, 7 Mar 2024 21:05:47 +0200
Subject: [PATCH 3/6] refactor: reorganize tests code

---
 composer.json                                               | 2 +-
 phpunit.xml.dist                                            | 6 +++---
 tests/bootstrap.php                                         | 2 +-
 tests/e2e/{ => cases}/E2eTest.php                           | 5 +++--
 tests/e2e/{ => fixtures}/test-package/index.php             | 0
 tests/e2e/{ => fixtures}/test-package/phpcs.xml             | 0
 .../e2e/{ => fixtures}/test-package/templates/template.php  | 0
 tests/{ => unit}/cases/FixturesTest.php                     | 0
 tests/{ => unit}/cases/Helpers/FunctionDocBlocTest.php      | 0
 .../cases/Helpers/FunctionReturnStatementTest.php           | 0
 tests/{ => unit}/cases/Helpers/FunctionsTest.php            | 0
 tests/{ => unit}/cases/Helpers/MiscTest.php                 | 0
 tests/{ => unit}/cases/Helpers/NamesTest.php                | 0
 tests/{ => unit}/cases/Helpers/ObjectsTest.php              | 0
 tests/{ => unit}/cases/Helpers/WpHooksTest.php              | 0
 tests/{ => unit}/fixtures/Psr4Fixture.php                   | 0
 tests/{ => unit}/fixtures/argument-type-declaration.php     | 0
 tests/{ => unit}/fixtures/disable-call-user-func.php        | 0
 tests/{ => unit}/fixtures/disallow-magic-serialize.php      | 0
 tests/{ => unit}/fixtures/disallow-short-open-tag.php       | 0
 tests/{ => unit}/fixtures/element-name-minimal-length.php   | 0
 tests/{ => unit}/fixtures/encoding-comment.php              | 0
 tests/{ => unit}/fixtures/forbidden-public-property.php     | 0
 tests/{ => unit}/fixtures/function-body-start.php           | 0
 .../{ => unit}/fixtures/function-length-no-blank-lines.php  | 0
 tests/{ => unit}/fixtures/function-length-no-comments.php   | 0
 tests/{ => unit}/fixtures/function-length.php               | 0
 tests/{ => unit}/fixtures/hook-closure-return.php           | 0
 tests/{ => unit}/fixtures/hook-priority.php                 | 0
 tests/{ => unit}/fixtures/line-length.php                   | 0
 tests/{ => unit}/fixtures/nesting-level.php                 | 0
 tests/{ => unit}/fixtures/no-accessors.php                  | 0
 tests/{ => unit}/fixtures/no-else.php                       | 0
 .../fixtures/no-root-namespace-functions-multi.php          | 0
 .../fixtures/no-root-namespace-functions-single.php         | 0
 tests/{ => unit}/fixtures/no-top-level-define.php           | 0
 tests/{ => unit}/fixtures/property-per-class-limit.php      | 0
 tests/{ => unit}/fixtures/return-type-declaration.php       | 0
 tests/{ => unit}/fixtures/static-closure.php                | 0
 tests/{ => unit}/fixtures/trailing-semicolon.php            | 0
 tests/{ => unit}/fixtures/var-names-camel-case.php          | 0
 tests/{ => unit}/fixtures/var-names-no-local.php            | 0
 tests/{ => unit}/fixtures/var-names-no-props.php            | 0
 tests/{ => unit}/fixtures/var-names-snake-case.php          | 0
 44 files changed, 8 insertions(+), 7 deletions(-)
 rename tests/e2e/{ => cases}/E2eTest.php (94%)
 rename tests/e2e/{ => fixtures}/test-package/index.php (100%)
 rename tests/e2e/{ => fixtures}/test-package/phpcs.xml (100%)
 rename tests/e2e/{ => fixtures}/test-package/templates/template.php (100%)
 rename tests/{ => unit}/cases/FixturesTest.php (100%)
 rename tests/{ => unit}/cases/Helpers/FunctionDocBlocTest.php (100%)
 rename tests/{ => unit}/cases/Helpers/FunctionReturnStatementTest.php (100%)
 rename tests/{ => unit}/cases/Helpers/FunctionsTest.php (100%)
 rename tests/{ => unit}/cases/Helpers/MiscTest.php (100%)
 rename tests/{ => unit}/cases/Helpers/NamesTest.php (100%)
 rename tests/{ => unit}/cases/Helpers/ObjectsTest.php (100%)
 rename tests/{ => unit}/cases/Helpers/WpHooksTest.php (100%)
 rename tests/{ => unit}/fixtures/Psr4Fixture.php (100%)
 rename tests/{ => unit}/fixtures/argument-type-declaration.php (100%)
 rename tests/{ => unit}/fixtures/disable-call-user-func.php (100%)
 rename tests/{ => unit}/fixtures/disallow-magic-serialize.php (100%)
 rename tests/{ => unit}/fixtures/disallow-short-open-tag.php (100%)
 rename tests/{ => unit}/fixtures/element-name-minimal-length.php (100%)
 rename tests/{ => unit}/fixtures/encoding-comment.php (100%)
 rename tests/{ => unit}/fixtures/forbidden-public-property.php (100%)
 rename tests/{ => unit}/fixtures/function-body-start.php (100%)
 rename tests/{ => unit}/fixtures/function-length-no-blank-lines.php (100%)
 rename tests/{ => unit}/fixtures/function-length-no-comments.php (100%)
 rename tests/{ => unit}/fixtures/function-length.php (100%)
 rename tests/{ => unit}/fixtures/hook-closure-return.php (100%)
 rename tests/{ => unit}/fixtures/hook-priority.php (100%)
 rename tests/{ => unit}/fixtures/line-length.php (100%)
 rename tests/{ => unit}/fixtures/nesting-level.php (100%)
 rename tests/{ => unit}/fixtures/no-accessors.php (100%)
 rename tests/{ => unit}/fixtures/no-else.php (100%)
 rename tests/{ => unit}/fixtures/no-root-namespace-functions-multi.php (100%)
 rename tests/{ => unit}/fixtures/no-root-namespace-functions-single.php (100%)
 rename tests/{ => unit}/fixtures/no-top-level-define.php (100%)
 rename tests/{ => unit}/fixtures/property-per-class-limit.php (100%)
 rename tests/{ => unit}/fixtures/return-type-declaration.php (100%)
 rename tests/{ => unit}/fixtures/static-closure.php (100%)
 rename tests/{ => unit}/fixtures/trailing-semicolon.php (100%)
 rename tests/{ => unit}/fixtures/var-names-camel-case.php (100%)
 rename tests/{ => unit}/fixtures/var-names-no-local.php (100%)
 rename tests/{ => unit}/fixtures/var-names-no-props.php (100%)
 rename tests/{ => unit}/fixtures/var-names-snake-case.php (100%)

diff --git a/composer.json b/composer.json
index 4bb7262..5129a5b 100644
--- a/composer.json
+++ b/composer.json
@@ -50,7 +50,7 @@
         "psr-4": {
             "Inpsyde\\CodingStandard\\Tests\\": [
                 "tests/src/",
-                "tests/cases/",
+                "tests/unit/",
                 "tests/e2e/"
             ]
         }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 0be95d0..2e160a3 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -11,13 +11,13 @@
     </coverage>
     <testsuites>
         <testsuite name="fixtures">
-            <file>tests/cases/FixturesTest.php</file>
+            <file>tests/unit/cases/FixturesTest.php</file>
         </testsuite>
         <testsuite name="helpers">
-            <directory>tests/cases/Helpers</directory>
+            <directory>tests/unit/cases/Helpers</directory>
         </testsuite>
         <testsuite name="e2e">
-            <directory>tests/e2e/E2eTest.php</directory>
+            <directory>tests/e2e/cases</directory>
         </testsuite>
     </testsuites>
 </phpunit>
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index ea8ee05..3effb55 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -37,7 +37,7 @@
 
 putenv("LIB_PATH={$libDir}");
 putenv('SNIFFS_NAMESPACE=Inpsyde\\Sniffs');
-putenv("FIXTURES_PATH={$testsDir}/fixtures");
+putenv("FIXTURES_PATH={$testsDir}/unit/fixtures");
 
 if (!defined('PHPUNIT_COMPOSER_INSTALL')) {
     define('PHPUNIT_COMPOSER_INSTALL', $autoload);
diff --git a/tests/e2e/E2eTest.php b/tests/e2e/cases/E2eTest.php
similarity index 94%
rename from tests/e2e/E2eTest.php
rename to tests/e2e/cases/E2eTest.php
index 244c070..8c5e0b5 100644
--- a/tests/e2e/E2eTest.php
+++ b/tests/e2e/cases/E2eTest.php
@@ -2,8 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Inpsyde\CodingStandard\Tests;
+namespace Inpsyde\CodingStandard\Tests\cases;
 
+use Inpsyde\CodingStandard\Tests\TestCase;
 use RuntimeException;
 
 class E2eTest extends TestCase
@@ -14,7 +15,7 @@ class E2eTest extends TestCase
     protected function setUp(): void
     {
         $libPath = (string) getenv('LIB_PATH');
-        $this->testPackagePath = $libPath . '/tests/e2e/test-package';
+        $this->testPackagePath = $libPath . '/tests/e2e/fixtures/test-package';
         $this->phpCsBinary = $libPath . '/vendor/bin/phpcs';
     }
 
diff --git a/tests/e2e/test-package/index.php b/tests/e2e/fixtures/test-package/index.php
similarity index 100%
rename from tests/e2e/test-package/index.php
rename to tests/e2e/fixtures/test-package/index.php
diff --git a/tests/e2e/test-package/phpcs.xml b/tests/e2e/fixtures/test-package/phpcs.xml
similarity index 100%
rename from tests/e2e/test-package/phpcs.xml
rename to tests/e2e/fixtures/test-package/phpcs.xml
diff --git a/tests/e2e/test-package/templates/template.php b/tests/e2e/fixtures/test-package/templates/template.php
similarity index 100%
rename from tests/e2e/test-package/templates/template.php
rename to tests/e2e/fixtures/test-package/templates/template.php
diff --git a/tests/cases/FixturesTest.php b/tests/unit/cases/FixturesTest.php
similarity index 100%
rename from tests/cases/FixturesTest.php
rename to tests/unit/cases/FixturesTest.php
diff --git a/tests/cases/Helpers/FunctionDocBlocTest.php b/tests/unit/cases/Helpers/FunctionDocBlocTest.php
similarity index 100%
rename from tests/cases/Helpers/FunctionDocBlocTest.php
rename to tests/unit/cases/Helpers/FunctionDocBlocTest.php
diff --git a/tests/cases/Helpers/FunctionReturnStatementTest.php b/tests/unit/cases/Helpers/FunctionReturnStatementTest.php
similarity index 100%
rename from tests/cases/Helpers/FunctionReturnStatementTest.php
rename to tests/unit/cases/Helpers/FunctionReturnStatementTest.php
diff --git a/tests/cases/Helpers/FunctionsTest.php b/tests/unit/cases/Helpers/FunctionsTest.php
similarity index 100%
rename from tests/cases/Helpers/FunctionsTest.php
rename to tests/unit/cases/Helpers/FunctionsTest.php
diff --git a/tests/cases/Helpers/MiscTest.php b/tests/unit/cases/Helpers/MiscTest.php
similarity index 100%
rename from tests/cases/Helpers/MiscTest.php
rename to tests/unit/cases/Helpers/MiscTest.php
diff --git a/tests/cases/Helpers/NamesTest.php b/tests/unit/cases/Helpers/NamesTest.php
similarity index 100%
rename from tests/cases/Helpers/NamesTest.php
rename to tests/unit/cases/Helpers/NamesTest.php
diff --git a/tests/cases/Helpers/ObjectsTest.php b/tests/unit/cases/Helpers/ObjectsTest.php
similarity index 100%
rename from tests/cases/Helpers/ObjectsTest.php
rename to tests/unit/cases/Helpers/ObjectsTest.php
diff --git a/tests/cases/Helpers/WpHooksTest.php b/tests/unit/cases/Helpers/WpHooksTest.php
similarity index 100%
rename from tests/cases/Helpers/WpHooksTest.php
rename to tests/unit/cases/Helpers/WpHooksTest.php
diff --git a/tests/fixtures/Psr4Fixture.php b/tests/unit/fixtures/Psr4Fixture.php
similarity index 100%
rename from tests/fixtures/Psr4Fixture.php
rename to tests/unit/fixtures/Psr4Fixture.php
diff --git a/tests/fixtures/argument-type-declaration.php b/tests/unit/fixtures/argument-type-declaration.php
similarity index 100%
rename from tests/fixtures/argument-type-declaration.php
rename to tests/unit/fixtures/argument-type-declaration.php
diff --git a/tests/fixtures/disable-call-user-func.php b/tests/unit/fixtures/disable-call-user-func.php
similarity index 100%
rename from tests/fixtures/disable-call-user-func.php
rename to tests/unit/fixtures/disable-call-user-func.php
diff --git a/tests/fixtures/disallow-magic-serialize.php b/tests/unit/fixtures/disallow-magic-serialize.php
similarity index 100%
rename from tests/fixtures/disallow-magic-serialize.php
rename to tests/unit/fixtures/disallow-magic-serialize.php
diff --git a/tests/fixtures/disallow-short-open-tag.php b/tests/unit/fixtures/disallow-short-open-tag.php
similarity index 100%
rename from tests/fixtures/disallow-short-open-tag.php
rename to tests/unit/fixtures/disallow-short-open-tag.php
diff --git a/tests/fixtures/element-name-minimal-length.php b/tests/unit/fixtures/element-name-minimal-length.php
similarity index 100%
rename from tests/fixtures/element-name-minimal-length.php
rename to tests/unit/fixtures/element-name-minimal-length.php
diff --git a/tests/fixtures/encoding-comment.php b/tests/unit/fixtures/encoding-comment.php
similarity index 100%
rename from tests/fixtures/encoding-comment.php
rename to tests/unit/fixtures/encoding-comment.php
diff --git a/tests/fixtures/forbidden-public-property.php b/tests/unit/fixtures/forbidden-public-property.php
similarity index 100%
rename from tests/fixtures/forbidden-public-property.php
rename to tests/unit/fixtures/forbidden-public-property.php
diff --git a/tests/fixtures/function-body-start.php b/tests/unit/fixtures/function-body-start.php
similarity index 100%
rename from tests/fixtures/function-body-start.php
rename to tests/unit/fixtures/function-body-start.php
diff --git a/tests/fixtures/function-length-no-blank-lines.php b/tests/unit/fixtures/function-length-no-blank-lines.php
similarity index 100%
rename from tests/fixtures/function-length-no-blank-lines.php
rename to tests/unit/fixtures/function-length-no-blank-lines.php
diff --git a/tests/fixtures/function-length-no-comments.php b/tests/unit/fixtures/function-length-no-comments.php
similarity index 100%
rename from tests/fixtures/function-length-no-comments.php
rename to tests/unit/fixtures/function-length-no-comments.php
diff --git a/tests/fixtures/function-length.php b/tests/unit/fixtures/function-length.php
similarity index 100%
rename from tests/fixtures/function-length.php
rename to tests/unit/fixtures/function-length.php
diff --git a/tests/fixtures/hook-closure-return.php b/tests/unit/fixtures/hook-closure-return.php
similarity index 100%
rename from tests/fixtures/hook-closure-return.php
rename to tests/unit/fixtures/hook-closure-return.php
diff --git a/tests/fixtures/hook-priority.php b/tests/unit/fixtures/hook-priority.php
similarity index 100%
rename from tests/fixtures/hook-priority.php
rename to tests/unit/fixtures/hook-priority.php
diff --git a/tests/fixtures/line-length.php b/tests/unit/fixtures/line-length.php
similarity index 100%
rename from tests/fixtures/line-length.php
rename to tests/unit/fixtures/line-length.php
diff --git a/tests/fixtures/nesting-level.php b/tests/unit/fixtures/nesting-level.php
similarity index 100%
rename from tests/fixtures/nesting-level.php
rename to tests/unit/fixtures/nesting-level.php
diff --git a/tests/fixtures/no-accessors.php b/tests/unit/fixtures/no-accessors.php
similarity index 100%
rename from tests/fixtures/no-accessors.php
rename to tests/unit/fixtures/no-accessors.php
diff --git a/tests/fixtures/no-else.php b/tests/unit/fixtures/no-else.php
similarity index 100%
rename from tests/fixtures/no-else.php
rename to tests/unit/fixtures/no-else.php
diff --git a/tests/fixtures/no-root-namespace-functions-multi.php b/tests/unit/fixtures/no-root-namespace-functions-multi.php
similarity index 100%
rename from tests/fixtures/no-root-namespace-functions-multi.php
rename to tests/unit/fixtures/no-root-namespace-functions-multi.php
diff --git a/tests/fixtures/no-root-namespace-functions-single.php b/tests/unit/fixtures/no-root-namespace-functions-single.php
similarity index 100%
rename from tests/fixtures/no-root-namespace-functions-single.php
rename to tests/unit/fixtures/no-root-namespace-functions-single.php
diff --git a/tests/fixtures/no-top-level-define.php b/tests/unit/fixtures/no-top-level-define.php
similarity index 100%
rename from tests/fixtures/no-top-level-define.php
rename to tests/unit/fixtures/no-top-level-define.php
diff --git a/tests/fixtures/property-per-class-limit.php b/tests/unit/fixtures/property-per-class-limit.php
similarity index 100%
rename from tests/fixtures/property-per-class-limit.php
rename to tests/unit/fixtures/property-per-class-limit.php
diff --git a/tests/fixtures/return-type-declaration.php b/tests/unit/fixtures/return-type-declaration.php
similarity index 100%
rename from tests/fixtures/return-type-declaration.php
rename to tests/unit/fixtures/return-type-declaration.php
diff --git a/tests/fixtures/static-closure.php b/tests/unit/fixtures/static-closure.php
similarity index 100%
rename from tests/fixtures/static-closure.php
rename to tests/unit/fixtures/static-closure.php
diff --git a/tests/fixtures/trailing-semicolon.php b/tests/unit/fixtures/trailing-semicolon.php
similarity index 100%
rename from tests/fixtures/trailing-semicolon.php
rename to tests/unit/fixtures/trailing-semicolon.php
diff --git a/tests/fixtures/var-names-camel-case.php b/tests/unit/fixtures/var-names-camel-case.php
similarity index 100%
rename from tests/fixtures/var-names-camel-case.php
rename to tests/unit/fixtures/var-names-camel-case.php
diff --git a/tests/fixtures/var-names-no-local.php b/tests/unit/fixtures/var-names-no-local.php
similarity index 100%
rename from tests/fixtures/var-names-no-local.php
rename to tests/unit/fixtures/var-names-no-local.php
diff --git a/tests/fixtures/var-names-no-props.php b/tests/unit/fixtures/var-names-no-props.php
similarity index 100%
rename from tests/fixtures/var-names-no-props.php
rename to tests/unit/fixtures/var-names-no-props.php
diff --git a/tests/fixtures/var-names-snake-case.php b/tests/unit/fixtures/var-names-snake-case.php
similarity index 100%
rename from tests/fixtures/var-names-snake-case.php
rename to tests/unit/fixtures/var-names-snake-case.php

From 63f97c04fc30b988d4f9c23532e2815b8213048f Mon Sep 17 00:00:00 2001
From: Volodymyr Shelmuk <v.shelmuk@inpsyde.com>
Date: Thu, 7 Mar 2024 21:24:15 +0200
Subject: [PATCH 4/6] refactor: update root phpcs.xml

---
 phpcs.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/phpcs.xml b/phpcs.xml
index d86df83..3b76805 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -6,8 +6,8 @@
     <file>./Inpsyde/Helpers</file>
     <file>./Inpsyde/Sniffs</file>
     <file>./tests/src</file>
-    <file>./tests/cases</file>
-    <file>./tests/e2e/E2eTest.php</file>
+    <file>./tests/unit/cases</file>
+    <file>./tests/e2e/cases</file>
 
     <!--
     PHP 7.4 and higher.
@@ -25,7 +25,7 @@
     </rule>
 
     <rule ref="Inpsyde.CodeQuality.FunctionLength">
-        <exclude-pattern>./tests/cases/</exclude-pattern>
+        <exclude-pattern>./tests/unit/cases/</exclude-pattern>
     </rule>
 
 </ruleset>

From 2385ad21a6cc92c084316557ee4f6b8f29228b25 Mon Sep 17 00:00:00 2001
From: Volodymyr Shelmuk <v.shelmuk@inpsyde.com>
Date: Thu, 7 Mar 2024 21:25:08 +0200
Subject: [PATCH 5/6] refactor: fix Psr4Fixture sniff property

---
 tests/unit/fixtures/Psr4Fixture.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/fixtures/Psr4Fixture.php b/tests/unit/fixtures/Psr4Fixture.php
index f3b1f60..423bc13 100644
--- a/tests/unit/fixtures/Psr4Fixture.php
+++ b/tests/unit/fixtures/Psr4Fixture.php
@@ -4,7 +4,7 @@
 namespace {
 
     // @phpcsSniffPropertiesStart
-    $psr4 = ["\\Inpsyde\\CodingStandard\\Tests\\" => "tests/"];
+    $psr4 = ["\\Inpsyde\\CodingStandard\\Tests\\" => "tests/unit"];
     $exclude = ["\\I\\Am\\Excluded\\Psr4Fixture"];
     // @phpcsSniffPropertiesEnd
 }

From 0aae3e5c922470f0aa7691514a5ca4e668a702ca Mon Sep 17 00:00:00 2001
From: Volodymyr Shelmuk <v.shelmuk@inpsyde.com>
Date: Mon, 11 Mar 2024 12:44:49 +0200
Subject: [PATCH 6/6] format: fix PSR4 violations

---
 composer.json               |  4 ++--
 phpcs.xml                   | 10 ++++++++++
 tests/e2e/cases/E2eTest.php |  3 +--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index 5129a5b..0c9dd94 100644
--- a/composer.json
+++ b/composer.json
@@ -50,8 +50,8 @@
         "psr-4": {
             "Inpsyde\\CodingStandard\\Tests\\": [
                 "tests/src/",
-                "tests/unit/",
-                "tests/e2e/"
+                "tests/unit/cases",
+                "tests/e2e/cases"
             ]
         }
     },
diff --git a/phpcs.xml b/phpcs.xml
index 3b76805..bd37844 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -28,4 +28,14 @@
         <exclude-pattern>./tests/unit/cases/</exclude-pattern>
     </rule>
 
+    <rule ref="Inpsyde.CodeQuality.Psr4">
+        <exclude-pattern>./Inpsyde/Sniffs/</exclude-pattern>
+        <properties>
+            <property name="psr4" type="array">
+                <element key="Inpsyde\CodingStandard\Helpers" value="Inpsyde/Helpers"/>
+                <element key="Inpsyde\CodingStandard\Tests" value="tests/src|tests/unit/cases|tests/e2e/cases"/>
+            </property>
+        </properties>
+    </rule>
+
 </ruleset>
diff --git a/tests/e2e/cases/E2eTest.php b/tests/e2e/cases/E2eTest.php
index 8c5e0b5..b676fb4 100644
--- a/tests/e2e/cases/E2eTest.php
+++ b/tests/e2e/cases/E2eTest.php
@@ -2,9 +2,8 @@
 
 declare(strict_types=1);
 
-namespace Inpsyde\CodingStandard\Tests\cases;
+namespace Inpsyde\CodingStandard\Tests;
 
-use Inpsyde\CodingStandard\Tests\TestCase;
 use RuntimeException;
 
 class E2eTest extends TestCase