Add invalid fixtures and close per-tool rule gaps

[MidnightDesign]

Summary

• Adds invalid test fixtures for rules that didn't have one yet, plus a per-tool skip list (RulesTest::SKIPPED_INVALID) for cases where only one of the two formatters has an equivalent rule.
• Enables 14 previously-unconfigured PHP CS Fixer rules and 3 Slevomat sniffs that cover behavior the other tool was already enforcing, dropping 18 skips along the way.
• Drops two CS rules (Squiz.Scope.StaticThisUsage, SlevomatCodingStandard.Commenting.InlineDocCommentDeclaration.InvalidFormat) per the SA-overlap policy from Drop loose-comparison rule; add PHPStan + Psalm fixture guardrail #42 and rewrites 8 other new fixtures so they're no longer in the PHPStan ∩ Psalm intersection enforced by tests/check-sa-overlap.sh.
• The PHP 4 constructor fixture had to drop its namespace because no_php4_constructor is a no-op on namespaced classes.

Why now

This came out of working out exactly which rules each tool already covers and which gaps are real vs. just unset. That mapping is the input we need for the mago branch — the closer our PHPCS + PHP CS Fixer configs are to enforcing the same set of rules, the more confidently we can shape Mago's rule set to match what's already in place, and the less drift we'll have to clean up afterwards. The new test scaffolding (per-tool skip list) also extends cleanly to a third tool column.

Drops driven by the SA-overlap gate

