Skip to content

Commit 69cf945

Browse files
dereuromarkclaude
dereuromark
and
claude
committed
Update finder return type from Query to SelectQuery
Changes finder method return type annotations from \Cake\ORM\Query to \Cake\ORM\Query\SelectQuery across the codebase to reflect the modern CakePHP API where SelectQuery is the more appropriate type hint for query builder methods. This improves IDE autocomplete accuracy and static analysis for developers using finder methods. Fixes #400 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <[email protected]>
1 parent 61ae315 commit 69cf945

File tree

4 files changed

+50
-51
lines changed

4 files changed

+50
-51
lines changed

‎src/Generator/Task/TableFinderTask.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
use Cake\Datasource\QueryInterface;
66
use Cake\ORM\Association;
7-
use Cake\ORM\Query;
87
use Cake\ORM\Query\SelectQuery;
98
use Cake\ORM\Table;
109
use Cake\ORM\TableRegistry;
@@ -36,7 +35,7 @@ class TableFinderTask extends ModelTask {
3635
/**
3736
* @var string
3837
*/
39-
public const CLASS_QUERY = Query::class;
38+
public const CLASS_QUERY = SelectQuery::class;
4039

4140
/**
4241
* @var array<string>

‎tests/TestCase/Generator/Task/TableFinderTaskTest.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@ public function testCollect() {
5252
}, $map);
5353

5454
$expectedMap = [
55-
'all' => '\Cake\ORM\Query::class',
56-
'children' => '\Cake\ORM\Query::class',
57-
'list' => '\Cake\ORM\Query::class',
58-
'path' => '\Cake\ORM\Query::class',
59-
'somethingCustom' => '\Cake\ORM\Query::class',
60-
'threaded' => '\Cake\ORM\Query::class',
61-
'treeList' => '\Cake\ORM\Query::class',
55+
'all' => '\Cake\ORM\Query\SelectQuery::class',
56+
'children' => '\Cake\ORM\Query\SelectQuery::class',
57+
'list' => '\Cake\ORM\Query\SelectQuery::class',
58+
'path' => '\Cake\ORM\Query\SelectQuery::class',
59+
'somethingCustom' => '\Cake\ORM\Query\SelectQuery::class',
60+
'threaded' => '\Cake\ORM\Query\SelectQuery::class',
61+
'treeList' => '\Cake\ORM\Query\SelectQuery::class',
6262
];
6363
$this->assertSame($expectedMap, $map);
6464
}

‎tests/test_files/meta/phpstorm/.meta.php‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -253,13 +253,13 @@
253253
override(
254254
\Cake\Datasource\QueryInterface::find(0),
255255
map([
256-
'all' => \Cake\ORM\Query::class,
257-
'children' => \Cake\ORM\Query::class,
258-
'list' => \Cake\ORM\Query::class,
259-
'path' => \Cake\ORM\Query::class,
260-
'somethingCustom' => \Cake\ORM\Query::class,
261-
'threaded' => \Cake\ORM\Query::class,
262-
'treeList' => \Cake\ORM\Query::class,
256+
'all' => \Cake\ORM\Query\SelectQuery::class,
257+
'children' => \Cake\ORM\Query\SelectQuery::class,
258+
'list' => \Cake\ORM\Query\SelectQuery::class,
259+
'path' => \Cake\ORM\Query\SelectQuery::class,
260+
'somethingCustom' => \Cake\ORM\Query\SelectQuery::class,
261+
'threaded' => \Cake\ORM\Query\SelectQuery::class,
262+
'treeList' => \Cake\ORM\Query\SelectQuery::class,
263263
]),
264264
);
265265

@@ -302,13 +302,13 @@
302302
override(
303303
\Cake\ORM\Association::find(0),
304304
map([
305-
'all' => \Cake\ORM\Query::class,
306-
'children' => \Cake\ORM\Query::class,
307-
'list' => \Cake\ORM\Query::class,
308-
'path' => \Cake\ORM\Query::class,
309-
'somethingCustom' => \Cake\ORM\Query::class,
310-
'threaded' => \Cake\ORM\Query::class,
311-
'treeList' => \Cake\ORM\Query::class,
305+
'all' => \Cake\ORM\Query\SelectQuery::class,
306+
'children' => \Cake\ORM\Query\SelectQuery::class,
307+
'list' => \Cake\ORM\Query\SelectQuery::class,
308+
'path' => \Cake\ORM\Query\SelectQuery::class,
309+
'somethingCustom' => \Cake\ORM\Query\SelectQuery::class,
310+
'threaded' => \Cake\ORM\Query\SelectQuery::class,
311+
'treeList' => \Cake\ORM\Query\SelectQuery::class,
312312
]),
313313
);
314314

@@ -482,13 +482,13 @@
482482
override(
483483
\Cake\ORM\Table::find(0),
484484
map([
485-
'all' => \Cake\ORM\Query::class,
486-
'children' => \Cake\ORM\Query::class,
487-
'list' => \Cake\ORM\Query::class,
488-
'path' => \Cake\ORM\Query::class,
489-
'somethingCustom' => \Cake\ORM\Query::class,
490-
'threaded' => \Cake\ORM\Query::class,
491-
'treeList' => \Cake\ORM\Query::class,
485+
'all' => \Cake\ORM\Query\SelectQuery::class,
486+
'children' => \Cake\ORM\Query\SelectQuery::class,
487+
'list' => \Cake\ORM\Query\SelectQuery::class,
488+
'path' => \Cake\ORM\Query\SelectQuery::class,
489+
'somethingCustom' => \Cake\ORM\Query\SelectQuery::class,
490+
'threaded' => \Cake\ORM\Query\SelectQuery::class,
491+
'treeList' => \Cake\ORM\Query\SelectQuery::class,
492492
]),
493493
);
494494

‎tests/test_files/meta/phpstorm/.meta_lowest.php‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -251,13 +251,13 @@
251251
override(
252252
\Cake\Datasource\QueryInterface::find(0),
253253
map([
254-
'all' => \Cake\ORM\Query::class,
255-
'children' => \Cake\ORM\Query::class,
256-
'list' => \Cake\ORM\Query::class,
257-
'path' => \Cake\ORM\Query::class,
258-
'somethingCustom' => \Cake\ORM\Query::class,
259-
'threaded' => \Cake\ORM\Query::class,
260-
'treeList' => \Cake\ORM\Query::class,
254+
'all' => \Cake\ORM\Query\SelectQuery::class,
255+
'children' => \Cake\ORM\Query\SelectQuery::class,
256+
'list' => \Cake\ORM\Query\SelectQuery::class,
257+
'path' => \Cake\ORM\Query\SelectQuery::class,
258+
'somethingCustom' => \Cake\ORM\Query\SelectQuery::class,
259+
'threaded' => \Cake\ORM\Query\SelectQuery::class,
260+
'treeList' => \Cake\ORM\Query\SelectQuery::class,
261261
]),
262262
);
263263

@@ -300,13 +300,13 @@
300300
override(
301301
\Cake\ORM\Association::find(0),
302302
map([
303-
'all' => \Cake\ORM\Query::class,
304-
'children' => \Cake\ORM\Query::class,
305-
'list' => \Cake\ORM\Query::class,
306-
'path' => \Cake\ORM\Query::class,
307-
'somethingCustom' => \Cake\ORM\Query::class,
308-
'threaded' => \Cake\ORM\Query::class,
309-
'treeList' => \Cake\ORM\Query::class,
303+
'all' => \Cake\ORM\Query\SelectQuery::class,
304+
'children' => \Cake\ORM\Query\SelectQuery::class,
305+
'list' => \Cake\ORM\Query\SelectQuery::class,
306+
'path' => \Cake\ORM\Query\SelectQuery::class,
307+
'somethingCustom' => \Cake\ORM\Query\SelectQuery::class,
308+
'threaded' => \Cake\ORM\Query\SelectQuery::class,
309+
'treeList' => \Cake\ORM\Query\SelectQuery::class,
310310
]),
311311
);
312312

@@ -480,13 +480,13 @@
480480
override(
481481
\Cake\ORM\Table::find(0),
482482
map([
483-
'all' => \Cake\ORM\Query::class,
484-
'children' => \Cake\ORM\Query::class,
485-
'list' => \Cake\ORM\Query::class,
486-
'path' => \Cake\ORM\Query::class,
487-
'somethingCustom' => \Cake\ORM\Query::class,
488-
'threaded' => \Cake\ORM\Query::class,
489-
'treeList' => \Cake\ORM\Query::class,
483+
'all' => \Cake\ORM\Query\SelectQuery::class,
484+
'children' => \Cake\ORM\Query\SelectQuery::class,
485+
'list' => \Cake\ORM\Query\SelectQuery::class,
486+
'path' => \Cake\ORM\Query\SelectQuery::class,
487+
'somethingCustom' => \Cake\ORM\Query\SelectQuery::class,
488+
'threaded' => \Cake\ORM\Query\SelectQuery::class,
489+
'treeList' => \Cake\ORM\Query\SelectQuery::class,
490490
]),
491491
);
492492

0 commit comments

Comments
 (0)