Skip to content

Commit

Permalink
Merge pull request #4 from feature-ninja/use-config-defaults
Browse files Browse the repository at this point in the history
Use non-nullable properties in Config
  • Loading branch information
rojtjo authored Nov 21, 2023
2 parents 148878b + e9efd0f commit 03559ff
Showing 1 changed file with 8 additions and 19 deletions.
27 changes: 8 additions & 19 deletions src/Config.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
final readonly class Config
{
public function __construct(
public ?Variants $variants,
public ?CompoundVariants $compoundVariants,
public ?DefaultVariants $defaultVariants,
public Variants $variants,
public CompoundVariants $compoundVariants,
public DefaultVariants $defaultVariants,
) {
}

Expand All @@ -18,21 +18,10 @@ public function __construct(
*/
public static function of(array $config): self
{
$variants = $config['variants'] ?? null;
if ($variants) {
$variants = Variants::of($variants);
}

$compoundVariants = $config['compoundVariants'] ?? null;
if ($compoundVariants) {
$compoundVariants = CompoundVariants::of($compoundVariants);
}

$defaultVariants = $config['defaultVariants'] ?? null;
if ($defaultVariants) {
$defaultVariants = DefaultVariants::of($defaultVariants);
}

return new self($variants, $compoundVariants, $defaultVariants);
return new self(
Variants::of($config['variants'] ?? []),
CompoundVariants::of($config['compoundVariants'] ?? []),
DefaultVariants::of($config['defaultVariants'] ?? []),
);
}
}

0 comments on commit 03559ff

Please sign in to comment.