Skip to content

final data classes #388

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
giuscris merged 2 commits into from
Nov 11, 2022
Merged

final data classes #388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27aeb5a
Make `final` the classes `DataGetter` and `DataSetter`
giuscris Nov 11, 2022
e60fc89
Fix classes extending `DataGetter` and `DataSetter`
giuscris Nov 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion formwork/src/Admin/Controllers/OptionsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public function systemOptions(): Response
return $this->admin()->redirect('/options/system/');
}

$fields->validate(Formwork::instance()->config());
$fields->validate(new DataGetter(Formwork::instance()->config()->toArray()));

$this->modal('changes');

Expand Down
13 changes: 11 additions & 2 deletions formwork/src/Config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,17 @@

namespace Formwork;

use Formwork\Data\DataGetter;
use Formwork\Data\Contracts\Arrayable;
use Formwork\Data\Traits\DataArrayable;
use Formwork\Data\Traits\DataGetter;

class Config extends DataGetter
class Config implements Arrayable
{
use DataArrayable;
use DataGetter;

public function __construct(array $data)
{
$this->data = $data;
}
}
2 changes: 1 addition & 1 deletion formwork/src/Data/DataGetter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
use Formwork\Data\Traits\DataArrayable;
use Formwork\Data\Traits\DataMultipleGetter;

class DataGetter implements Arrayable
final class DataGetter implements Arrayable
{
use DataArrayable;
use DataMultipleGetter;
Expand Down
2 changes: 1 addition & 1 deletion formwork/src/Data/DataSetter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

use Formwork\Data\Traits\DataMultipleSetter;

class DataSetter extends DataGetter
final class DataSetter extends DataGetter
{
use DataMultipleSetter;
}
12 changes: 10 additions & 2 deletions formwork/src/Fields/Field.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,19 @@

namespace Formwork\Fields;

use Formwork\Data\Contracts\Arrayable;
use Formwork\Data\Traits\DataArrayable;
use Formwork\Data\Traits\DataMultipleGetter;
use Formwork\Data\Traits\DataMultipleSetter;
use Formwork\Utils\Constraint;
use UnexpectedValueException;

class Field extends DataSetter
class Field implements Arrayable
{
use DataArrayable;
use DataMultipleGetter;
use DataMultipleSetter;

/**
* Field name
*/
Expand All @@ -18,7 +26,7 @@ class Field extends DataSetter
public function __construct(string $name, array $data = [])
{
$this->name = $name;
parent::__construct($data);
$this->data = $data;
if ($this->has('import')) {
$this->importData();
}
Expand Down
10 changes: 8 additions & 2 deletions formwork/src/Router/RouteParams.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,14 @@

namespace Formwork\Router;

use Formwork\Data\DataGetter;
use Formwork\Data\Traits\DataGetter;

class RouteParams extends DataGetter
class RouteParams
{
use DataGetter;

public function __construct(array $data)
{
$this->data = $data;
}
}
13 changes: 9 additions & 4 deletions formwork/src/Schemes/Scheme.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,18 @@

namespace Formwork\Schemes;

use Formwork\Data\DataGetter;
use Formwork\Data\Contracts\Arrayable;
use Formwork\Data\Traits\DataArrayable;
use Formwork\Data\Traits\DataGetter;
use Formwork\Formwork;
use Formwork\Parsers\YAML;
use Formwork\Utils\FileSystem;

class Scheme extends DataGetter
class Scheme implements Arrayable
{
use DataArrayable;
use DataGetter;

/**
* Scheme type
*/
Expand All @@ -33,11 +38,11 @@ public function __construct(string $type, string $path)
$this->path = $path;
$this->name = FileSystem::name($path);

parent::__construct(YAML::parseFile($this->path));
$this->data = YAML::parseFile($this->path);

if ($this->has('extend') && $this->get('extend') !== $this->name) {
$parent = Formwork::instance()->schemes()->get($type, $this->get('extend'));
$this->data = array_replace_recursive($parent->toArray(), $this->data);
$this->data = array_replace_recursive($parent->data, $this->data);
}

if (!$this->has('title')) {
Expand Down