Skip to content

Catchup with upstream#7

Merged
samuil-banti-wpenigne merged 136 commits intoNitroPack:masterfrom
MyIntervals:main
Apr 7, 2026
Merged

Catchup with upstream#7
samuil-banti-wpenigne merged 136 commits intoNitroPack:masterfrom
MyIntervals:main

Conversation

@samuil-banti-wpenigne
Copy link
Copy Markdown

No description provided.

oliverklee and others added 30 commits October 12, 2025 19:14
The scripts for checking things are not CI-specific. So rename
their shared prefix from `ci:` to `check:`.
Bumps [actions/checkout](https://github.com/actions/checkout) from 5 to 6.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v5...v6)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
It has turned out that PHPStan does not need them.

Fixes #1396
…#1401)

Updates the requirements on [phpunit/phpunit](https://github.com/sebastianbergmann/phpunit) to permit the latest version.
- [Release notes](https://github.com/sebastianbergmann/phpunit/releases)
- [Changelog](https://github.com/sebastianbergmann/phpunit/blob/8.5.49/ChangeLog-8.5.md)
- [Commits](sebastianbergmann/phpunit@8.5.48...8.5.49)

---
updated-dependencies:
- dependency-name: phpunit/phpunit
  dependency-version: 8.5.49
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Use a local variable in `setSelectors()` rather than temporarily assigning the
property with a type it's not supposed to have.

Ensure that the property is set to a non-sparse numerical array.

Also tighten the return type of `getSelectors()`.

(Precursor to #1330.)
To be consistent with the git log, new entries in the changelog
should be first.

This also makes it easier to see at a glance what was changed
recently.
As interfaces cannot be covered using an `@covers` annotation,
we need to use `@coversNothing` instead.

This will allow us to require coverage metadata for testcases
later down the road.
…1406)

Also internally avoid comparison with `==`.

Resolves #1330
…#1413)

Updates the requirements on [phpunit/phpunit](https://github.com/sebastianbergmann/phpunit) to permit the latest version.
- [Release notes](https://github.com/sebastianbergmann/phpunit/releases)
- [Changelog](https://github.com/sebastianbergmann/phpunit/blob/8.5.50/ChangeLog-8.5.md)
- [Commits](sebastianbergmann/phpunit@8.5.49...8.5.50)

---
updated-dependencies:
- dependency-name: phpunit/phpunit
  dependency-version: 8.5.50
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Also correct grammar of 'clean up',
which is two separate words when used as a verb
(though as a noun or adjective is a single word).
This now does the selector-parsing that `parse()` used to do itself.

Should help with #1324 and
#1398 (comment)
This fixes an issue noted in #1324.

Also add additional test data to fully exercise the code.
This, when used (in various places),
will be more efficient than doing a `peek()` followed by a `consume()`.
Bumps [actions/cache](https://github.com/actions/cache) from 4 to 5.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](actions/cache@v4...v5)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
JakeQZ and others added 29 commits February 15, 2026 11:22
…1522)

`Rule\Rule` was replaced with `Property\Declaration` in #1508.
`RemoveRule` was split up in #1249 to avoid parameter type overloading,
but updating the class DocBlock was missed then.

The class DocBlock should not be describing what individual methods do,
so that additional duplicated information has been removed.
It exists in the DocBlock for the method.
Both in DocBlock and inline code comments.

Make them more precise, and refer to 'declaration' rather than 'rule' where
applicable.
... in local variables and private method names, instead of the misnomered
'rule'
E.g. `addRule()` is changed to `addDeclaration()`, with `addRule()` deprecated
and changed to a wrapper method to call on to `addDeclaration()`.

`RuleContainer` itself should be renamed to `DeclarationContainer` as a
separate change.

The tests will also be updated as a separate change.
The methods of the `RuleContainer` interface were renamed in #1521.
- [x] Local variables
- [x] Test method names
- [x] Code comments
It contains property declarations not rules, and describing it as a 'list'
rather than a 'container' seems more apt, as the declarations are ordered.

Changes to use the new interface name in the source code and tests will be
submitted as follow-up PRs.
- always check and fix the `bin/`, `config/`, `src/` and `test/`
  directories
- sort the directories when provided to a tool
- make the rector command explicit
Don't treat spaces or characters like `~` within them as a stop character
representing a combinator.

The bug was introduced by #1496 and related changes that split selector
representation and parsing into compound selectors and combinators.

Addresses some of the issues in #1533.
The bug was introduced by #1496 and related changes that split selector
representation and parsing into compound selectors and combinators.

The regex for `CompoundSelector::isValid()` now matches that for
`Selector::isValid()`.

Fixes #1533
The interface was renamed from `RuleContainer` in #1530.

Also rename the trait that transitionally provides a mapping for the methods
deprecated in #1521 for the implementing classes.
The interface was renamed from `RuleContainer` in #1530.

Also accordingly rename the trait that provides test methods for implementing
classes.
This helps speed up local development and CI.
…1560)

Follow-up from #1559.

`phpstan-ignore-next-line` does not have parameters - it ignores all warnings
on the next line regardless
(see phpstan/phpstan#11340 (comment)).

`phpstan-ignore` applies to the next line, and has parameters to specify which
warnings to ignore.
Because the `if` statement generates two `booleanNot.alwaysTrue` warnings,
this needs to be specified twice in the argument list.
@samuil-banti-wpenigne samuil-banti-wpenigne merged commit eee7b53 into NitroPack:master Apr 7, 2026
1 check passed
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.

6 participants