mirror_php/formwork
1
0
Fork 0
mirror of https://github.com/getformwork/formwork.git synced 2025-01-17 21:49:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #388 from getformwork/feature/final-data-classes

Browse Source
This commit is contained in:
Giuseppe Criscione 2022-11-11 23:26:31 +01:00 committed by GitHub
commit 461d1d6592
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 41 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
formwork/src/Admin/Controllers/OptionsController.php
View File

@ -55,7 +55,7 @@ class OptionsController extends AbstractController
return $this->admin()->redirect('/options/system/');
}
$fields->validate(Formwork::instance()->config());
$fields->validate(new DataGetter(Formwork::instance()->config()->toArray()));
$this->modal('changes');

13
formwork/src/Config.php
View File

@ -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
formwork/src/Data/DataGetter.php
View File

@ -6,7 +6,7 @@ use Formwork\Data\Contracts\Arrayable;
use Formwork\Data\Traits\DataArrayable;
use Formwork\Data\Traits\DataMultipleGetter;
class DataGetter implements Arrayable
final class DataGetter implements Arrayable
{
use DataArrayable;
use DataMultipleGetter;

2
formwork/src/Data/DataSetter.php
View File

@ -4,7 +4,7 @@ namespace Formwork\Data;
use Formwork\Data\Traits\DataMultipleSetter;
class DataSetter extends DataGetter
final class DataSetter extends DataGetter
{
use DataMultipleSetter;
}

12
formwork/src/Fields/Field.php
View File

@ -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
*/
@ -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();
}

10
formwork/src/Router/RouteParams.php
View File

@ -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
formwork/src/Schemes/Scheme.php
View File

@ -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
*/
@ -33,11 +38,11 @@ class Scheme extends DataGetter
$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')) {