Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/Extension/CoreExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -417,10 +417,8 @@ public static function cycle($values, $position): mixed

trigger_deprecation('twig/twig', '3.12', 'Passing a non-countable sequence of values to "%s()" is deprecated.', __METHOD__);

return $values;
$values = self::toArray($values, false);
}

$values = self::toArray($values, false);
}

if (!$count = \count($values)) {
Expand Down
41 changes: 41 additions & 0 deletions tests/Extension/CoreTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
*/

use PHPUnit\Framework\TestCase;
use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
use Twig\Environment;
use Twig\Error\RuntimeError;
use Twig\Extension\CoreExtension;
Expand All @@ -31,6 +32,8 @@

class CoreTest extends TestCase
{
use ExpectDeprecationTrait;

/**
* @dataProvider provideCycleCases
*/
Expand Down Expand Up @@ -407,6 +410,44 @@ public function testLastModified()
{
$this->assertGreaterThan(1000000000, (new CoreExtension())->getLastModified());
}

/**
* @group legacy
*/
public function testCycleWithArrayAccessAndTraversableButNotCountable()
{
$this->expectDeprecation('Since twig/twig 3.12: Passing a non-countable sequence of values to "Twig\Extension\CoreExtension::cycle()" is deprecated.');

$seq = new class implements \ArrayAccess, \IteratorAggregate {
public function offsetExists($offset): bool
{
return true;
}

public function offsetGet($offset): mixed
{
return 'val';
}

public function offsetSet($offset, $value): void
{
}

public function offsetUnset($offset): void
{
}

public function getIterator(): \Traversable
{
yield 'odd';
yield 'even';
}
};

$result = CoreExtension::cycle($seq, 0);

$this->assertEquals('odd', $result, 'cycle should return the first item from the traversable sequence, not the sequence itself.');
}
}

final class CoreTestIteratorAggregate implements \IteratorAggregate
Expand Down
Loading