Skip to content

Commit 30e525e

Browse files
committed
Remove unnecessary forward compatibility, incorrect Pure statement
1 parent 16fda31 commit 30e525e

File tree

2 files changed

+1
-75
lines changed

2 files changed

+1
-75
lines changed

src/IterableToArray.php

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99

1010
namespace Navarr\Utils;
1111

12-
use JetBrains\PhpStorm\Pure;
13-
use Traversable;
14-
1512
use function is_array;
1613
use function iterator_to_array;
1714

@@ -31,45 +28,12 @@ class IterableToArray
3128
* </p>
3229
* @return array<T> An array containing the elements of the iterable.
3330
*/
34-
#[Pure]
3531
public static function convert(iterable $iterable, bool $preserve_keys = true): array
3632
{
3733
if (is_array($iterable)) {
3834
return $iterable;
3935
}
4036

41-
if ($iterable instanceof Traversable) {
42-
return iterator_to_array($iterable, $preserve_keys);
43-
}
44-
45-
// Fallback for supposedly impossible scenario
46-
return self::fallbackConvert($iterable, $preserve_keys);
47-
}
48-
49-
/**
50-
* Fallback to convert an iterable into an array
51-
*
52-
* This should, theoretically, never be used. However, for the sake of forward-compatibility, it exists and is
53-
* tested.
54-
*
55-
* It is extracted into its own private method to allow for unit testing.
56-
*
57-
* @template T
58-
* @param iterable<T> $iterable
59-
* @param bool $preserve_keys
60-
* @return array<T>
61-
*/
62-
#[Pure]
63-
private static function fallbackConvert(iterable $iterable, bool $preserve_keys): array
64-
{
65-
$result = [];
66-
foreach ($iterable as $key => $value) {
67-
if ($preserve_keys) {
68-
$result[$key] = $value;
69-
continue;
70-
}
71-
$result[] = $value;
72-
}
73-
return $result;
37+
return iterator_to_array($iterable, $preserve_keys);
7438
}
7539
}

tests/IterableToArrayTest.php

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -43,42 +43,4 @@ public function testConvertWithIteratorDoesNotPreserveKeys()
4343
$this->assertEquals(['b'], $result);
4444
$this->assertNotEquals(['a' => 'b'], $result);
4545
}
46-
47-
/**
48-
* @dataProvider fallbackDataProvider
49-
*/
50-
public function testFallback(iterable $iterator, bool $preserve_keys, array $expectedResult)
51-
{
52-
$reflectionMethod = new ReflectionMethod(IterableToArray::class, 'fallbackConvert');
53-
$reflectionMethod->setAccessible(true);
54-
$result = $reflectionMethod->invoke(null, $iterator, $preserve_keys);
55-
56-
$this->assertEquals($expectedResult, $result);
57-
}
58-
59-
public function fallbackDataProvider(): array
60-
{
61-
return [
62-
'Array w/ keys' => [
63-
['a' => 'b', 'b' => 'c'],
64-
true,
65-
['a' => 'b', 'b' => 'c'],
66-
],
67-
'Array w/out keys' => [
68-
['a' => 'b', 'b' => 'c'],
69-
false,
70-
['b', 'c'],
71-
],
72-
'Iterable w/ keys' => [
73-
new ArrayIterator(['a' => 'b', 'b' => 'c']),
74-
true,
75-
['a' => 'b', 'b' => 'c'],
76-
],
77-
'Iterable w/out keys' => [
78-
new ArrayIterator(['a' => 'b', 'b' => 'c']),
79-
false,
80-
['b', 'c'],
81-
],
82-
];
83-
}
8446
}

0 commit comments

Comments
 (0)