Merge pull request #28 from flightphp/find-adjustments

adjusted behavior and comments around find() method

Author: n0nag0n

composer.json

@@ -26,7 +26,7 @@
         "phpunit/phpunit": "^9.0",
         "squizlabs/php_codesniffer": "^3.8",
         "rregeer/phpunit-coverage-check": "^0.3.1",
-        "flightphp/runway": "^0.2.4 || ^1.0"
+        "flightphp/runway": "^0.2 || ^1.0"
     },
 	"autoload": {
 		"psr-4": {"flight\\": "src/"}

src/ActiveRecord.php

@@ -430,12 +430,12 @@ public function getDatabaseEngine(): string
     /**
      * function to find one record and assign in to current object.
      * @param int|string $id If call this function using this param, will find record by using this id. If not set, just find the first record in database.
-     * @return bool|ActiveRecord if find record, assign in to current object and return it, other wise return "false".
+     * @return ActiveRecord Returns a hydrated ActiveRecord object if found, otherwise returns an empty ActiveRecord object.
      */
     public function find($id = null)
     {
         if ($id !== null) {
-            $this->resetQueryData()->eq($this->primaryKey, $id);
+            $this->eq($this->primaryKey, $id);
         }
 
         $this->processEvent('beforeFind', [ $this ]);
@@ -446,6 +446,7 @@ public function find($id = null)
 
         return $result;
     }
+
     /**
      * function to find all records in database.
      * @return array<int,ActiveRecord> return array of ActiveRecord
@@ -577,7 +578,7 @@ public function execute(string $sql, array $params = []): DatabaseStatementInter
      * @param array $param The param will be bind to PDOStatement.
      * @param ActiveRecord|null $obj The object, if find record in database, will assign the attributes in to this object.
      * @param bool $single if set to true, will find record and fetch in current object, otherwise will find all records.
-     * @return bool|ActiveRecord|array
+     * @return ActiveRecord|array
      */
     public function query(string $sql, array $param = [], ?ActiveRecord $obj = null, bool $single = false)
     {

tests/ActiveRecordPdoIntegrationTest.php

@@ -542,6 +542,18 @@ public function testIsHydratedGoodFind()
         $this->assertTrue($user->isHydrated());
     }
 
+	public function testIsHydratedGoodFindWithSelect()
+	{
+        $user = new User(new PDO('sqlite:test.db'));
+        $user->name = 'bob';
+        $user->password = 'pass';
+        $user->save();
+        $user->select('name')->find(1);
+        $this->assertTrue($user->isHydrated());
+		$this->assertEmpty($user->password);
+		$this->assertEquals('bob', $user->name);
+	}
+
     public function testIsHydratedGoodFindAll()
     {
         $user = new User(new PDO('sqlite:test.db'));