diff --git a/DataStorage/Database/DataMapperAbstract.php b/DataStorage/Database/DataMapperAbstract.php index b02c04728..486764b3f 100644 --- a/DataStorage/Database/DataMapperAbstract.php +++ b/DataStorage/Database/DataMapperAbstract.php @@ -130,7 +130,7 @@ class DataMapperAbstract implements DataMapperInterface * * Most often used for localizations * - * @var array> + * @var array * @since 1.0.0 */ protected static array $conditionals = []; @@ -291,16 +291,21 @@ class DataMapperAbstract implements DataMapperInterface /** * Create a conditional value * - * @param string $id Id of the conditional - * @param mixed $value Value of the conditional + * @param string $id Id of the conditional + * @param mixed $value Value of the conditional + * @param string[] $models Models to apply the conditional on * * @return static * * @since 1.0.0 */ - public static function withConditional(string $id, $value) /** @todo: return : static */ + public static function withConditional(string $id, $value, array $models = []) /** @todo: return : static */ { - self::$conditionals[$id] = $value; + self::$conditionals[$id] = [ + 'value' => $value, + 'models' => empty($models) ? null : $models, + ]; + return static::class; } @@ -358,12 +363,18 @@ class DataMapperAbstract implements DataMapperInterface $where1 = new Where(self::$db); $where2 = new Where(self::$db); + $modelName = self::getModelName(); + $hasConditionals = false; foreach (self::$conditionals as $condKey => $condValue) { - if (($column = self::getColumnByMember($condKey)) !== null) { - $where1->andWhere(static::$table . '_' . $searchDepth . '.' . $column, '=', $condValue); - $hasConditionals = true; + if (($column = self::getColumnByMember($condKey)) === null + || ($condValue['models'] !== null && !\in_array($modelName, $condValue['models'])) + ) { + continue; } + + $where1->andWhere(static::$table . '_' . $searchDepth . '.' . $column, '=', $condValue['value']); + $hasConditionals = true; } $hasAutocompletes = false; @@ -2388,7 +2399,7 @@ class DataMapperAbstract implements DataMapperInterface * @param int $relations Load relations * @param int $depth Relation depth * - * @return mixed + * @return array * * @since 1.0.0 */ @@ -2398,7 +2409,8 @@ class DataMapperAbstract implements DataMapperInterface int $limit = 50, string $order = 'ASC', int $relations = RelationType::ALL, - int $depth = 3) + int $depth = 3 + ) : array { $query = self::getQuery(); $query->where(static::$table . '_' . $depth . '.' . ($column !== null ? self::getColumnByMember($column) : static::$primaryField), '>', $pivot) @@ -2418,7 +2430,7 @@ class DataMapperAbstract implements DataMapperInterface * @param int $relations Load relations * @param int $depth Relation depth * - * @return mixed + * @return array * * @since 1.0.0 * @@ -2432,7 +2444,8 @@ class DataMapperAbstract implements DataMapperInterface int $limit = 50, string $order = 'ASC', int $relations = RelationType::ALL, - int $depth = 3) + int $depth = 3 + ) : array { $query = self::getQuery(); $query->where(static::$table . '_' . $depth . '.' . ($column !== null ? self::getColumnByMember($column) : static::$primaryField), '<', $pivot) @@ -2975,12 +2988,15 @@ class DataMapperAbstract implements DataMapperInterface ->from($value['table']) ->where($value['table'] . '.' . $value['external'], '=', $primaryKey); + $modelName = $value['mapper']::getModelName(); foreach (self::$conditionals as $condKey => $condValue) { - if (($column = $value['mapper']::getColumnByMember($condKey)) === null) { + if (($column = $value['mapper']::getColumnByMember($condKey)) === null + || ($condValue['models'] !== null && !\in_array($modelName, $condValue['models'])) + ) { continue; } - $query->andWhere($value['table'] . '.' . $column, '=', $condValue); + $query->andWhere($value['table'] . '.' . $column, '=', $condValue['value']); } } @@ -3027,12 +3043,15 @@ class DataMapperAbstract implements DataMapperInterface } // handle conditional + $modelName = self::getModelName(); foreach (self::$conditionals as $condKey => $condValue) { - if (($column = self::getColumnByMember($condKey)) === null) { + if (($column = self::getColumnByMember($condKey)) === null + || ($condValue['models'] !== null && !\in_array($modelName, $condValue['models'])) + ) { continue; } - $query->andWhere(static::$table . '_' . $depth . '.' . $column, '=', $condValue); + $query->andWhere(static::$table . '_' . $depth . '.' . $column, '=', $condValue['value']); } // get OwnsOneQuery @@ -3331,6 +3350,18 @@ class DataMapperAbstract implements DataMapperInterface */ return new $class(); } + + /** + * Get model from mapper + * + * @return string + * + * @since 1.0.0 + */ + private static function getModelName() : string + { + return empty(static::$model) ? \substr(static::class, 0, -6) : static::$model; + } } /* C0: setup for C1 diff --git a/Localization/Localization.php b/Localization/Localization.php index 3648b6ff5..a5d9ea22c 100644 --- a/Localization/Localization.php +++ b/Localization/Localization.php @@ -50,7 +50,7 @@ class Localization implements \JsonSerializable * @var string * @since 1.0.0 */ - protected string $language = ISO639x1Enum::_EN; + protected string $lang = ISO639x1Enum::_EN; /** * Currency. @@ -381,7 +381,7 @@ class Localization implements \JsonSerializable */ public function getLanguage() : string { - return $this->language; + return $this->lang; } /** @@ -403,7 +403,7 @@ class Localization implements \JsonSerializable throw new InvalidEnumValue($language); } - $this->language = $language; + $this->lang = $language; } /** @@ -769,7 +769,7 @@ class Localization implements \JsonSerializable 'id' => $this->id, 'country' => $this->country, 'timezone' => $this->timezone, - 'language' => $this->language, + 'language' => $this->lang, 'currency' => $this->currency, 'currencyformat' => $this->currencyFormat, 'decimal' => $this->decimal,