diff --git a/Eventjet/ruleset.xml b/Eventjet/ruleset.xml
index 920d2f9..ca4b4aa 100644
--- a/Eventjet/ruleset.xml
+++ b/Eventjet/ruleset.xml
@@ -80,8 +80,12 @@
     <!-- Forbid `AND` and `OR`, require `&&` and `||` -->
     <rule ref="Squiz.Operators.ValidLogicalOperators"/>
 
-    <!-- Forbid `$this` inside static function -->
-    <rule ref="Squiz.Scope.StaticThisUsage"/>
+    <!-- `$this` in a static method is lint territory — PHPStan and Psalm both
+         flag it. Kept explicitly disabled so future imports of broader rulesets
+         can't silently re-enable it. -->
+    <rule ref="Squiz.Scope.StaticThisUsage">
+        <severity>0</severity>
+    </rule>
 
     <!-- String concatenation -->
     <rule ref="Squiz.Strings.ConcatenationSpacing">
@@ -148,8 +152,14 @@
         </properties>
     </rule>
 
-    <!-- report invalid format of inline phpDocs with @var -->
-    <rule ref="SlevomatCodingStandard.Commenting.InlineDocCommentDeclaration"/>
+    <!-- The other codes (InvalidCommentType, MissingVariable, NoAssignment) are
+         genuine formatting/structural checks, but InvalidFormat (malformed
+         `@var` syntax) is lint territory — PHPStan and Psalm both fail to bind
+         the type when the annotation is malformed. Excluded explicitly so a
+         future ruleset import can't silently re-enable just that code. -->
+    <rule ref="SlevomatCodingStandard.Commenting.InlineDocCommentDeclaration">
+        <exclude name="SlevomatCodingStandard.Commenting.InlineDocCommentDeclaration.InvalidFormat"/>
+    </rule>
 
     <!-- checks if Throwable is used instead of Exception -->
     <rule ref="SlevomatCodingStandard.Exceptions.ReferenceThrowableOnly"/>
@@ -303,4 +313,18 @@
     <rule ref="SlevomatCodingStandard.Operators.DisallowEqualOperators">
         <severity>0</severity>
     </rule>
+
+    <!-- Forbid whitespace after `[` and before `]` in single-line arrays;
+         enforce a single space after commas in single-line arrays -->
+    <rule ref="SlevomatCodingStandard.Arrays.SingleLineArrayWhitespace"/>
+
+    <!-- Forbid leading/trailing empty lines inside doc comments -->
+    <rule ref="SlevomatCodingStandard.Commenting.DocCommentSpacing"/>
+
+    <!-- Forbid spaces around `|` and `&` in union/intersection type hints -->
+    <rule ref="SlevomatCodingStandard.TypeHints.DNFTypeHintFormat">
+        <properties>
+            <property name="withSpacesAroundOperators" value="no"/>
+        </properties>
+    </rule>
 </ruleset>
diff --git a/composer.json b/composer.json
index e57d3ec..7773f81 100644
--- a/composer.json
+++ b/composer.json
@@ -16,8 +16,8 @@
     "require": {
         "php": "^8.1",
         "dealerdirect/phpcodesniffer-composer-installer": "^0.5 || ^0.6 || ^0.7 || ^1.0",
-        "friendsofphp/php-cs-fixer": "^3.32",
-        "slevomat/coding-standard": "^8.4",
+        "friendsofphp/php-cs-fixer": "^3.65",
+        "slevomat/coding-standard": "^8.16",
         "squizlabs/php_codesniffer": "^3.6.1",
         "webimpress/coding-standard": "^1.1"
     },
diff --git a/php-cs-fixer-rules.php b/php-cs-fixer-rules.php
index f89b42b..8ed1b35 100644
--- a/php-cs-fixer-rules.php
+++ b/php-cs-fixer-rules.php
@@ -23,6 +23,20 @@
     'function_declaration' => [
         'closure_fn_spacing' => 'none',
     ],
+    'general_phpdoc_annotation_remove' => [
+        'annotations' => [
+            'api',
+            'author',
+            'category',
+            'copyright',
+            'created',
+            'license',
+            'package',
+            'since',
+            'subpackage',
+            'version',
+        ],
+    ],
     'global_namespace_import' => [
         'import_classes' => true,
         'import_constants' => true,
@@ -31,19 +45,25 @@
     'heredoc_indentation' => [
         'indentation' => 'start_plus_one',
     ],
+    'lambda_not_used_import' => true,
     'native_constant_invocation' => [
         'scope' => 'namespaced',
         'strict' => true,
     ],
+    'native_function_casing' => true,
     'native_function_invocation' => [
         'include' => ['@all'],
         'scope' => 'namespaced',
         'strict' => true,
     ],
+    'native_type_declaration_casing' => true,
     'new_with_parentheses' => [
         'named_class' => true,
         'anonymous_class' => false,
     ],
+    'no_alias_functions' => [
+        'sets' => ['@internal'],
+    ],
     'no_blank_lines_after_phpdoc' => true,
     'no_empty_comment' => true,
     'no_empty_phpdoc' => true,
@@ -59,12 +79,30 @@
         ],
     ],
     'no_multiline_whitespace_around_double_arrow' => true,
+    'no_php4_constructor' => true,
+    'no_singleline_whitespace_before_semicolons' => true,
+    'no_spaces_around_offset' => true,
     'no_superfluous_elseif' => true,
     'no_superfluous_phpdoc_tags' => [
         // Psalm wants us to have an explicit type annotation whenever we assign `mixed` to a variable.
         'allow_mixed' => true,
     ],
     'no_trailing_comma_in_singleline' => true,
+    'no_unneeded_control_parentheses' => [
+        'statements' => [
+            'break',
+            'clone',
+            'continue',
+            'echo_print',
+            'negative_instanceof',
+            'others',
+            'return',
+            'switch_case',
+            'yield',
+            'yield_from',
+        ],
+    ],
+    'no_unneeded_final_method' => true,
     'no_unused_imports' => true,
     'no_useless_else' => true,
     'no_useless_concat_operator' => true,
@@ -73,8 +111,17 @@
         'imports_order' => ['class', 'function', 'const'],
         'sort_algorithm' => 'alpha',
     ],
+    'phpdoc_scalar' => true,
     'phpdoc_trim' => true,
+    // Wrong-order inline `@var` is lint territory — PHPStan and Psalm both
+    // fail to bind the type. Auto-canonicalizing it on the CS side hides the
+    // mistake from SA feedback instead of letting the user see and fix it,
+    // so keep this rule explicitly off (paired with the InvalidFormat exclude
+    // in Eventjet/ruleset.xml).
+    'phpdoc_var_annotation_correct_order' => false,
     'php_unit_data_provider_static' => true,
+    'self_accessor' => true,
+    'simplified_if_return' => true,
     'single_quote' => true,
     'single_space_around_construct' => true,
     // Loose comparison is lint territory — PHPStan and Psalm both flag it. Kept
diff --git a/php-cs-fixer-strict-rules.php b/php-cs-fixer-strict-rules.php
index 8916b48..866fba9 100644
--- a/php-cs-fixer-strict-rules.php
+++ b/php-cs-fixer-strict-rules.php
@@ -39,7 +39,6 @@
         'sort_algorithm' => 'none',
         'null_adjustment' => 'always_last',
     ],
