Skip to content

Commit 3ed0a3e

Browse files
committed
Laravel 10 support
1 parent e72031a commit 3ed0a3e

File tree

5 files changed

+26
-13
lines changed

5 files changed

+26
-13
lines changed

composer.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@
1515
}
1616
],
1717
"require": {
18-
"php": "^8.0",
19-
"rodrigopedra/record-processor": "^2.1",
20-
"illuminate/contracts": "^9.0",
21-
"illuminate/database": "^9.0",
22-
"illuminate/support": "^9.0"
18+
"php": "^8.1",
19+
"rodrigopedra/record-processor": "^3.0",
20+
"illuminate/contracts": "^10.0",
21+
"illuminate/database": "^10.0",
22+
"illuminate/support": "^10.0"
2323
},
2424
"require-dev": {
25-
"symfony/console": "^6.0",
26-
"symfony/http-foundation": "^6.0",
27-
"symfony/process": "^6.0",
28-
"symfony/var-dumper": "^6.0"
25+
"symfony/console": "^6.2.5",
26+
"symfony/http-foundation": "^6.2.6",
27+
"symfony/process": "^6.2.5",
28+
"symfony/var-dumper": "^6.2.5"
2929
},
3030
"autoload": {
3131
"psr-4": {

src/Configurators/Serializers/EloquentSerializerConfigurator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class EloquentSerializerConfigurator extends SerializerConfigurator
1313
{
1414
public function __construct(EloquentSerializer $serializer)
1515
{
16-
parent::__construct($serializer, false, false);
16+
parent::__construct($serializer);
1717
}
1818

1919
public function builder(): Builder

src/Configurators/Serializers/QueryBuilderSerializerConfigurator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class QueryBuilderSerializerConfigurator extends SerializerConfigurator
1313
{
1414
public function __construct(QueryBuilderSerializer $serializer)
1515
{
16-
parent::__construct($serializer, false, false);
16+
parent::__construct($serializer);
1717
}
1818

1919
public function queryBuilder(): Builder

src/Readers/EloquentReader.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,14 @@ public function __construct(Builder $eloquentBuilder)
2626
public function open()
2727
{
2828
$this->lineCount = 0;
29-
$this->withInnerIterator($this->builder->cursor()->getIterator());
29+
30+
$iterator = $this->builder->cursor()->getIterator();
31+
$iterator = match (true) {
32+
$iterator instanceof \Iterator => $iterator,
33+
default => new \IteratorIterator($iterator),
34+
};
35+
36+
$this->withInnerIterator($iterator);
3037
}
3138

3239
public function close()

src/Readers/QueryBuilderReader.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,13 @@ public function open()
2828
{
2929
$this->lineCount = 0;
3030

31-
$this->withInnerIterator($this->queryBuilder->cursor()->getIterator());
31+
$iterator = $this->queryBuilder->cursor()->getIterator();
32+
$iterator = match (true) {
33+
$iterator instanceof \Iterator => $iterator,
34+
default => new \IteratorIterator($iterator),
35+
};
36+
37+
$this->withInnerIterator($iterator);
3238
}
3339

3440
public function close()

0 commit comments

Comments
 (0)