Merge pull request #8139 from kenjis/remove-ModelFactory

refactor: remove deprecated ModelFactory
codeigniter4 · Nov 5, 2023 · b58a168 · b58a168
2 parents d7272b8 + 38b373d
commit b58a168
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 140 deletions.
diff --git a/phpstan-baseline.php b/phpstan-baseline.php
@@ -1186,16 +1186,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Database/MigrationRunner.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Method CodeIgniter\\\\Database\\\\ModelFactory\\:\\:injectMock\\(\\) has no return type specified\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Database/ModelFactory.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Method CodeIgniter\\\\Database\\\\ModelFactory\\:\\:reset\\(\\) has no return type specified\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Database/ModelFactory.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
 	'count' => 1,

diff --git a/system/Database/ModelFactory.php b/system/Database/ModelFactory.php
diff --git a/tests/system/Database/ModelFactoryTest.php b/tests/system/Database/ModelFactoryTest.php
diff --git a/user_guide_src/source/changelogs/v4.5.0.rst b/user_guide_src/source/changelogs/v4.5.0.rst
@@ -128,6 +128,11 @@ Filters
     - ``Router::$filterInfo``
     - ``Router::getFilter()``
 
+Database
+--------
+
+- ``ModelFactory``
+
 Model
 -----