[TASK] Add native type declarations for CSSList
#1181
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
oliverklee
added this to the
9.0.0: Drop support for PHP < 7.2 and clean up things milestone
JakeQZ
reviewed
Mar 16, 2025
| @@ -41,7 +41,7 @@ abstract class CSSList implements Renderable, Commentable | |||
| protected $comments = []; | |||
|
|
|||
| /** | |||
| * @var array<int, RuleSet|CSSList|Import|Charset> | |||
| * @var array<int<0, max>, RuleSet|CSSList|Import|Charset> | |||
There was a problem hiding this comment.
Unfortunately not: In remove(), we unset() elements in the array, which creates gaps in the keys.
| @@ -364,10 +363,10 @@ public function setContents(array $contents): void | |||
| /** | |||
| * Removes a declaration block from the CSS list if it matches all given selectors. | |||
| * | |||
| * @param DeclarationBlock|array<array-key, Selector>|string $selectors the selectors to match | |||
| * @param DeclarationBlock|array<Selector>|string $selectors the selectors to match | |||
There was a problem hiding this comment.
I guess array-key is redundant so can be removed, but also wonder if the middle type could be a list...
There was a problem hiding this comment.
It could in theory. However, this being a list is not required for the method to work correctly. As this method is public API, I'd prefer to keep it as broad as possible in order to reduce hassle for the developers who use it.
|
|
||
| /** | ||
| * Returns the stored items. | ||
| * | ||
| * @return array<int, RuleSet|Import|Charset|CSSList> | ||
| * @return array<int<0, max>, RuleSet|Import|Charset|CSSList> |
There was a problem hiding this comment.
No, as $this->contents may have gaps in the keys due to the unset() in ::remove().
oliverklee
force-pushed
the
task/types/csslist
branch
from
4e00c05 to
885b3d2
Compare
JakeQZ
approved these changes
Mar 17, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Part of #811