-
Notifications
You must be signed in to change notification settings - Fork 5
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.
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
Add AssocValue flip and swap functions #60
Open
bronek89
wants to merge
6
commits into
master
Choose a base branch
from
feataure/flip-swap
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
fbc3439
Add AssocValue flip and swap functions
bronek89 5552211
Add AssocValue flip and swap functions
bronek89 d56dc08
Add AssocValue flip and swap functions
bronek89 c69909a
Change flip of assoc
bronek89 b58a769
dedump
bronek89 2f55b50
fix
bronek89 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,6 +3,7 @@ | |
namespace GW\Value; | ||
|
||
use BadMethodCallException; | ||
use GW\Value\Associable\Flip; | ||
use IteratorAggregate; | ||
use ArrayAccess; | ||
|
||
|
@@ -143,6 +144,18 @@ public function only(...$keys): AssocValue; | |
*/ | ||
public function withoutElement($value): AssocValue; | ||
|
||
/** | ||
* @phpstan-return IterableValue<TValue, TKey> | ||
*/ | ||
public function flip(): IterableValue; | ||
|
||
/** | ||
* @param TKey $keyA | ||
* @param TKey $keyB | ||
* @phpstan-return AssocArray<TKey, TValue> | ||
*/ | ||
public function swap($keyA, $keyB): AssocArray; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It can have type-hint |
||
|
||
/** | ||
* @deprecated use join() or replace() instead | ||
* @phpstan-param AssocValue<TKey, TValue> $other | ||
|
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
<?php declare(strict_types=1); | ||
|
||
namespace GW\Value\Associable; | ||
|
||
use GW\Value\Associable; | ||
use function array_flip; | ||
|
||
/** | ||
* @template TKey of int|string | ||
* @template TValue of int|string | ||
* @implements Associable<TKey,TValue> | ||
*/ | ||
final class Flip implements Associable | ||
{ | ||
/** @var Associable<TValue,TKey> */ | ||
private Associable $associable; | ||
|
||
/** | ||
* @param Associable<TValue,TKey> $associable | ||
*/ | ||
public function __construct(Associable $associable) | ||
{ | ||
$this->associable = $associable; | ||
} | ||
|
||
/** @return array<TKey,TValue> */ | ||
public function toAssocArray(): array | ||
{ | ||
return array_flip($this->associable->toAssocArray()); | ||
} | ||
} |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
<?php declare(strict_types=1); | ||
|
||
namespace GW\Value\Associable; | ||
|
||
use GW\Value\Associable; | ||
use InvalidArgumentException; | ||
|
||
/** | ||
* @template TKey of int|string | ||
* @template TValue | ||
* @implements Associable<TKey,TValue> | ||
*/ | ||
final class Swap implements Associable | ||
{ | ||
/** @var Associable<TKey,TValue> */ | ||
private Associable $associable; | ||
/** @var TKey */ | ||
private $keyA; | ||
/** @var TKey */ | ||
private $keyB; | ||
|
||
/** | ||
* @param Associable<TKey,TValue> $associable | ||
* @param TKey $keyA | ||
* @param TKey $keyB | ||
*/ | ||
public function __construct(Associable $associable, $keyA, $keyB) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
{ | ||
$this->associable = $associable; | ||
$this->keyA = $keyA; | ||
$this->keyB = $keyB; | ||
} | ||
|
||
/** @return array<TKey,TValue> */ | ||
public function toAssocArray(): array | ||
{ | ||
$items = $this->associable->toAssocArray(); | ||
$valueA = $items[$this->keyA] ?? throw new InvalidArgumentException("Undefined key {$this->keyA}"); | ||
$valueB = $items[$this->keyB] ?? throw new InvalidArgumentException("Undefined key {$this->keyB}"); | ||
$items[$this->keyA] = $valueB; | ||
$items[$this->keyB] = $valueA; | ||
|
||
return $items; | ||
} | ||
} |
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why not through
GW\Value\Associable\Flip
? I don't think thatAssocArray
should returnIterableValue
.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is hard to flip AssocValue, because TKey must be int|string and TValue is mixed - therefore it produces phpstan type errors. I think it can be fully fixed only after rewrite AssocValue to some kind of map with mixed key and mixed value.
For now I've changed it to:
it will be
AssocValue
- notAssocValue<TValue,TKey>
butAssocValue<int|string, TKey>
in other words - you loose type for key - from
Wrap::assoc([0 => 'xxx'])
asAssocValue<int,string>
flip makesAssocValue<int|string,int>
, notAssocValue<string,int>