Skip to content

interop: a single value one foreign rule sets inside what another one allows narrows it to that value - #3

Closed
JanTvrdik wants to merge 13 commits into
dg:masterfrom
JanTvrdik:jt-import-narrowing
Closed

JanTvrdik wants to merge 13 commits into
dg:masterfrom
JanTvrdik:jt-import-narrowing

Conversation

@JanTvrdik

@JanTvrdik JanTvrdik commented Oct 28, 2026 •

Copy link
Copy Markdown
Contributor

dresscode import of a ruleset with both SlevomatCodingStandard.Namespaces.DisallowGroupUse and SlevomatCodingStandard.Namespaces.MultipleUsesPerLine dropped imports.grouping.*:

The foreign rules give `imports.grouping.class` values that contradict each other; DressCode leaves it out, for the configuration to set by hand.

The two sniffs do not contradict each other: DisallowGroupUse allows [separated, combined], and MultipleUsesPerLine sets separated, which is one of them. Translation::merge() already intersected two allowed lists, but not an allowed list with one set value. The same held for DisallowGroupUse with PSR2.Namespaces.UseDeclaration.

Now a single value inside an allowed list narrows the list to that value, in either order. A value outside the list is still a contradiction. The docblocks of Translation and setAllowed() and the Interop section of docs/internals.md say so (the bullet of internals.md is re-wrapped as a whole; only that clause is new).

Tests: tests/DressCode/Interop/Translator.phpt, both orders of DisallowGroupUse with MultipleUsesPerLine and with UseDeclaration (narrowed to separated), and with group_import (still a contradiction, with its warning).

Locally, all checks give the same results as on master: the forbiddenPhpdocLines fixture fails, and PHPStan reports the error in tests/bootstrap.php, plus three errors in NativeType.php and PhpdocTypeNotationVisitor.php with a fresh composer install (phpstan/phpdoc-parser 2.4.0). Upstream CI has not run on this PR yet.

Co-Authored-By: Claude Code

https://claude.ai/code/session_01D1mfZTuCXTAaFC39NM1xdk

dg added 12 commits October 28, 2026 02:24
…ich init proposes for a project formatted by Pint

PER Coding Style with what Pint 1.32 decides otherwise and without what it leaves to the author: the concatenation
without spaces, `! $x`, `new Foo`, `fn ($x) =>`, the trailing comma in arrays alone, a blank line before `return`
and `continue`, the enum cases kept together, the names in doc comments imported, and no construct spread for its
width. A standard of the core beside the others, so the reference, explain and init list it with them; init writes
it where the project requires laravel/pint, the standard of the preset a pint.json names, laravel without one.
dresscode init measures the code of a project and writes the configuration that fits it, each decision with its description.
… in the style the project keeps

dresscode upgrade lays the set deprecations, with --modernize also modernizations, over the presets the configuration
uses and beneath its own decisions and overrides, so that what the project keeps stays kept, lets in the plugins of
the packages of upgrading data, adds the types of the code and fixes. Without a configuration file it takes the
directory as a whole and no style. With one it keeps the scope, the target, the types, fixRisky, the baseline and the
maps, and of the style only the decisions the code keeps: a check without the types and the sets runs first, every
decision it finds violated anywhere is left out, and the run is narrowed by only to the rest, the sets and the packages
whose data reach the project, which a worker gets through --only. It takes --only, --fix-risky and --ask-risky, and
the summary names upgrade --ask-risky for the risky fixes left. The upgrade goes to the lowest versions of PHP and of
the libraries the project allows; the console says which libraries it takes, which packages are installed newer than
that, whose declarations then say nothing of what it deprecates, advising composer update --prefer-lowest, and,
where it rewrote a file, to run it again.
…beside DressCode

A package of upgrading data says which packages it is about under extra.dresscode.packages, and
UpgradingTester::collectPackageProblems() refuses a list that is not exactly the packages its upgrading files are
about. upgrade learns of the packages from Packagist, asked once a day and remembered in the cache directory, for now
of the vendor dresscode alone, and PackageDiscovery finds those installed beside DressCode by their type
dresscode-plugin, not only those of the project. A project requiring one of their libraries itself, not one where it
comes with another library, gets a missing package installed first: composer require into the installation of
DressCode, or require --dev into the project where its lock holds DressCode, in a terminal after asking and without
one only with --yes, otherwise it refuses with the command to run. The command then runs anew in a new process, whose
autoloader knows the installed packages and the plugin dresscode/upgrade-nette brings.
The configurations and the suppressions of PHP CS Fixer, PHP_CodeSniffer and Slevomat translated to the decisions of DressCode.
… the workers included

`--profile <file>` writes as JSON where the time of a run went, in nanoseconds: the phases (the start of the process,
the start of the container of PHPStan or of a derived one and its scopes, the parse, the passes, the gaps, the print,
the cycle collection, the run as a whole), every rule by the time of its callbacks, how often they ran and how often
they changed the tree, every gap rule by the time of its claims, every file with its size, rounds and passes, and the
peak memory of every process. A worker measures its own files and hands that over with every result and the parent
adds it up, so the totals do not depend on the number of workers. A run with the option leaves the result cache out,
a file served from the cache having nothing to measure.

It says where the time of a run goes, not only how much of it: a comparison of two revisions then names the rule or
the claim that moved. Without the option the engine only asks whether there is a profiler, and wraps a claim in
a measurement only when there is one.
Copilot AI balanced review requested due to automatic review settings October 28, 2026 21:18

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟢 Approval recommended

No active review issues remain for the foreign-rule import compatibility change.

No open issues 🎉

What changed in this PR

Fixes DressCode’s foreign-rule import merging so a single value contained in another rule’s allowed list is treated as compatible rather than contradictory.

Changes:

  • Narrows an allowed list to a matching single value in either merge order, while preserving conflicts for values outside the list.
  • Adds regression coverage for both orders of the two Slevomat import-grouping sniffs.
File Description
tests/​DressCode/​Interop/​Translator.phpt Tests compatible import-grouping settings in both rule orders.
src/​Interop/​Translation.php Handles merging an allowed list with a matching single value.

Review effort: Balanced

… allows narrows it to that value, DisallowGroupUse with MultipleUsesPerLine giving separated imports

Co-Authored-By: Claude Code
Claude-Session: https://claude.ai/code/session_01D1mfZTuCXTAaFC39NM1xdk
@JanTvrdik
JanTvrdik force-pushed the jt-import-narrowing branch from 1c9c845 to 6cc69e9 Compare October 28, 2026 22:17
@JanTvrdik JanTvrdik changed the title interop: a foreign rule setting one form narrows what another one allows interop: a single value one foreign rule sets inside what another one allows narrows it to that value Oct 28, 2026
@dg
dg force-pushed the master branch 2 times, most recently from 89af10b to 332227b Compare October 29, 2026 01:55
@dg

dg commented Oct 29, 2026

Copy link
Copy Markdown
Owner

Thank you, merged into master.

@dg dg closed this Oct 29, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants