some cleanup on datamodel::get

verfriemelt-dot-org · Jun 2, 2024 · e6243c7 · e6243c7
1 parent d2d0b56
commit e6243c7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 20 deletions.
diff --git a/_/DataModel/DataModel.php b/_/DataModel/DataModel.php
@@ -256,9 +256,6 @@ public static function buildCountQuery(): DataModelQueryBuilder
         return $query;
     }
 
-    /**
-     * creates an object with the given id as param
-     */
     public static function get(string|int $id): ?static
     {
         $pk = static::getPrimaryKey();
@@ -267,16 +264,7 @@ public static function get(string|int $id): ?static
             throw new DatabaseException('::get is not possible without PK');
         }
 
-        $result = static::fetchBy($pk, $id);
-
-        // for backwards compatibility
-        if ($result === null) {
-            throw new DatabaseObjectNotFound(
-                'no such object found in database with name ' . static::class . " and id {$id}",
-            );
-        }
-
-        return $result;
+        return static::fetchBy($pk, $id) ?? throw new DatabaseObjectNotFound('no such object found in database with name ' . static::class . " and id {$id}");
     }
 
     public function reload(): static

diff --git a/phpstan.baseline.neon b/phpstan.baseline.neon
@@ -521,7 +521,7 @@ parameters:
 			path: _/DataModel/DataModel.php
 
 		-
-			message: "#^Class cognitive complexity is 71, keep it under 50$#"
+			message: "#^Class cognitive complexity is 70, keep it under 50$#"
 			count: 1
 			path: _/DataModel/DataModel.php
 
@@ -546,12 +546,7 @@ parameters:
 			path: _/DataModel/DataModel.php
 
 		-
-			message: "#^Method verfriemelt\\\\wrapped\\\\_\\\\DataModel\\\\DataModel\\:\\:count\\(\\) has parameter \\$and with no type specified\\.$#"
-			count: 1
-			path: _/DataModel/DataModel.php
-
-		-
-			message: "#^Method verfriemelt\\\\wrapped\\\\_\\\\DataModel\\\\DataModel\\:\\:count\\(\\) has parameter \\$params with no type specified\\.$#"
+			message: "#^Method verfriemelt\\\\wrapped\\\\_\\\\DataModel\\\\DataModel\\:\\:count\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
 			count: 1
 			path: _/DataModel/DataModel.php