Support nextras/(orm|dbal):5

contributte · Jan 13, 2025 · f9f580a · f9f580a
1 parent af2dc7a
commit f9f580a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/composer.json b/composer.json
@@ -52,8 +52,8 @@
 		"mockery/mockery": "^1.3.3",
 		"nette/database": "^3.0.2",
 		"nette/tester": "^2.3.4",
-		"nextras/dbal": "^4.0",
-		"nextras/orm": "^4.0",
+		"nextras/dbal": "^4.0 || ^5.0",
+		"nextras/orm": "^4.0 || ^5.0",
 		"phpstan/phpstan-deprecation-rules": "^1.1",
 		"phpstan/phpstan-mockery": "^1.1",
 		"phpstan/phpstan-nette": "^1.0.0",

diff --git a/phpstan.neon b/phpstan.neon
@@ -37,10 +37,6 @@ parameters:
 			message: "#^Cannot call method filterRow\\(\\) on Contributte\\\\Datagrid\\\\DataModel\\|null\\.$#"
 			count: 1
 			path: src/Datagrid.php
-		-
-			message: "#^Parameter \\#1 \\$x of method Doctrine\\\\ORM\\\\Query\\\\Expr\\:\\:like\\(\\) expects string, Doctrine\\\\ORM\\\\Query\\\\Expr\\\\Func given\\.$#"
-			count: 1
-			path: src/DataSource/DoctrineDataSource.php
 		- # In PHP 8+, the Stringable typehint should be used, and this can be removed.
 			message: '#string\\|Stringable#'
 			count: 1

diff --git a/tests/Cases/DataSources/NextrasDataSourceTest.phpt b/tests/Cases/DataSources/NextrasDataSourceTest.phpt
@@ -11,8 +11,8 @@ use Nette\Utils\Arrays;
 use Nextras\Dbal\Connection;
 use Nextras\Orm\Collection\Expression\LikeExpression;
 use Nextras\Orm\Entity\Entity;
+use Nextras\Orm\Mapper\Dbal\DbalMapper;
 use Nextras\Orm\Mapper\Dbal\DbalMapperCoordinator;
-use Nextras\Orm\Mapper\Mapper;
 use Nextras\Orm\Model\Model;
 use Nextras\Orm\Model\SimpleModelFactory;
 use Nextras\Orm\Repository\Repository;
@@ -129,7 +129,7 @@ class User extends Entity
 
 }
 
-class UsersMapper extends Mapper
+class UsersMapper extends DbalMapper
 {
 
 }
@@ -155,7 +155,7 @@ class Book extends Entity
 
 }
 
-class BooksMapper extends Mapper
+class BooksMapper extends DbalMapper
 {
 
 }