Model::tryLoad returns null when not found

Author: mvorisek

composer.json

@@ -50,7 +50,7 @@
         "friendsofphp/php-cs-fixer": "^3.0",
         "johnkary/phpunit-speedtrap": "^3.3",
         "phpstan/extension-installer": "^1.1",
-        "phpstan/phpstan": "^1.0",
+        "phpstan/phpstan": "^1.6",
         "phpstan/phpstan-deprecation-rules": "^1.0",
         "phpunit/phpunit": "^9.5.5"
     },

src/Model.php

@@ -1234,9 +1234,9 @@ private function remapIdLoadToPersistence($id)
     /**
      * @param mixed $id
      *
-     * @return $this
+     * @return ($fromTryLoad ? $this|null : $this)
      */
-    private function _loadThis(bool $isTryLoad, $id)
+    private function _loadThis(bool $fromTryLoad, $id)
     {
         $this->assertIsEntity();
         if ($this->isLoaded()) {
@@ -1250,17 +1250,20 @@ private function _loadThis(bool $isTryLoad, $id)
             return $this;
         }
         $dataRef = &$this->getDataRef();
-        $dataRef = $this->persistence->{$isTryLoad ? 'tryLoad' : 'load'}($this->getModel(), $this->remapIdLoadToPersistence($id));
-        if ($isTryLoad && $dataRef === null) {
-            $dataRef = [];
-            $this->unload();
+        $dataRef = $this->persistence->{$fromTryLoad ? 'tryLoad' : 'load'}($this->getModel(), $this->remapIdLoadToPersistence($id));
+        if ($fromTryLoad && $dataRef === null) {
+            return null;
         } else {
             if ($this->id_field) {
                 $this->setId($this->getId());
             }
 
             $ret = $this->hook(self::HOOK_AFTER_LOAD);
             if ($ret === false) {
+                if ($fromTryLoad) {
+                    return null;
+                }
+
                 $this->unload();
             } elseif (is_object($ret)) {
                 return $ret; // @phpstan-ignore-line