feat: add lazyEach to EntityControlTrait by neellii · Pull Request #271 · RonasIT/laravel-helpers

neellii · 2026-03-27T03:02:55Z

refs: RonasIT/laravel-media#85 (comment)

Copilot

Pull request overview

Adds a lazyEach() helper to EntityControlTrait to iterate through models lazily (by ID) while preserving the trait’s state-reset behavior after query execution.

Changes:

Added EntityControlTrait::lazyEach() built on Eloquent lazyById(), returning the number of iterated records.
Extended SQL mocking helpers with a dedicated mock for the lazy-by-id query shape.
Added PHPUnit coverage for lazyEach() with both non-empty and empty result sets.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.

File	Description
`src/Traits/EntityControlTrait.php`	Introduces `lazyEach()` using `lazyById()` and resets settable properties afterward.
`tests/support/Traits/SqlMockTrait.php`	Adds SQL mock helper for the expected `lazyById` select + eager-load query.
`tests/EntityControlTraitTest.php`	Adds tests validating return count and settable-property reset for `lazyEach()`.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-03-27T08:44:53Z

+        $this
+            ->getQuery($where)
+            ->lazyById($chunkSize)
+            ->tapEach(function () use (&$count) {
+                $count++;
+            })
+            ->each($callback);
+
+        $this->postQueryHook();
+


lazyEach() calls postQueryHook() only after iterating successfully. If the provided callback throws an exception during iteration, the hook will never run and the repository can leak state (withTrashed/onlyTrashed/force/with/withCount) into subsequent calls. Consider wrapping the iteration in a try { ... } finally { $this->postQueryHook(); } to guarantee reset even on failure.

Suggested change

$this

->getQuery($where)

->lazyById($chunkSize)

->tapEach(function () use (&$count) {

$count++;

})

->each($callback);

$this->postQueryHook();

try {

$this

->getQuery($where)

->lazyById($chunkSize)

->tapEach(function () use (&$count) {

$count++;

})

->each($callback);

} finally {

$this->postQueryHook();

}

Copilot · 2026-03-27T08:44:53Z

        $this->postQueryHook();
    }

+    public function lazyEach(Closure $callback, array $where = [], int $chunkSize = 500): int


The new lazyEach() method’s parameter order (callback, where, chunkSize) is inconsistent with chunk() (limit, callback, where) and with most other methods in this trait that take $where as the last optional argument. This inconsistency makes the public API harder to remember/use (especially without named args). Consider aligning the signature/argument order with existing methods (or adding a PHPDoc showing intended usage).

Suggested change

public function lazyEach(Closure $callback, array $where = [], int $chunkSize = 500): int

public function lazyEach(int $chunkSize, Closure $callback, array $where = []): int

pirs1337 · 2026-03-29T10:41:09Z

        $this->postQueryHook();
    }

+    public function lazyEach(Closure $callback, array $where = [], int $chunkSize = 500): int


Suggested change

public function lazyEach(Closure $callback, array $where = [], int $chunkSize = 500): int

public function lazyEach(Closure $callback, array $where = [], int $chunkSize = 500): void

pirs1337 · 2026-03-29T10:58:38Z

+        $count = 0;
+
+        $this
+            ->getQuery($where)
+            ->lazyById($chunkSize)
+            ->tapEach(function () use (&$count) {
+                $count++;
+            })
+            ->each($callback);
+
+        $this->postQueryHook();
+
+        return $count;


tapEach is required?

Suggested change

$count = 0;

$this

->getQuery($where)

->lazyById($chunkSize)

->tapEach(function () use (&$count) {

$count++;

})

->each($callback);

$this->postQueryHook();

return $count;

$this

->getQuery($where)

->lazyById($chunkSize)

->each($callback);

$this->postQueryHook();

using

$count = 0; ->lazyEach(function ($item) use (&$count) { $count++; });

yeah, i think we can skip "counting" since its a helper package and "counting" can be implemented in a $callback

refs: RonasIT/laravel-media#85 (comment)

astorozhevsky · 2026-04-06T11:08:48Z

@codex review

chatgpt-codex-connector · 2026-04-06T11:12:24Z

Codex Review: Didn't find any major issues. 🎉

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

DenTray · 2026-04-28T04:08:07Z

@neellii could you please fix tests for the new tests

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 9bb90e1fce

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

chatgpt-codex-connector · 2026-04-28T04:11:39Z

