Improve containers types to use iterable objects #299
Conversation
This file contains 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
arogachev
reviewed
Apr 20, 2022
arogachev
reviewed
Apr 20, 2022
vjik
requested changes
Apr 20, 2022
# Conflicts: # src/Container.php # tests/Unit/ContainerTest.php
Codecov ReportPatch coverage:
Additional details and impacted files@@ Coverage Diff @@
## master #299 +/- ##
===========================================
Coverage 100.00% 100.00%
- Complexity 158 160 +2
===========================================
Files 11 11
Lines 460 467 +7
===========================================
+ Hits 460 467 +7
☔ View full report in Codecov by Sentry. |
vjik
requested changes
Dec 4, 2022
Co-authored-by: Sergei Predvoditelev <[email protected]>
samdark
approved these changes
Dec 5, 2022
|
@xepozz need a line for CHANGELOG. Also, it looks like BC-breaking change. |
Done. I can keep it for 2.0 |
samdark
reviewed
Jul 2, 2023
| } | ||
|
|
||
| public function dataInvalidTags(): array | ||
| { | ||
| return [ | ||
| [ | ||
| '/^Invalid tags configuration: tag should be string, 42 given\.$/', | ||
| 'Invalid tags configuration: tag should be string, array given.', |
There was a problem hiding this comment.
That does not look right. The problem here is 42, right?
vjik
requested changes
Jul 3, 2023
|
|
||
| $id = (string) $id; |
There was a problem hiding this comment.
Not need type-casting. Above check that $id is string.
| @@ -323,10 +325,12 @@ private function validateDefinition(mixed $definition, ?string $id = null): void | |||
| /** | |||
| * @throws InvalidConfigException | |||
| */ | |||
| private function validateMeta(array $meta): void | |||
| private function validateMeta(iterable $meta): void | |||
There was a problem hiding this comment.
validateMeta always receive array. Not need iterable.
| foreach ($meta as $key => $value) { | ||
| $key = (string)$key; |
There was a problem hiding this comment.
Suggested change
| $key = (string)$key; |
Not need.
| } | ||
|
|
||
| $tags = $this->tags[$tag]; | ||
| $tags = $tags instanceof Traversable ? iterator_to_array($tags, true) : $tags; |
There was a problem hiding this comment.
Better convert iterable to array before foreach
| @@ -58,5 +58,5 @@ public function getDefinitions(): array; | |||
| * @return array Extensions for the container services. Each array key is the name of the service to be modified | |||
| * and a corresponding value is callable doing the job. | |||
| */ | |||
| public function getExtensions(): array; | |||
| public function getExtensions(): iterable; | |||
| @@ -42,7 +42,7 @@ interface ServiceProviderInterface | |||
| * @return array Definitions for the container. Each array key is the name of the service (usually it is | |||
| * an interface name), and a corresponding value is a service definition. | |||
| */ | |||
| public function getDefinitions(): array; | |||
| public function getDefinitions(): iterable; | |||
| { | ||
| if ($this->validate) { | ||
| foreach ($tags as $tag => $services) { | ||
| if (!is_string($tag)) { | ||
| throw new InvalidConfigException( | ||
| sprintf( | ||
| 'Invalid tags configuration: tag should be string, %s given.', | ||
| $tag | ||
| get_debug_type($services) |
There was a problem hiding this comment.
Suggested change
| get_debug_type($services) | |
| get_debug_type($tag) |
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.
Added ability to use iterable parameters.
For example, now you cannot use Generator as tags values.