After merging master (which brought in #42's tests/check-sa-overlap.sh), two new fixtures in this branch hit the gate — both PHPStan and Psalm already flagged the pattern, so a CS rule for it was lint-duplicate:

• Squiz.Scope.StaticThisUsage — $this in a static method. Dropped, fixture moved to valid/ThisInStatic.php as a dual-purpose canary (asserts the CS rule is off AND that both SAs still catch it).
• SlevomatCodingStandard.Commenting.InlineDocCommentDeclaration.InvalidFormat — malformed @var $name Type order. Narrowly excluded (the sniff's three other sub-codes — InvalidCommentType, MissingVariable, NoAssignment — are genuine structural checks and stay enabled). PHP CS Fixer's phpdoc_var_annotation_correct_order is set to false to match, so the wrong-order form isn't silently canonicalized away before the SAs see it. Fixture moved to valid/inline-doc-comment.php as a canary.

Eight other new fixtures (control-signature, else-if, logical-operator-and, logical-operator-spacing, missing-space-after-construct, php4-constructor, unsorted-uses, yoda-comparison) tripped the gate because their bodies were statically reducible (if(true), 'bar' === 'bar', true AND false, an unreachable second throw, etc.). The CS rules they exercise are kept; the fixtures are rewritten so the SAs can no longer fold the expression while the CS-relevant violation stays intact.

No new valid fixtures except the two canaries

The existing valid fixtures (single-quotes.php, cast-no-space.php, psr-12-import-order.php, mixed-assignment.php, etc.) collectively pin down "a well-formed file under our standard," and they're run through both tools on every test invocation. That baseline already proves the canonical positive form for the rules added here — none of the 14 fixer rules or 3 sniffs introduce a non-trivial interaction that the existing valid set doesn't cover. The convention in this repo is that valid fixtures exist where the correct form is non-obvious or configuration-dependent (e.g., proving that omitting a @return array tag is acceptable); pinning down the trivial positive form for each new rule would invert that convention. The two new valid/ entries (ThisInStatic.php, inline-doc-comment.php) are canaries for dropped rules, not canonical-form fixtures, and they're registered in EXPECTED_REL in tests/check-sa-overlap.sh. Positive fixtures for Mago will be added in the Mago PR for the cases Mago actually disagrees on, gated by the existing SKIPPED_VALID mechanism on that branch.

Test plan

• vendor/bin/phpunit — 206 tests, 18 skipped, all passing
• bash tests/check-sa-overlap.sh — green
• CI green on PHP 8.3 / 8.4

🤖 Generated with Claude Code

[Copilot]

Pull request overview

This PR tightens parity between PHPCS and PHP CS Fixer by (1) adding missing invalid fixtures and (2) enabling rules/sniffs that were already effectively enforced by the other tool, while introducing a per-tool skip mechanism for invalid fixtures where no equivalent rule exists.

Changes:

• Extend RulesTest with a per-tool invalid-fixture skip list (SKIPPED_INVALID) to handle rule gaps between PHPCS and PHP CS Fixer.
• Enable additional PHP CS Fixer rules and Slevomat sniffs to reduce tool drift and remove unnecessary skips.
• Add many new invalid fixtures plus two “canary” valid fixtures used to ensure dropped CS rules are still caught by static analysis (PHPStan + Psalm).

Reviewed changes

Copilot reviewed 67 out of 67 changed files in this pull request and generated no comments.

Show a summary per file

File	Description
tests/RulesTest.php	Adds/extends per-tool invalid fixture skip list to cover formatter rule gaps.
tests/check-sa-overlap.sh	Registers additional dropped-rule canary fixtures expected in PHPStan ∩ Psalm.
php-cs-fixer-rules.php	Enables additional fixer rules (and explicitly disables one phpdoc canonicalization case).
php-cs-fixer-strict-rules.php	Moves self_accessor out of strict-only overrides (now defined in base rules).
Eventjet/ruleset.xml	Explicitly disables $this-in-static sniff and excludes a specific InlineDocComment code; enables additional Slevomat sniffs.
tests/fixtures/valid/ThisInStatic.php	Adds canary fixture ensuring CS ignores $this in static methods while SA flags it.
tests/fixtures/valid/inline-doc-comment.php	Adds canary fixture ensuring CS doesn’t auto-canonicalize malformed inline @var, while SA flags it.
tests/fixtures/invalid/array-bracket-spacing.php	Adds invalid fixture for bracket spacing inside array access.
tests/fixtures/invalid/array-not-trimmed.php	Adds invalid fixture for single-line array whitespace trimming.
tests/fixtures/invalid/assignment-in-condition.php	Adds invalid fixture for assignment in condition (PHPCS-only; skipped for fixer).
tests/fixtures/invalid/blank-line-after-phpdoc.php	Adds invalid fixture for blank line after phpdoc (fixer-only; skipped for PHPCS).
tests/fixtures/invalid/bracketed-namespace.php	Adds invalid fixture for bracketed namespace syntax (PHPCS-only; skipped for fixer).
tests/fixtures/invalid/catch-exception.php	Adds invalid fixture for catching Exception instead of Throwable (PHPCS-only; skipped for fixer).
tests/fixtures/invalid/control-signature.php	Adds invalid fixture for missing space in control structure signature.
tests/fixtures/invalid/dead-catch.php	Adds invalid fixture for unreachable catch ordering (PHPCS-only; skipped for fixer).
tests/fixtures/invalid/deprecated-function.php	Adds invalid fixture for deprecated function usage (PHPCS-only; skipped for fixer).
tests/fixtures/invalid/else-if.php	Adds invalid fixture for else if instead of elseif.
tests/fixtures/invalid/empty-comment.php	Adds invalid fixture for empty comment.
tests/fixtures/invalid/empty-phpdoc.php	Adds invalid fixture for empty phpdoc block.
tests/fixtures/invalid/extra-blank-lines.php	Adds invalid fixture for extra blank lines.
tests/fixtures/invalid/forbidden-author-annotation.php	Adds invalid fixture for forbidden phpdoc annotations.
tests/fixtures/invalid/forbidden-class-comment.php	Adds invalid fixture for “Class X” style class doc comment (PHPCS-only; skipped for fixer).
tests/fixtures/invalid/forbidden-function-sizeof.php	Adds invalid fixture for forbidden alias functions (e.g., sizeof).
tests/fixtures/invalid/group-use.php	Adds invalid fixture for disallowed group use declaration.
tests/fixtures/invalid/logical-operator-and.php	Adds invalid fixture for AND logical operator.
tests/fixtures/invalid/logical-operator-spacing.php	Adds invalid fixture for missing spaces around &&.
tests/fixtures/invalid/long-array-syntax.php	Adds invalid fixture for long array syntax (array(...)).
tests/fixtures/invalid/long-cast.php	Adds invalid fixture for long cast syntax.
tests/fixtures/invalid/long-type-hint.php	Adds invalid fixture for long scalar type names in phpdoc (e.g., integer).
tests/fixtures/invalid/missing-const-visibility.php	Adds invalid fixture for missing class constant visibility.
tests/fixtures/invalid/missing-declare-strict-types.php	Adds invalid fixture for missing declare(strict_types=1).
tests/fixtures/invalid/missing-space-after-construct.php	Adds invalid fixture for missing space after language construct (e.g., yield(1)).
tests/fixtures/invalid/multiline-double-arrow.php	Adds invalid fixture for multiline => whitespace (fixer-only; skipped for PHPCS).
tests/fixtures/invalid/multiple-namespaces.php	Adds invalid fixture for multiple namespaces per file (PHPCS-only; skipped for fixer).
tests/fixtures/invalid/multiple-uses-per-line.php	Adds invalid fixture for multiple use statements per line.
tests/fixtures/invalid/new-without-parentheses.php	Adds invalid fixture for new without parentheses.
tests/fixtures/invalid/no-early-exit.php	Adds invalid fixture for lack of early exit.
tests/fixtures/invalid/no-space-around-equals.php	Adds invalid fixture for missing spaces around =.
tests/fixtures/invalid/non-static-data-provider.php	Adds invalid fixture for non-static PHPUnit data provider.
tests/fixtures/invalid/nullable-type-for-null-default.php	Adds invalid fixture requiring nullable type when default is null.
tests/fixtures/invalid/parameter-type-hint-spacing.php	Adds invalid fixture for parameter typehint spacing.
tests/fixtures/invalid/php4-constructor.php	Adds invalid fixture for PHP 4 constructor.
tests/fixtures/invalid/phpdoc-not-trimmed.php	Adds invalid fixture for leading/trailing blank lines in doc comment.
tests/fixtures/invalid/property-declaration.php	Adds invalid fixture for property declaration modifier order.
tests/fixtures/invalid/return-type-hint-spacing.php	Adds invalid fixture for return typehint spacing.
tests/fixtures/invalid/self-member-reference.php	Adds invalid fixture for non-self:: member reference within class.
tests/fixtures/invalid/snake-case-variable.php	Adds invalid fixture for snake_case variable naming (PHPCS-only; skipped for fixer).
tests/fixtures/invalid/space-around-object-operator.php	Adds invalid fixture for spaces around ->.
tests/fixtures/invalid/space-before-semicolon.php	Adds invalid fixture for space before semicolon.
tests/fixtures/invalid/superfluous-elseif.php	Adds invalid fixture for superfluous elseif.
tests/fixtures/invalid/text-before-open-tag.php	Adds invalid fixture for content before <?php (PHPCS-only; skipped for fixer).
tests/fixtures/invalid/trailing-comma-singleline.php	Adds invalid fixture for trailing comma in single-line array (fixer-only; skipped for PHPCS).
tests/fixtures/invalid/trailing-whitespace.php	Adds invalid fixture for trailing whitespace.
tests/fixtures/invalid/union-type-with-spaces.php	Adds invalid fixture for spaces around union type operators.
tests/fixtures/invalid/unnecessary-final-modifier.php	Adds invalid fixture for final method inside final class.
tests/fixtures/invalid/unsorted-uses.php	Adds invalid fixture for unsorted imports.
tests/fixtures/invalid/unused-closure-use.php	Adds invalid fixture for unused variables in closure use (...).
tests/fixtures/invalid/unused-use.php	Adds invalid fixture for unused import.
tests/fixtures/invalid/use-from-same-namespace.php	Adds invalid fixture for importing from same namespace.
tests/fixtures/invalid/use-leading-backslash.php	Adds invalid fixture for leading backslash in use statement.
tests/fixtures/invalid/useless-else.php	Adds invalid fixture for useless else.
tests/fixtures/invalid/useless-if-with-return.php	Adds invalid fixture for if-return pattern that can be simplified.
tests/fixtures/invalid/useless-parentheses.php	Adds invalid fixture for useless parentheses.
tests/fixtures/invalid/uppercase-php-function.php	Adds invalid fixture for uppercase native PHP function calls.
tests/fixtures/invalid/uppercase-type-hint.php	Adds invalid fixture for uppercase scalar type hints.
tests/fixtures/invalid/whitespace-after-comma.php	Adds invalid fixture for missing whitespace after commas in arrays.
tests/fixtures/invalid/yoda-comparison.php	Adds invalid fixture for Yoda comparisons.

---

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.