+    public function testLazyEachEmptyResult()
+    {
+        $this->mockSelect(
+            'select "test_models".* from "test_models" where "test_models"."deleted_at" is not null order by "id" asc limit 500',


Align lazyEach empty-result SQL mock with repository state

testLazyEachEmptyResult mocks a query with "deleted_at" is not null, but the test calls self::$testRepositoryClass->lazyEach(...) without setting onlyTrashed(). In EntityControlTrait::getQuery(), that predicate is only applied when the onlyTrashed flag is enabled, so this expectation does not match the actual query path and makes the new empty-result test fail/misrepresent behavior.

Useful? React with 👍 / 👎.

refs: RonasIT/laravel-media#85 (comment)

…nk coverage and fixture Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

…of version check Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

… ordering issues Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

…it < 10.5.30 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

…3 compatibility Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

…ravel version Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: e3b757eaad

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

chatgpt-codex-connector · 2026-06-08T05:55:45Z

-            $assertionFailureProp->setValue($handler, null);
+        foreach ($class->getProperty('mockObjects')->getValue($this) as $entry) {
+            if ($isNewPhpunit) {
+                $handler = $entry['mockObject']->__phpunit_getInvocationHandler();


Treat PHPUnit 11 mock entries as objects

When the suite runs with PHPUnit 11 or newer, this branch tries to index each mockObjects entry as an array, but PHPUnit's TestCase::registerMockObject() still appends the mock object itself in 11/12; with the unconstrained phpunit/phpunit >=10.5.30 dev requirement, installing a current PHPUnit makes any test that calls clearMockAssertionFailures() fail with an object-as-array error before it can clear the handler state.

Useful? React with 👍 / 👎.

feat: add lazyEach to EntityControlTrait

54963fb

refs: RonasIT/laravel-media#85 (comment)

neellii assigned pirs1337 Mar 27, 2026

DenTray requested a review from Copilot March 27, 2026 08:40

Copilot started reviewing on behalf of DenTray March 27, 2026 08:41 View session

Copilot AI reviewed Mar 27, 2026

View reviewed changes

pirs1337 requested changes Mar 29, 2026

View reviewed changes

pirs1337 assigned neellii and unassigned pirs1337 Mar 29, 2026

Ni Nelli added 2 commits March 31, 2026 16:16

refactor: remove count result in lazyEach

d26eb99

refs: RonasIT/laravel-media#85 (comment)

chore: merge with master

47e4bdc

neellii assigned pirs1337 and unassigned neellii Mar 31, 2026

pirs1337 requested changes Mar 31, 2026

View reviewed changes

Comment thread tests/support/Traits/SqlMockTrait.php Outdated

Comment thread tests/EntityControlTraitTest.php Outdated

pirs1337 added 2 commits March 31, 2026 15:20

Update tests/support/Traits/SqlMockTrait.php

e5c1dd0

Update tests/EntityControlTraitTest.php

6dffcda

pirs1337 approved these changes Mar 31, 2026

View reviewed changes

pirs1337 assigned DenTray and unassigned pirs1337 Mar 31, 2026

Merge branch 'master' into add-lazy-each

1fd799d

DenTray requested changes Apr 28, 2026

View reviewed changes

Comment thread tests/EntityControlTraitTest.php Outdated

Comment thread tests/EntityControlTraitTest.php Outdated

Comment thread tests/EntityControlTraitTest.php

DenTray added 3 commits April 28, 2026 10:03

Update tests/EntityControlTraitTest.php

8a9f565

Update tests/EntityControlTraitTest.php

aae54a0

Update tests/EntityControlTraitTest.php

9bb90e1

DenTray assigned neellii and unassigned DenTray Apr 28, 2026

chatgpt-codex-connector Bot reviewed Apr 28, 2026

View reviewed changes

test: update EntityControlTraitTest lazyEach tests

46680d8

refs: RonasIT/laravel-media#85 (comment)

chore: mergw with master

b8cb00f

neellii assigned neellii and unassigned DenTray May 25, 2026

test: fix tests

cd56d28

refs: RonasIT/laravel-media#85 (comment)

neellii assigned DenTray and unassigned neellii May 25, 2026

DenTray and others added 3 commits June 8, 2026 07:30

Merge branch 'master' into add-lazy-each

b570188

test: improve lazyEach tests — remove Mockery::pattern, add multi-chu…

2f4628f

…nk coverage and fixture Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

test: simplify testLazyEachEmptyResult

be33a24

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

DenTray reviewed Jun 8, 2026

View reviewed changes

Comment thread tests/EntityControlTraitTest.php Outdated

Apply suggestion from @DenTray

42d6f7f

DenTray approved these changes Jun 8, 2026

View reviewed changes

DenTray and others added 9 commits June 8, 2026 10:09

fix: update clearMockAssertionFailures for PHPUnit 10 compatibility

96436a5

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

fix: make clearMockAssertionFailures compatible with PHPUnit 10 and 11

14012f6

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

fix: handle lazyById null condition difference in Laravel 13

e9872d9

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

fix: detect lazyById null condition by inspecting actual SQL instead …

9e68833

…of version check Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

fix: use different lazy query for laravel 12.4

d8455cd

fix: use withTrashed in testLazyEachEmptyResult to avoid global scope…

c7acddd

… ordering issues Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

fix: add space after // in single-line comment (pint)

3da5376

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

fix: add space after // in single-line comment (pint)

c9c360f

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

fix: simplify clearMockAssertionFailures — remove dead code for PHPUn…

92faff5

…it < 10.5.30 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

DenTray reviewed Jun 8, 2026

View reviewed changes

Comment thread tests/MockTraitTest.php Outdated

Apply suggestion from @DenTray

c06622d

DenTray approved these changes Jun 8, 2026

View reviewed changes

DenTray and others added 2 commits June 8, 2026 11:47

fix: fork clearMockAssertionFailures by Laravel version for PHPUnit 1…

d7444c7

…3 compatibility Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

fix: fork clearMockAssertionFailures by PHPUnit version instead of La…

e3b757e

…ravel version Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

DenTray approved these changes Jun 8, 2026

View reviewed changes

DenTray merged commit 83cb996 into master Jun 8, 2026
11 checks passed

DenTray deleted the add-lazy-each branch June 8, 2026 05:55

chatgpt-codex-connector Bot reviewed Jun 8, 2026

View reviewed changes

	public function lazyEach(Closure $callback, array $where = [], int $chunkSize = 500): int
	public function lazyEach(int $chunkSize, Closure $callback, array $where = []): int

Uh oh!

Conversation

neellii commented Mar 27, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Mar 27, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 27, 2026

Choose a reason for hiding this comment

Uh oh!

pirs1337 Mar 29, 2026

Choose a reason for hiding this comment

Uh oh!

pirs1337 Mar 29, 2026

Choose a reason for hiding this comment

Uh oh!

neellii Mar 31, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

astorozhevsky commented Apr 6, 2026

Uh oh!

chatgpt-codex-connector Bot commented Apr 6, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

DenTray commented Apr 28, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot Apr 28, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot Jun 8, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants