Jingga/phpOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/phpOMS.git synced 2026-02-10 05:58:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix broken getForArray implementation

Browse Source
This commit is contained in:
Dennis Eichhorn 2020-06-11 23:39:19 +02:00
parent b7cb3c6a7c
commit 0cee08b087
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
DataStorage/Database/DataMapperAbstract.php
View File

@ -2561,15 +2561,16 @@ class DataMapperAbstract implements DataMapperInterface
/** /**
* Get object. * Get object.
* *
* @param mixed $primaryKey Key * @param mixed $primaryKey Key
* @param int $relations Load relations * @param int $relations Load relations
* @param int $depth Relation depth * @param int $depth Relation depth
* @param string $ref Ref (for getBy and getFor)
* *
* @return array * @return array
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public static function getArray($primaryKey, int $relations = RelationType::ALL, int $depth = 3) : array public static function getArray($primaryKey, int $relations = RelationType::ALL, int $depth = 3, string $ref = null) : array
{ {
if ($depth < 1) { if ($depth < 1) {
return $primaryKey; return $primaryKey;
@ -2582,8 +2583,10 @@ class DataMapperAbstract implements DataMapperInterface
$primaryKey = (array) $primaryKey; $primaryKey = (array) $primaryKey;
$obj = []; $obj = [];
self::$relations = $relations;
foreach ($primaryKey as $key => $value) { foreach ($primaryKey as $key => $value) {
if (!self::isInitializedArray(static::class, $value, $depth)) { if (!self::isInitializedArray(static::class, $value, $depth) || $ref !== null) {
continue; continue;
} }
@ -2591,7 +2594,7 @@ class DataMapperAbstract implements DataMapperInterface
unset($primaryKey[$key]); unset($primaryKey[$key]);
} }
$dbData = self::getRaw($primaryKey, $relations, $depth); $dbData = self::getRaw($primaryKey, $relations, $depth, $ref);
if (empty($dbData)) { if (empty($dbData)) {
$countResulsts = \count($obj); $countResulsts = \count($obj);
@ -2682,7 +2685,7 @@ class DataMapperAbstract implements DataMapperInterface
*/ */
public static function getByArray($byKey, string $by, int $relations = RelationType::ALL, int $depth = 3) public static function getByArray($byKey, string $by, int $relations = RelationType::ALL, int $depth = 3)
{ {
return self::get($byKey, $relations, $depth, $by); return self::getArray($byKey, $relations, $depth, $by);
} }
/** /**

3
tests/DataStorage/Database/DataMapperAbstractTest.php
View File

@ -413,12 +413,13 @@ class DataMapperAbstractTest extends \PHPUnit\Framework\TestCase
*/ */
public function testDelete() : void public function testDelete() : void
{ {
/*
$id = BaseModelMapper::create($this->model); $id = BaseModelMapper::create($this->model);
BaseModelMapper::delete($this->model); BaseModelMapper::delete($this->model);
$modelR = BaseModelMapper::get($id); $modelR = BaseModelMapper::get($id);
self::assertInstanceOf('phpOMS\tests\DataStorage\Database\TestModel\NullBaseModel', $modelR); self::assertInstanceOf('phpOMS\tests\DataStorage\Database\TestModel\NullBaseModel', $modelR);
*/
/** /**
* @todo Orange-Management/phpOMS#225 * @todo Orange-Management/phpOMS#225
* Test the deletion of a model with relations (deleting relations). * Test the deletion of a model with relations (deleting relations).