Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve containers types to use iterable objects #299

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
Open

Improve containers types to use iterable objects #299

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
fa22b81
Improve containers types to use iterable objects
xepozz Apr 19, 2022
c758bd4
Improve type checking
xepozz Apr 19, 2022
096dc0f
Fix tests
xepozz Apr 19, 2022
66942d8
Fix types notation
xepozz Apr 19, 2022
ecefc60
Fix test
xepozz Apr 19, 2022
a06b5ca
Fix text
xepozz Apr 20, 2022
21a7526
Merge branch 'master' into iterable
xepozz Dec 2, 2022
0e0d104
Fix tests
xepozz Dec 2, 2022
3a87f77
[ci-review] Apply changes from Rector action.
Dec 2, 2022
b0ae63a
Add support for iterable
xepozz Dec 2, 2022
b7b4690
Remove unused variable
xepozz Dec 2, 2022
f2832b7
Add test
xepozz Dec 2, 2022
fef57b1
Merge remote-tracking branch 'origin/iterable' into iterable
xepozz Dec 2, 2022
a55146a
Update src/ContainerConfigInterface.php
xepozz Dec 4, 2022
20bcdde
Merge branch 'master' into iterable
xepozz Jul 1, 2023
6ddc142
Add changelog
xepozz Jul 1, 2023
eb447ed
Change types in ServiceProviderInterface and classes
xepozz Jul 1, 2023
0e4059d
Update CHANGELOG.md
samdark Jul 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Prev Previous commit
Next Next commit
Improve type checking
  • Loading branch information
@xepozz
xepozz committed Apr 19, 2022
commit c758bd42615dc13ac4df3de773d3c613ef38d5ef
14 changes: 11 additions & 3 deletions src/Container.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
use Closure;
use InvalidArgumentException;
use Psr\Container\ContainerInterface;
use Traversable;
use Yiisoft\Definitions\ArrayDefinition;
use Yiisoft\Definitions\Exception\CircularReferenceException;
use Yiisoft\Definitions\Exception\InvalidConfigException;
Expand Down Expand Up @@ -428,9 +429,9 @@ private function setTags(iterable $tags): void
}
}
}
/** @psalm-var array<string, list<string>> $tags */
/** @psalm-var array<string, list<string>>|Traversable $tags */

$this->tags = $tags;
$this->tags = $tags instanceof Traversable ? iterator_to_array($tags) : $tags ;
}

/**
Expand All @@ -439,7 +440,14 @@ private function setTags(iterable $tags): void
private function setDefinitionTags(string $id, iterable $tags): void
{
foreach ($tags as $tag) {
if (!isset($this->tags[$tag]) || !in_array($id, $this->tags[$tag], true)) {
if (!isset($this->tags[$tag])) {
$this->tags[$tag] = [$id];
continue;
}

$tags = $this->tags[$tag];
$tags = $tags instanceof Traversable ? iterator_to_array($tags) : $tags;
if (!in_array($id, $tags, true)) {
$this->tags[$tag][] = $id;
}
}
Expand Down