-    'self_accessor' => true,
     'static_lambda' => true,
     'trailing_comma_in_multiline' => [
         'elements' => [
diff --git a/tests/RulesTest.php b/tests/RulesTest.php
index a79c3c1..245ec17 100644
--- a/tests/RulesTest.php
+++ b/tests/RulesTest.php
@@ -32,6 +32,20 @@ final class RulesTest extends TestCase
         ['HeredocNotIndented.php', 'phpcs'],
         // PHP CS Fixer has no rule for multiple classes per file
         ['multiple-classes-per-file.php', 'php-cs-fixer'],
+        // PHP CS Fixer has no equivalent sniff
+        ['bracketed-namespace.php', 'php-cs-fixer'],
+        ['deprecated-function.php', 'php-cs-fixer'],
+        ['text-before-open-tag.php', 'php-cs-fixer'],
+        ['catch-exception.php', 'php-cs-fixer'],
+        ['assignment-in-condition.php', 'php-cs-fixer'],
+        ['dead-catch.php', 'php-cs-fixer'],
+        ['snake-case-variable.php', 'php-cs-fixer'],
+        ['forbidden-class-comment.php', 'php-cs-fixer'],
+        ['multiple-namespaces.php', 'php-cs-fixer'],
+        // PHPCS has no equivalent sniff
+        ['blank-line-after-phpdoc.php', 'phpcs'],
+        ['trailing-comma-singleline.php', 'phpcs'],
+        ['multiline-double-arrow.php', 'phpcs'],
     ];
 
     private static function phpCsFixerCommand(string $file): string
diff --git a/tests/check-sa-overlap.sh b/tests/check-sa-overlap.sh
index dd31eb0..d2b3590 100755
--- a/tests/check-sa-overlap.sh
+++ b/tests/check-sa-overlap.sh
@@ -25,7 +25,9 @@ fi
 cd "$(dirname "$0")/.."
 
 EXPECTED_REL=(
+    tests/fixtures/valid/inline-doc-comment.php
     tests/fixtures/valid/loose-comparison.php
+    tests/fixtures/valid/ThisInStatic.php
 )
 
 for f in "${EXPECTED_REL[@]}"; do
diff --git a/tests/fixtures/invalid/array-bracket-spacing.php b/tests/fixtures/invalid/array-bracket-spacing.php
new file mode 100644
index 0000000..2afc667
--- /dev/null
+++ b/tests/fixtures/invalid/array-bracket-spacing.php
@@ -0,0 +1,6 @@
+<?php
+
+declare(strict_types=1);
+
+$foo = ['a' => 1];
+$bar = $foo[ 'a' ];
diff --git a/tests/fixtures/invalid/array-not-trimmed.php b/tests/fixtures/invalid/array-not-trimmed.php
new file mode 100644
index 0000000..79efe5c
--- /dev/null
+++ b/tests/fixtures/invalid/array-not-trimmed.php
@@ -0,0 +1,5 @@
+<?php
+
+declare(strict_types=1);
+
+$foo = [ 'a', 'b' ];
diff --git a/tests/fixtures/invalid/assignment-in-condition.php b/tests/fixtures/invalid/assignment-in-condition.php
new file mode 100644
index 0000000..d55efcf
--- /dev/null
+++ b/tests/fixtures/invalid/assignment-in-condition.php
@@ -0,0 +1,8 @@
+<?php
+
+declare(strict_types=1);
+
+$bar = 0;
+if (($foo = $bar) === 0) {
+    echo $foo;
+}
diff --git a/tests/fixtures/invalid/blank-line-after-phpdoc.php b/tests/fixtures/invalid/blank-line-after-phpdoc.php
new file mode 100644
index 0000000..b480ca0
--- /dev/null
+++ b/tests/fixtures/invalid/blank-line-after-phpdoc.php
@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * Does something
+ */
+
+function foo(): void
+{
+}
diff --git a/tests/fixtures/invalid/bracketed-namespace.php b/tests/fixtures/invalid/bracketed-namespace.php
new file mode 100644
index 0000000..688ed47
--- /dev/null
+++ b/tests/fixtures/invalid/bracketed-namespace.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Invalid {
+    class Foo
+    {
+    }
+}
diff --git a/tests/fixtures/invalid/catch-exception.php b/tests/fixtures/invalid/catch-exception.php
new file mode 100644
index 0000000..4cbe876
--- /dev/null
+++ b/tests/fixtures/invalid/catch-exception.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Invalid;
+
+use Exception;
+
+try {
+    throw new Exception('boom');
+} catch (Exception $e) {
+    echo $e->getMessage();
+}
diff --git a/tests/fixtures/invalid/control-signature.php b/tests/fixtures/invalid/control-signature.php
new file mode 100644
index 0000000..153c4f2
--- /dev/null
+++ b/tests/fixtures/invalid/control-signature.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+function controlSignatureCheck(bool $cond): void
+{
+    if($cond) {
+        echo 'yes';
+    }
+}
diff --git a/tests/fixtures/invalid/dead-catch.php b/tests/fixtures/invalid/dead-catch.php
new file mode 100644
index 0000000..6f8fa93
--- /dev/null
+++ b/tests/fixtures/invalid/dead-catch.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Invalid;
+
+use RuntimeException;
+use Throwable;
+
+try {
+    throw new RuntimeException('boom');
+} catch (Throwable $t) {
+    echo $t->getMessage();
+} catch (RuntimeException $e) {
+    echo $e->getMessage();
+}
diff --git a/tests/fixtures/invalid/deprecated-function.php b/tests/fixtures/invalid/deprecated-function.php
new file mode 100644
index 0000000..aebc1c9
--- /dev/null
+++ b/tests/fixtures/invalid/deprecated-function.php
@@ -0,0 +1,7 @@
+<?php
+
+declare(strict_types=1);
+
+use function utf8_encode;
+
+$foo = utf8_encode('test');
diff --git a/tests/fixtures/invalid/else-if.php b/tests/fixtures/invalid/else-if.php
new file mode 100644
index 0000000..ff6f5a9
--- /dev/null
+++ b/tests/fixtures/invalid/else-if.php
@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+function elseIfCheck(int $foo): void
+{
+    if ($foo === 1) {
+        echo 'one';
+    } else if ($foo === 2) {
+        echo 'two';
+    } else {
+        echo 'other';
+    }
+}
diff --git a/tests/fixtures/invalid/empty-comment.php b/tests/fixtures/invalid/empty-comment.php
new file mode 100644
index 0000000..7b8e58a
--- /dev/null
+++ b/tests/fixtures/invalid/empty-comment.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+//
+function foo(): void
+{
+}
+
+foo();
diff --git a/tests/fixtures/invalid/empty-phpdoc.php b/tests/fixtures/invalid/empty-phpdoc.php
new file mode 100644
index 0000000..9f33b22
--- /dev/null
+++ b/tests/fixtures/invalid/empty-phpdoc.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ */
+function foo(): void
+{
+}
diff --git a/tests/fixtures/invalid/extra-blank-lines.php b/tests/fixtures/invalid/extra-blank-lines.php
new file mode 100644
index 0000000..567a25a
--- /dev/null
+++ b/tests/fixtures/invalid/extra-blank-lines.php
@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Invalid;
+
+use stdClass;
+
+
+
+new stdClass();
diff --git a/tests/fixtures/invalid/forbidden-author-annotation.php b/tests/fixtures/invalid/forbidden-author-annotation.php
new file mode 100644
index 0000000..6e48789
--- /dev/null
+++ b/tests/fixtures/invalid/forbidden-author-annotation.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @author Jane Doe
+ */
+function foo(): void
+{
+}
diff --git a/tests/fixtures/invalid/forbidden-class-comment.php b/tests/fixtures/invalid/forbidden-class-comment.php
new file mode 100644
index 0000000..51df888
--- /dev/null
+++ b/tests/fixtures/invalid/forbidden-class-comment.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Invalid;
+
+/**
+ * Class ForbiddenClassComment
+ */
+class ForbiddenClassComment
+{
+}
diff --git a/tests/fixtures/invalid/forbidden-function-sizeof.php b/tests/fixtures/invalid/forbidden-function-sizeof.php
new file mode 100644
index 0000000..a0fbbcc
--- /dev/null
+++ b/tests/fixtures/invalid/forbidden-function-sizeof.php
@@ -0,0 +1,7 @@
+<?php
+
+declare(strict_types=1);
+
+use function sizeof;
+
+$count = sizeof([1, 2, 3]);
diff --git a/tests/fixtures/invalid/group-use.php b/tests/fixtures/invalid/group-use.php
new file mode 100644
index 0000000..d6eddae
--- /dev/null
+++ b/tests/fixtures/invalid/group-use.php
@@ -0,0 +1,7 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Invalid;
+
+use Foo\{Bar, Baz};
diff --git a/tests/fixtures/invalid/logical-operator-and.php b/tests/fixtures/invalid/logical-operator-and.php
new file mode 100644
index 0000000..cfab178
--- /dev/null
+++ b/tests/fixtures/invalid/logical-operator-and.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+function logicalOperatorAndCheck(bool $a, bool $b): void
+{
+    if ($a AND $b) {
+        echo 'yes';
+    }
+}
diff --git a/tests/fixtures/invalid/logical-operator-spacing.php b/tests/fixtures/invalid/logical-operator-spacing.php
new file mode 100644
index 0000000..374f229
--- /dev/null
+++ b/tests/fixtures/invalid/logical-operator-spacing.php
@@ -0,0 +1,8 @@
+<?php
+
+declare(strict_types=1);
+
+function logicalOperatorSpacingCheck(bool $a, bool $b): bool
+{
+    return $a&&$b;
+}
diff --git a/tests/fixtures/invalid/long-array-syntax.php b/tests/fixtures/invalid/long-array-syntax.php
new file mode 100644
index 0000000..d07063a
--- /dev/null
+++ b/tests/fixtures/invalid/long-array-syntax.php
@@ -0,0 +1,5 @@
+<?php
+
+declare(strict_types=1);
+
+$foo = array('a', 'b');
diff --git a/tests/fixtures/invalid/long-cast.php b/tests/fixtures/invalid/long-cast.php
new file mode 100644
index 0000000..8d6ab78
--- /dev/null
+++ b/tests/fixtures/invalid/long-cast.php
@@ -0,0 +1,5 @@
+<?php
+
+declare(strict_types=1);
+
+$foo = (boolean)1;
diff --git a/tests/fixtures/invalid/long-type-hint.php b/tests/fixtures/invalid/long-type-hint.php
new file mode 100644
index 0000000..c8a00c1
--- /dev/null
+++ b/tests/fixtures/invalid/long-type-hint.php
@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @param integer $value
+ */
+function double(int $value): int
+{
+    return $value * 2;
+}
diff --git a/tests/fixtures/invalid/missing-const-visibility.php b/tests/fixtures/invalid/missing-const-visibility.php
new file mode 100644
index 0000000..da112ce
--- /dev/null
+++ b/tests/fixtures/invalid/missing-const-visibility.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Invalid;
+
+class MissingConstVisibility
+{
+    const FOO = 'bar';
+}
diff --git a/tests/fixtures/invalid/missing-declare-strict-types.php b/tests/fixtures/invalid/missing-declare-strict-types.php
new file mode 100644
index 0000000..892b79a
--- /dev/null
+++ b/tests/fixtures/invalid/missing-declare-strict-types.php
@@ -0,0 +1,3 @@
+<?php
+
+echo 'no strict types here';
diff --git a/tests/fixtures/invalid/missing-space-after-construct.php b/tests/fixtures/invalid/missing-space-after-construct.php
new file mode 100644
index 0000000..d854a17
--- /dev/null
+++ b/tests/fixtures/invalid/missing-space-after-construct.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+/** @return iterable<int, int> */
+function generator(): iterable
+{
+    yield(1);
+}
+
+foreach (generator() as $value) {
+    echo $value;
+}
diff --git a/tests/fixtures/invalid/multiline-double-arrow.php b/tests/fixtures/invalid/multiline-double-arrow.php
new file mode 100644
index 0000000..46b9e3d
--- /dev/null
+++ b/tests/fixtures/invalid/multiline-double-arrow.php
@@ -0,0 +1,8 @@
+<?php
+
+declare(strict_types=1);
+
+$foo = [
+    'a'
+        => 1,
+];
diff --git a/tests/fixtures/invalid/multiple-namespaces.php b/tests/fixtures/invalid/multiple-namespaces.php
new file mode 100644
index 0000000..4627ce4
--- /dev/null
+++ b/tests/fixtures/invalid/multiple-namespaces.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Invalid\A;
+
+class Foo
+{
+}
+
+namespace Invalid\B;
+
+class Bar
+{
+}
diff --git a/tests/fixtures/invalid/multiple-uses-per-line.php b/tests/fixtures/invalid/multiple-uses-per-line.php
new file mode 100644
index 0000000..7a6f990
--- /dev/null
+++ b/tests/fixtures/invalid/multiple-uses-per-line.php
@@ -0,0 +1,7 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Invalid;
+
+use Foo\Bar, Foo\Baz;
diff --git a/tests/fixtures/invalid/new-without-parentheses.php b/tests/fixtures/invalid/new-without-parentheses.php
new file mode 100644
index 0000000..de7d607
--- /dev/null
+++ b/tests/fixtures/invalid/new-without-parentheses.php
@@ -0,0 +1,7 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Invalid;
+
+$foo = new \stdClass;
diff --git a/tests/fixtures/invalid/no-early-exit.php b/tests/fixtures/invalid/no-early-exit.php
new file mode 100644
index 0000000..34b5992
--- /dev/null
+++ b/tests/fixtures/invalid/no-early-exit.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+function process(int $value): int
+{
+    if ($value > 0) {
+        return $value * 2;
+    } else {
+        return 0;
+    }
+}
diff --git a/tests/fixtures/invalid/no-space-around-equals.php b/tests/fixtures/invalid/no-space-around-equals.php
new file mode 100644
index 0000000..b6cc543
--- /dev/null
+++ b/tests/fixtures/invalid/no-space-around-equals.php
@@ -0,0 +1,5 @@
+<?php
+
+declare(strict_types=1);
+
+$foo=1;
diff --git a/tests/fixtures/invalid/non-static-data-provider.php b/tests/fixtures/invalid/non-static-data-provider.php
new file mode 100644
index 0000000..8f9bd92
--- /dev/null
+++ b/tests/fixtures/invalid/non-static-data-provider.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Invalid;
+
+use PHPUnit\Framework\TestCase;
+
+final class NonStaticDataProviderTest extends TestCase
+{
+    /**
+     * @dataProvider provideValues
+     */
+    public function testSomething(int $value): void
+    {
+        self::assertSame($value, $value);
+    }
+
+    /**
+     * @return iterable<array{int}>
+     */
+    public function provideValues(): iterable
+    {
+        yield [1];
+    }
+}
diff --git a/tests/fixtures/invalid/nullable-type-for-null-default.php b/tests/fixtures/invalid/nullable-type-for-null-default.php
new file mode 100644
index 0000000..dbcd1d1
--- /dev/null
+++ b/tests/fixtures/invalid/nullable-type-for-null-default.php
@@ -0,0 +1,8 @@
+<?php
+
+declare(strict_types=1);
+
+function greet(string $name = null): void
+{
+    echo $name;
+}
diff --git a/tests/fixtures/invalid/parameter-type-hint-spacing.php b/tests/fixtures/invalid/parameter-type-hint-spacing.php
new file mode 100644
index 0000000..e496a52
--- /dev/null
+++ b/tests/fixtures/invalid/parameter-type-hint-spacing.php
@@ -0,0 +1,8 @@
+<?php
+
+declare(strict_types=1);
+
+function foo(string  $name): string
+{
+    return $name;
+}
diff --git a/tests/fixtures/invalid/php4-constructor.php b/tests/fixtures/invalid/php4-constructor.php
new file mode 100644
index 0000000..e014458
--- /dev/null
+++ b/tests/fixtures/invalid/php4-constructor.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+class Php4Constructor
+{
+    public function Php4Constructor(): void
+    {
+    }
+}
diff --git a/tests/fixtures/invalid/phpdoc-not-trimmed.php b/tests/fixtures/invalid/phpdoc-not-trimmed.php
new file mode 100644
index 0000000..23f734e
--- /dev/null
+++ b/tests/fixtures/invalid/phpdoc-not-trimmed.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ *
+ * Does something
+ *
+ */
+function foo(): void
+{
+}
diff --git a/tests/fixtures/invalid/property-declaration.php b/tests/fixtures/invalid/property-declaration.php
new file mode 100644
index 0000000..8cda2be
--- /dev/null
+++ b/tests/fixtures/invalid/property-declaration.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Invalid;
+
+class PropertyDeclaration
+{
+    static public string $foo = 'bar';
+}
diff --git a/tests/fixtures/invalid/return-type-hint-spacing.php b/tests/fixtures/invalid/return-type-hint-spacing.php
new file mode 100644
index 0000000..64464a8
--- /dev/null
+++ b/tests/fixtures/invalid/return-type-hint-spacing.php
@@ -0,0 +1,8 @@
+<?php
+
+declare(strict_types=1);
+
+function foo() : int
+{
+    return 1;
+}
diff --git a/tests/fixtures/invalid/self-member-reference.php b/tests/fixtures/invalid/self-member-reference.php
new file mode 100644
index 0000000..44de28a
--- /dev/null
+++ b/tests/fixtures/invalid/self-member-reference.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Invalid;
+
+class SelfMemberReference
+{
+    public static function foo(): int
+    {
+        return SelfMemberReference::bar();
+    }
+
+    public static function bar(): int
+    {
+        return 1;
+    }
+}
diff --git a/tests/fixtures/invalid/snake-case-variable.php b/tests/fixtures/invalid/snake-case-variable.php
new file mode 100644
index 0000000..acfb0f7
--- /dev/null
+++ b/tests/fixtures/invalid/snake-case-variable.php
@@ -0,0 +1,6 @@
+<?php
+
+declare(strict_types=1);
+
+$my_variable = 'foo';
+echo $my_variable;
diff --git a/tests/fixtures/invalid/space-around-object-operator.php b/tests/fixtures/invalid/space-around-object-operator.php
new file mode 100644
index 0000000..c3b6148
--- /dev/null
+++ b/tests/fixtures/invalid/space-around-object-operator.php
@@ -0,0 +1,8 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Invalid;
+
+$foo = new \stdClass();
+$foo ->bar = 1;
diff --git a/tests/fixtures/invalid/space-before-semicolon.php b/tests/fixtures/invalid/space-before-semicolon.php
new file mode 100644
index 0000000..7ed9502
--- /dev/null
+++ b/tests/fixtures/invalid/space-before-semicolon.php
@@ -0,0 +1,5 @@
+<?php
+
+declare(strict_types=1);
+
+echo 'foo' ;
diff --git a/tests/fixtures/invalid/superfluous-elseif.php b/tests/fixtures/invalid/superfluous-elseif.php
new file mode 100644
index 0000000..34fcea9
--- /dev/null
+++ b/tests/fixtures/invalid/superfluous-elseif.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+function foo(int $value): int
+{
+    if ($value > 0) {
+        return 1;
+    } elseif ($value < 0) {
+        return -1;
+    }
+    return 0;
+}
diff --git a/tests/fixtures/invalid/text-before-open-tag.php b/tests/fixtures/invalid/text-before-open-tag.php
new file mode 100644
index 0000000..c79e54f
--- /dev/null
+++ b/tests/fixtures/invalid/text-before-open-tag.php
@@ -0,0 +1,6 @@
+text
+<?php
+
+declare(strict_types=1);
+
+$foo = 1;
diff --git a/tests/fixtures/invalid/trailing-comma-singleline.php b/tests/fixtures/invalid/trailing-comma-singleline.php
new file mode 100644
index 0000000..731d94f
--- /dev/null
+++ b/tests/fixtures/invalid/trailing-comma-singleline.php
@@ -0,0 +1,5 @@
+<?php
+
+declare(strict_types=1);
+
+$foo = ['a', 'b',];
diff --git a/tests/fixtures/invalid/trailing-whitespace.php b/tests/fixtures/invalid/trailing-whitespace.php
new file mode 100644
index 0000000..8a9f146
--- /dev/null
+++ b/tests/fixtures/invalid/trailing-whitespace.php
@@ -0,0 +1,5 @@
+<?php
+
+declare(strict_types=1);
+
+$foo = 'bar';   
diff --git a/tests/fixtures/invalid/union-type-with-spaces.php b/tests/fixtures/invalid/union-type-with-spaces.php
new file mode 100644
index 0000000..f6b768e
--- /dev/null
+++ b/tests/fixtures/invalid/union-type-with-spaces.php
@@ -0,0 +1,8 @@
+<?php
+
+declare(strict_types=1);
+
+function foo(int | string $value): int | string
+{
+    return $value;
+}
diff --git a/tests/fixtures/invalid/unnecessary-final-modifier.php b/tests/fixtures/invalid/unnecessary-final-modifier.php
new file mode 100644
index 0000000..503cbab
--- /dev/null
+++ b/tests/fixtures/invalid/unnecessary-final-modifier.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Invalid;
+
+final class UnnecessaryFinalModifier
+{
+    final public function foo(): void
+    {
+    }
+}
diff --git a/tests/fixtures/invalid/unsorted-uses.php b/tests/fixtures/invalid/unsorted-uses.php
new file mode 100644
index 0000000..fdf507c
--- /dev/null
+++ b/tests/fixtures/invalid/unsorted-uses.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Invalid;
+
+use RuntimeException;
+use LogicException;
+
+throw new LogicException('a');
diff --git a/tests/fixtures/invalid/unused-closure-use.php b/tests/fixtures/invalid/unused-closure-use.php
new file mode 100644
index 0000000..bdcf78a
--- /dev/null
+++ b/tests/fixtures/invalid/unused-closure-use.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+$bar = 1;
+$closure = function () use ($bar): int {
+    return 1;
+};
+$closure();
diff --git a/tests/fixtures/invalid/unused-use.php b/tests/fixtures/invalid/unused-use.php
new file mode 100644
index 0000000..2908ef9
--- /dev/null
+++ b/tests/fixtures/invalid/unused-use.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Invalid;
+
+use stdClass;
+
+echo 'no stdClass used';
diff --git a/tests/fixtures/invalid/uppercase-php-function.php b/tests/fixtures/invalid/uppercase-php-function.php
new file mode 100644
index 0000000..027e74d
--- /dev/null
+++ b/tests/fixtures/invalid/uppercase-php-function.php
@@ -0,0 +1,7 @@
+<?php
+
+declare(strict_types=1);
+
+use function StrLen;
+
+echo StrLen('foo');
diff --git a/tests/fixtures/invalid/uppercase-type-hint.php b/tests/fixtures/invalid/uppercase-type-hint.php
new file mode 100644
index 0000000..2e76c62
--- /dev/null
+++ b/tests/fixtures/invalid/uppercase-type-hint.php
@@ -0,0 +1,8 @@
+<?php
+
+declare(strict_types=1);
+
+function double(Int $value): Int
+{
+    return $value * 2;
+}
diff --git a/tests/fixtures/invalid/use-from-same-namespace.php b/tests/fixtures/invalid/use-from-same-namespace.php
new file mode 100644
index 0000000..2c9c5da
--- /dev/null
+++ b/tests/fixtures/invalid/use-from-same-namespace.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Invalid;
+
+use Invalid\Foo;
+
+new Foo();
diff --git a/tests/fixtures/invalid/use-leading-backslash.php b/tests/fixtures/invalid/use-leading-backslash.php
new file mode 100644
index 0000000..61058e4
--- /dev/null
+++ b/tests/fixtures/invalid/use-leading-backslash.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Invalid;
+
+use \stdClass;
+
+new stdClass();
diff --git a/tests/fixtures/invalid/useless-else.php b/tests/fixtures/invalid/useless-else.php
new file mode 100644
index 0000000..754d59f
--- /dev/null
+++ b/tests/fixtures/invalid/useless-else.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+function check(int $value): int
+{
+    if ($value > 0) {
+        return 1;
+    } else {
+        return 0;
+    }
+}
diff --git a/tests/fixtures/invalid/useless-if-with-return.php b/tests/fixtures/invalid/useless-if-with-return.php
new file mode 100644
index 0000000..e4ba109
--- /dev/null
+++ b/tests/fixtures/invalid/useless-if-with-return.php
@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+function isPositive(int $value): bool
+{
+    if ($value > 0) {
+        return true;
+    }
+    return false;
+}
diff --git a/tests/fixtures/invalid/useless-parentheses.php b/tests/fixtures/invalid/useless-parentheses.php
new file mode 100644
index 0000000..71ba622
--- /dev/null
+++ b/tests/fixtures/invalid/useless-parentheses.php
@@ -0,0 +1,8 @@
+<?php
+
+declare(strict_types=1);
+
+function identity(int $value): int
+{
+    return ($value);
+}
diff --git a/tests/fixtures/invalid/whitespace-after-comma.php b/tests/fixtures/invalid/whitespace-after-comma.php
new file mode 100644
index 0000000..4c265bb
--- /dev/null
+++ b/tests/fixtures/invalid/whitespace-after-comma.php
@@ -0,0 +1,5 @@
+<?php
+
+declare(strict_types=1);
+
+$foo = ['a','b','c'];
diff --git a/tests/fixtures/invalid/yoda-comparison.php b/tests/fixtures/invalid/yoda-comparison.php
new file mode 100644
index 0000000..5095c0c
--- /dev/null
+++ b/tests/fixtures/invalid/yoda-comparison.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+function yodaComparisonCheck(string $foo): void
+{
+    if ('bar' === $foo) {
+        echo $foo;
+    }
+}
diff --git a/tests/fixtures/valid/ThisInStatic.php b/tests/fixtures/valid/ThisInStatic.php
new file mode 100644
index 0000000..691be33
--- /dev/null
+++ b/tests/fixtures/valid/ThisInStatic.php
@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ThisInStaticCanary;
+
+// Dual-purpose fixture for the this-in-static rule drop:
+//   - CS side: phpcs and php-cs-fixer must leave this alone (the rule is
+//     disabled — see Eventjet/ruleset.xml).
+//   - SA side: PHPStan and Psalm must both flag it — tests/check-sa-overlap.sh
+//     enforces that, which is what justifies dropping the CS rule.
+
+class ThisInStatic
+{
+    public static function foo(): void
+    {
+        echo $this->bar;
+    }
+}
diff --git a/tests/fixtures/valid/inline-doc-comment.php b/tests/fixtures/valid/inline-doc-comment.php
new file mode 100644
index 0000000..2a5672a
--- /dev/null
+++ b/tests/fixtures/valid/inline-doc-comment.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+// Dual-purpose canary for the InlineDocCommentDeclaration.InvalidFormat code:
+//   - CS side: phpcs and php-cs-fixer must leave this alone. InvalidFormat is
+//     excluded in Eventjet/ruleset.xml; php-cs-fixer's
+//     `phpdoc_var_annotation_correct_order` is disabled in php-cs-fixer-rules.php
+//     so it doesn't silently canonicalize the wrong order away.
+//   - SA side: PHPStan and Psalm must both flag it — tests/check-sa-overlap.sh
+//     enforces that, which is what justifies excluding the CS code.
+
+/** @var $foo string */
+$foo = 'bar';
+echo $foo;