From 38ffbc3061c6c16c98469fe385c80bf3c0480c65 Mon Sep 17 00:00:00 2001 From: mscherer Date: Thu, 9 Apr 2026 01:56:15 +0200 Subject: [PATCH 1/2] Forward table entity generic --- composer.json | 14 ++++++++++++-- src/Model/Table/Table.php | 2 ++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 258b3220..522b31b6 100644 --- a/composer.json +++ b/composer.json @@ -25,10 +25,20 @@ "issues": "https://github.com/dereuromark/cakephp-tools/issues", "source": "https://github.com/dereuromark/cakephp-tools" }, + "repositories": [ + { + "type": "vcs", + "url": "https://github.com/cakephp/cakephp.git" + }, + { + "type": "vcs", + "url": "https://github.com/dereuromark/cakephp-shim.git" + } + ], "require": { "php": ">=8.2", - "cakephp/cakephp": "^5.1.1", - "dereuromark/cakephp-shim": "^3.0.0" + "cakephp/cakephp": "dev-copilot/table-entity-generics-clean as 5.3.3", + "dereuromark/cakephp-shim": "dev-copilot/table-entity-generics as 3.8.3" }, "require-dev": { "fig-r/psr2r-sniffer": "dev-master", diff --git a/src/Model/Table/Table.php b/src/Model/Table/Table.php index ba956231..949bfad6 100644 --- a/src/Model/Table/Table.php +++ b/src/Model/Table/Table.php @@ -24,6 +24,8 @@ * @mixin \Tools\Model\Behavior\ResetBehavior * * @template TBehaviors of array = array{} + * @template TEntity of \Cake\Datasource\EntityInterface = \Cake\Datasource\EntityInterface + * @extends \Shim\Model\Table\Table */ class Table extends ShimTable { From 46eb925a105a4908b515095fc809eb3c6fa02b22 Mon Sep 17 00:00:00 2001 From: mscherer Date: Thu, 9 Apr 2026 02:02:05 +0200 Subject: [PATCH 2/2] Use git repos for stacked dependencies --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 522b31b6..d37eb938 100644 --- a/composer.json +++ b/composer.json @@ -27,11 +27,11 @@ }, "repositories": [ { - "type": "vcs", + "type": "git", "url": "https://github.com/cakephp/cakephp.git" }, { - "type": "vcs", + "type": "git", "url": "https://github.com/dereuromark/cakephp-shim.git" } ],