From c3fb8ab775fc6284cc163389c93befb41caf5c65 Mon Sep 17 00:00:00 2001 From: MEG Date: Sun, 27 Sep 2020 08:57:48 +0300 Subject: [PATCH 01/30] logger --- src/HasDependencies.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/HasDependencies.php b/src/HasDependencies.php index 34824f9..6d84389 100644 --- a/src/HasDependencies.php +++ b/src/HasDependencies.php @@ -125,6 +125,7 @@ protected function extractChildFields($childFields) protected function applyRulesForChildFields($childField) { if (isset($childField->rules)) { + logger('$childField->attribute: ' . json_encode($childField->attribute)); $childField->rules[] = "sometimes:required:".$childField->attribute; } if (isset($childField->creationRules)) { From c31880d03d3db360ff0fd9e43bbf408634a17fd2 Mon Sep 17 00:00:00 2001 From: MEG Date: Sun, 27 Sep 2020 09:12:48 +0300 Subject: [PATCH 02/30] logger --- src/HasDependencies.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/HasDependencies.php b/src/HasDependencies.php index 6d84389..8d1e7d5 100644 --- a/src/HasDependencies.php +++ b/src/HasDependencies.php @@ -124,8 +124,9 @@ protected function extractChildFields($childFields) */ protected function applyRulesForChildFields($childField) { + logger('$childField->attribute: ' . json_encode($childField)); + if (isset($childField->rules)) { - logger('$childField->attribute: ' . json_encode($childField->attribute)); $childField->rules[] = "sometimes:required:".$childField->attribute; } if (isset($childField->creationRules)) { From 01b4a5b6c489090a2b3c36f885ea79d98ce94c14 Mon Sep 17 00:00:00 2001 From: MEG Date: Sun, 27 Sep 2020 09:21:57 +0300 Subject: [PATCH 03/30] logger --- src/HasDependencies.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/HasDependencies.php b/src/HasDependencies.php index 8d1e7d5..c208197 100644 --- a/src/HasDependencies.php +++ b/src/HasDependencies.php @@ -105,6 +105,7 @@ protected function doesRouteRequireChildFields() : bool */ protected function extractChildFields($childFields) { + logger('$childFields --> ' . json_encode($childFields)); foreach ($childFields as $childField) { if ($childField instanceof NovaDependencyContainer) { $this->extractChildFields($childField->meta['fields']); From 3d6fa1b5f5de4579ca54426f53df2430ed29df23 Mon Sep 17 00:00:00 2001 From: MEG Date: Sun, 27 Sep 2020 09:29:53 +0300 Subject: [PATCH 04/30] logger --- src/HasDependencies.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/HasDependencies.php b/src/HasDependencies.php index c208197..56420b4 100644 --- a/src/HasDependencies.php +++ b/src/HasDependencies.php @@ -125,9 +125,10 @@ protected function extractChildFields($childFields) */ protected function applyRulesForChildFields($childField) { - logger('$childField->attribute: ' . json_encode($childField)); + logger('$childField: ' . json_encode($childField)); if (isset($childField->rules)) { + logger('$childField->rules is set: ' . json_encode($childField->attribute)); $childField->rules[] = "sometimes:required:".$childField->attribute; } if (isset($childField->creationRules)) { From 17ac61faedb5f3b001cee9f19f3822c64355a691 Mon Sep 17 00:00:00 2001 From: MEG Date: Sun, 27 Sep 2020 09:53:20 +0300 Subject: [PATCH 05/30] logger --- src/HasDependencies.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/HasDependencies.php b/src/HasDependencies.php index 56420b4..c91a5eb 100644 --- a/src/HasDependencies.php +++ b/src/HasDependencies.php @@ -125,10 +125,9 @@ protected function extractChildFields($childFields) */ protected function applyRulesForChildFields($childField) { - logger('$childField: ' . json_encode($childField)); + logger('IN APPLY RULE CHILD FIELDS ' . json_encode($childField)); if (isset($childField->rules)) { - logger('$childField->rules is set: ' . json_encode($childField->attribute)); $childField->rules[] = "sometimes:required:".$childField->attribute; } if (isset($childField->creationRules)) { From 3e6e02db4eed550b1f34a3cb625f4a756c29c7ea Mon Sep 17 00:00:00 2001 From: MEG Date: Sun, 27 Sep 2020 09:57:41 +0300 Subject: [PATCH 06/30] logger --- src/HasDependencies.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/HasDependencies.php b/src/HasDependencies.php index c91a5eb..75098d2 100644 --- a/src/HasDependencies.php +++ b/src/HasDependencies.php @@ -107,6 +107,8 @@ protected function extractChildFields($childFields) { logger('$childFields --> ' . json_encode($childFields)); foreach ($childFields as $childField) { + + logger('COMPONENT: ' . $childField->component); if ($childField instanceof NovaDependencyContainer) { $this->extractChildFields($childField->meta['fields']); } else { From 22620cdc67c3889c0a7c527ada14a76cd348e4b3 Mon Sep 17 00:00:00 2001 From: MEG Date: Sun, 27 Sep 2020 10:06:23 +0300 Subject: [PATCH 07/30] logger --- src/HasDependencies.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/HasDependencies.php b/src/HasDependencies.php index 75098d2..a0a0681 100644 --- a/src/HasDependencies.php +++ b/src/HasDependencies.php @@ -130,6 +130,7 @@ protected function applyRulesForChildFields($childField) logger('IN APPLY RULE CHILD FIELDS ' . json_encode($childField)); if (isset($childField->rules)) { + logger('RULES IS SET AND IS: ' . json_encode($childField->rules)); $childField->rules[] = "sometimes:required:".$childField->attribute; } if (isset($childField->creationRules)) { From 0dde8e2d382e16224112c483779b89cd60433b4f Mon Sep 17 00:00:00 2001 From: MEG Date: Sun, 27 Sep 2020 10:22:53 +0300 Subject: [PATCH 08/30] logger --- src/HasDependencies.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/HasDependencies.php b/src/HasDependencies.php index a0a0681..a9522b2 100644 --- a/src/HasDependencies.php +++ b/src/HasDependencies.php @@ -131,6 +131,7 @@ protected function applyRulesForChildFields($childField) if (isset($childField->rules)) { logger('RULES IS SET AND IS: ' . json_encode($childField->rules)); + logger('$childField->attribute ----> ' . $childField->attribute); $childField->rules[] = "sometimes:required:".$childField->attribute; } if (isset($childField->creationRules)) { From 64d86b38664aada1a543a0740bda4f84aa420435 Mon Sep 17 00:00:00 2001 From: MEG Date: Sun, 27 Sep 2020 10:32:07 +0300 Subject: [PATCH 09/30] logger --- src/HasDependencies.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/HasDependencies.php b/src/HasDependencies.php index a9522b2..b88a14c 100644 --- a/src/HasDependencies.php +++ b/src/HasDependencies.php @@ -132,6 +132,7 @@ protected function applyRulesForChildFields($childField) if (isset($childField->rules)) { logger('RULES IS SET AND IS: ' . json_encode($childField->rules)); logger('$childField->attribute ----> ' . $childField->attribute); + logger('get type .. ' . gettype($childField->rules)); $childField->rules[] = "sometimes:required:".$childField->attribute; } if (isset($childField->creationRules)) { From 94f61d3333b343691bdfe2f409c69c8d834034ce Mon Sep 17 00:00:00 2001 From: MEG Date: Sun, 27 Sep 2020 10:56:42 +0300 Subject: [PATCH 10/30] logger --- src/HasDependencies.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/HasDependencies.php b/src/HasDependencies.php index b88a14c..4fad16f 100644 --- a/src/HasDependencies.php +++ b/src/HasDependencies.php @@ -133,6 +133,7 @@ protected function applyRulesForChildFields($childField) logger('RULES IS SET AND IS: ' . json_encode($childField->rules)); logger('$childField->attribute ----> ' . $childField->attribute); logger('get type .. ' . gettype($childField->rules)); + $childField->rules[] = "sometimes:required:".$childField->attribute; } if (isset($childField->creationRules)) { From 54e9546c39fb519182254804691c8a85416b0301 Mon Sep 17 00:00:00 2001 From: MEG Date: Sun, 27 Sep 2020 11:14:53 +0300 Subject: [PATCH 11/30] fix --- src/HasDependencies.php | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/src/HasDependencies.php b/src/HasDependencies.php index 4fad16f..5afa601 100644 --- a/src/HasDependencies.php +++ b/src/HasDependencies.php @@ -13,7 +13,7 @@ trait HasDependencies { protected $childFieldsArr = []; - + /** * @param NovaRequest $request * @return FieldCollection|\Illuminate\Support\Collection @@ -27,7 +27,7 @@ public function availableFields(NovaRequest $request) foreach ($fields as $field) { if ($field instanceof NovaDependencyContainer) { $availableFields[] = $this->filterFieldForRequest($field, $request); - if($field->areDependenciesSatisfied($request) || $this->extractableRequest($request, $this->model())) { + if ($field->areDependenciesSatisfied($request) || $this->extractableRequest($request, $this->model())) { if ($this->doesRouteRequireChildFields()) { $this->extractChildFields($field->meta['fields']); } @@ -53,13 +53,14 @@ public function availableFields(NovaRequest $request) * @param $model * @return bool */ - protected function extractableRequest(NovaRequest $request, $model) { + protected function extractableRequest(NovaRequest $request, $model) + { // if form was submitted to update (method === 'PUT') - if($request->isUpdateOrUpdateAttachedRequest() && strtoupper($request->get('_method', null)) === 'PUT') { + if ($request->isUpdateOrUpdateAttachedRequest() && strtoupper($request->get('_method', null)) === 'PUT') { return false; } // if form was submitted to create and new resource - if($request->isCreateOrAttachRequest() && $model->id === null) { + if ($request->isCreateOrAttachRequest() && $model->id === null) { return false; } return true; @@ -72,7 +73,8 @@ protected function extractableRequest(NovaRequest $request, $model) { * * @todo: implement */ - public function filterFieldForRequest($field, NovaRequest $request) { + public function filterFieldForRequest($field, NovaRequest $request) + { // @todo: filter fields for request, e.g. show/hideOnIndex, create, update or whatever return $field; } @@ -81,14 +83,15 @@ public function filterFieldForRequest($field, NovaRequest $request) { * @param array $availableFields * @param NovaRequest $request */ - public function filterFieldsForRequest(Collection $availableFields, NovaRequest $request) { + public function filterFieldsForRequest(Collection $availableFields, NovaRequest $request) + { return $availableFields; } /** * @return bool */ - protected function doesRouteRequireChildFields() : bool + protected function doesRouteRequireChildFields(): bool { return Str::endsWith(Route::currentRouteAction(), [ 'FieldDestroyController@handle', @@ -134,13 +137,17 @@ protected function applyRulesForChildFields($childField) logger('$childField->attribute ----> ' . $childField->attribute); logger('get type .. ' . gettype($childField->rules)); - $childField->rules[] = "sometimes:required:".$childField->attribute; + $childField->rules = (array)$childField->rules; + logger(gettype($childField->rules)); + + + $childField->rules[] = "sometimes:required:" . $childField->attribute; } if (isset($childField->creationRules)) { - $childField->creationRules[] = "sometimes:required:".$childField->attribute; + $childField->creationRules[] = "sometimes:required:" . $childField->attribute; } if (isset($childField->updateRules)) { - $childField->updateRules[] = "sometimes:required:".$childField->attribute; + $childField->updateRules[] = "sometimes:required:" . $childField->attribute; } return $childField; } @@ -150,13 +157,14 @@ protected function applyRulesForChildFields($childField) * Overridden using ActionController & ActionRequest by modifying routes * @return void */ - public function validateFields() { + public function validateFields() + { $availableFields = []; - if ( !empty( ($action_fields = $this->action()->fields()) ) ) { + if (!empty(($action_fields = $this->action()->fields()))) { foreach ($action_fields as $field) { if ($field instanceof NovaDependencyContainer) { // do not add any fields for validation if container is not satisfied - if($field->areDependenciesSatisfied($this)) { + if ($field->areDependenciesSatisfied($this)) { $availableFields[] = $field; $this->extractChildFields($field->meta['fields']); } From 1ba72680356d127b75da53e0919e5e4858d2a4e6 Mon Sep 17 00:00:00 2001 From: MEG Date: Sun, 27 Sep 2020 11:32:07 +0300 Subject: [PATCH 12/30] fix --- src/HasDependencies.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/HasDependencies.php b/src/HasDependencies.php index 5afa601..1aabf67 100644 --- a/src/HasDependencies.php +++ b/src/HasDependencies.php @@ -137,11 +137,16 @@ protected function applyRulesForChildFields($childField) logger('$childField->attribute ----> ' . $childField->attribute); logger('get type .. ' . gettype($childField->rules)); - $childField->rules = (array)$childField->rules; - logger(gettype($childField->rules)); + if(gettype($childField->rules) == 'object'){ + $childField->rules = "sometimes:required:" . $childField->attribute; + } + logger('$childField->rules ---> ' . $childField->rules); $childField->rules[] = "sometimes:required:" . $childField->attribute; + + logger('$childField->rules 2 ---> ' . $childField->rules); + } if (isset($childField->creationRules)) { $childField->creationRules[] = "sometimes:required:" . $childField->attribute; From d69aa2aaec11fce2de4d3d00a8c9a50f67b542fe Mon Sep 17 00:00:00 2001 From: MEG Date: Sun, 27 Sep 2020 11:45:56 +0300 Subject: [PATCH 13/30] fix --- src/HasDependencies.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/HasDependencies.php b/src/HasDependencies.php index 1aabf67..d936586 100644 --- a/src/HasDependencies.php +++ b/src/HasDependencies.php @@ -138,7 +138,7 @@ protected function applyRulesForChildFields($childField) logger('get type .. ' . gettype($childField->rules)); if(gettype($childField->rules) == 'object'){ - $childField->rules = "sometimes:required:" . $childField->attribute; + $childField->rules = json_decode(json_encode("sometimes:required:" . $childField->attribute)); } logger('$childField->rules ---> ' . $childField->rules); From 77894fca67f41d8a308dd54b47b9080c7b4ec1c0 Mon Sep 17 00:00:00 2001 From: MEG Date: Sun, 27 Sep 2020 11:48:57 +0300 Subject: [PATCH 14/30] fix --- src/HasDependencies.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/HasDependencies.php b/src/HasDependencies.php index d936586..4060c22 100644 --- a/src/HasDependencies.php +++ b/src/HasDependencies.php @@ -138,7 +138,7 @@ protected function applyRulesForChildFields($childField) logger('get type .. ' . gettype($childField->rules)); if(gettype($childField->rules) == 'object'){ - $childField->rules = json_decode(json_encode("sometimes:required:" . $childField->attribute)); + $childField->rules[] = json_decode(json_encode("sometimes:required:" . $childField->attribute)); } logger('$childField->rules ---> ' . $childField->rules); From 77704d6472b4f19f7505b4691c0307f86faccbed Mon Sep 17 00:00:00 2001 From: MEG Date: Sun, 27 Sep 2020 11:51:49 +0300 Subject: [PATCH 15/30] fix --- src/HasDependencies.php | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/HasDependencies.php b/src/HasDependencies.php index 4060c22..71deef2 100644 --- a/src/HasDependencies.php +++ b/src/HasDependencies.php @@ -136,17 +136,10 @@ protected function applyRulesForChildFields($childField) logger('RULES IS SET AND IS: ' . json_encode($childField->rules)); logger('$childField->attribute ----> ' . $childField->attribute); logger('get type .. ' . gettype($childField->rules)); - - if(gettype($childField->rules) == 'object'){ - $childField->rules[] = json_decode(json_encode("sometimes:required:" . $childField->attribute)); - } - logger('$childField->rules ---> ' . $childField->rules); $childField->rules[] = "sometimes:required:" . $childField->attribute; - logger('$childField->rules 2 ---> ' . $childField->rules); - } if (isset($childField->creationRules)) { $childField->creationRules[] = "sometimes:required:" . $childField->attribute; From 0d1875a4dda5e1eca4235ef1b16aa9957c860705 Mon Sep 17 00:00:00 2001 From: MEG Date: Sun, 27 Sep 2020 11:57:44 +0300 Subject: [PATCH 16/30] fix --- src/HasDependencies.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/HasDependencies.php b/src/HasDependencies.php index 71deef2..cc4e0cb 100644 --- a/src/HasDependencies.php +++ b/src/HasDependencies.php @@ -136,7 +136,10 @@ protected function applyRulesForChildFields($childField) logger('RULES IS SET AND IS: ' . json_encode($childField->rules)); logger('$childField->attribute ----> ' . $childField->attribute); logger('get type .. ' . gettype($childField->rules)); - logger('$childField->rules ---> ' . $childField->rules); + + if(gettype($childField->rules) == 'object'){ + $childField->rules[] = json_decode(json_encode($childField->rules), true); + } $childField->rules[] = "sometimes:required:" . $childField->attribute; From 7fde90290ff3b8974c427af62352540d7e2bba2a Mon Sep 17 00:00:00 2001 From: MEG Date: Sun, 27 Sep 2020 12:01:02 +0300 Subject: [PATCH 17/30] logger --- src/HasDependencies.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/HasDependencies.php b/src/HasDependencies.php index cc4e0cb..8200c4b 100644 --- a/src/HasDependencies.php +++ b/src/HasDependencies.php @@ -138,6 +138,7 @@ protected function applyRulesForChildFields($childField) logger('get type .. ' . gettype($childField->rules)); if(gettype($childField->rules) == 'object'){ + logger('object'); $childField->rules[] = json_decode(json_encode($childField->rules), true); } From 542fc6cdccb0d604a845a2d98492b05f6d0a0558 Mon Sep 17 00:00:00 2001 From: MEG Date: Sun, 27 Sep 2020 12:04:59 +0300 Subject: [PATCH 18/30] logger --- src/HasDependencies.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/HasDependencies.php b/src/HasDependencies.php index 8200c4b..fb51b26 100644 --- a/src/HasDependencies.php +++ b/src/HasDependencies.php @@ -139,7 +139,7 @@ protected function applyRulesForChildFields($childField) if(gettype($childField->rules) == 'object'){ logger('object'); - $childField->rules[] = json_decode(json_encode($childField->rules), true); + $childField->rules[] = json_decode(json_encode($childField->rules)); } $childField->rules[] = "sometimes:required:" . $childField->attribute; From 597e0ae948929301c207227cccc7f238d675910b Mon Sep 17 00:00:00 2001 From: MEG Date: Sun, 27 Sep 2020 12:08:50 +0300 Subject: [PATCH 19/30] logger --- src/HasDependencies.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/HasDependencies.php b/src/HasDependencies.php index fb51b26..e6792d9 100644 --- a/src/HasDependencies.php +++ b/src/HasDependencies.php @@ -139,7 +139,7 @@ protected function applyRulesForChildFields($childField) if(gettype($childField->rules) == 'object'){ logger('object'); - $childField->rules[] = json_decode(json_encode($childField->rules)); + $childField->rules = json_decode(json_encode($childField->rules)); } $childField->rules[] = "sometimes:required:" . $childField->attribute; From e6e37e23da20e534b865b1effd3993d4c327d871 Mon Sep 17 00:00:00 2001 From: MEG Date: Sun, 27 Sep 2020 12:10:24 +0300 Subject: [PATCH 20/30] logger --- src/HasDependencies.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/HasDependencies.php b/src/HasDependencies.php index e6792d9..2aa8616 100644 --- a/src/HasDependencies.php +++ b/src/HasDependencies.php @@ -139,10 +139,11 @@ protected function applyRulesForChildFields($childField) if(gettype($childField->rules) == 'object'){ logger('object'); - $childField->rules = json_decode(json_encode($childField->rules)); + $childField->rules = json_decode(json_encode("sometimes:required:" . $childField->attribute)); + }else{ + $childField->rules[] = "sometimes:required:" . $childField->attribute; } - $childField->rules[] = "sometimes:required:" . $childField->attribute; } if (isset($childField->creationRules)) { From b0782fa35d94c98875e1bab34ce4f3e420c3f5c1 Mon Sep 17 00:00:00 2001 From: MEG Date: Sun, 27 Sep 2020 13:02:55 +0300 Subject: [PATCH 21/30] fix --- src/HasDependencies.php | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/src/HasDependencies.php b/src/HasDependencies.php index 2aa8616..22151d2 100644 --- a/src/HasDependencies.php +++ b/src/HasDependencies.php @@ -108,10 +108,8 @@ protected function doesRouteRequireChildFields(): bool */ protected function extractChildFields($childFields) { - logger('$childFields --> ' . json_encode($childFields)); foreach ($childFields as $childField) { - logger('COMPONENT: ' . $childField->component); if ($childField instanceof NovaDependencyContainer) { $this->extractChildFields($childField->meta['fields']); } else { @@ -130,27 +128,30 @@ protected function extractChildFields($childFields) */ protected function applyRulesForChildFields($childField) { - logger('IN APPLY RULE CHILD FIELDS ' . json_encode($childField)); if (isset($childField->rules)) { - logger('RULES IS SET AND IS: ' . json_encode($childField->rules)); - logger('$childField->attribute ----> ' . $childField->attribute); - logger('get type .. ' . gettype($childField->rules)); - - if(gettype($childField->rules) == 'object'){ - logger('object'); + if (gettype($childField->rules) == 'object') { $childField->rules = json_decode(json_encode("sometimes:required:" . $childField->attribute)); - }else{ + } else { $childField->rules[] = "sometimes:required:" . $childField->attribute; } - - } + if (isset($childField->creationRules)) { - $childField->creationRules[] = "sometimes:required:" . $childField->attribute; + + if (gettype($childField->rules) == 'object') { + $childField->creationRules = json_decode(json_encode("sometimes:required:" . $childField->attribute)); + } else { + $childField->creationRules[] = "sometimes:required:" . $childField->attribute; + } } + if (isset($childField->updateRules)) { - $childField->updateRules[] = "sometimes:required:" . $childField->attribute; + if (gettype($childField->rules) == 'object') { + $childField->updateRules = json_decode(json_encode("sometimes:required:" . $childField->attribute)); + } else { + $childField->updateRules[] = "sometimes:required:" . $childField->attribute; + } } return $childField; } From 9a209badca588f22374627321797b500ceb8c126 Mon Sep 17 00:00:00 2001 From: MEG Date: Sun, 27 Sep 2020 13:27:52 +0300 Subject: [PATCH 22/30] logger --- src/HasDependencies.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/HasDependencies.php b/src/HasDependencies.php index 22151d2..d4d0ae7 100644 --- a/src/HasDependencies.php +++ b/src/HasDependencies.php @@ -130,11 +130,16 @@ protected function applyRulesForChildFields($childField) { if (isset($childField->rules)) { + if (gettype($childField->rules) == 'object') { $childField->rules = json_decode(json_encode("sometimes:required:" . $childField->attribute)); } else { $childField->rules[] = "sometimes:required:" . $childField->attribute; } + + logger('COMPONENT --> ' . $childField->component); + logger('$childField->rules ... ' . json_encode($childField->rules)); + } if (isset($childField->creationRules)) { From 7db30aca7262b9eb2217d5e378615f6f4c1ef86b Mon Sep 17 00:00:00 2001 From: MEG Date: Sun, 27 Sep 2020 13:32:44 +0300 Subject: [PATCH 23/30] logger --- src/HasDependencies.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/HasDependencies.php b/src/HasDependencies.php index d4d0ae7..46481a5 100644 --- a/src/HasDependencies.php +++ b/src/HasDependencies.php @@ -131,14 +131,16 @@ protected function applyRulesForChildFields($childField) if (isset($childField->rules)) { + logger('COMPONENT --> ' . $childField->component); + logger('$childField->rules before ... ' . json_encode($childField->rules)); + if (gettype($childField->rules) == 'object') { $childField->rules = json_decode(json_encode("sometimes:required:" . $childField->attribute)); } else { $childField->rules[] = "sometimes:required:" . $childField->attribute; } - logger('COMPONENT --> ' . $childField->component); - logger('$childField->rules ... ' . json_encode($childField->rules)); + logger('$childField->rules after ... ' . json_encode($childField->rules)); } From 94ba969412552717b8ea2593cdd73f34acef89b3 Mon Sep 17 00:00:00 2001 From: MEG Date: Sun, 27 Sep 2020 13:42:41 +0300 Subject: [PATCH 24/30] logger --- src/HasDependencies.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/HasDependencies.php b/src/HasDependencies.php index 46481a5..ef8fe22 100644 --- a/src/HasDependencies.php +++ b/src/HasDependencies.php @@ -135,7 +135,7 @@ protected function applyRulesForChildFields($childField) logger('$childField->rules before ... ' . json_encode($childField->rules)); if (gettype($childField->rules) == 'object') { - $childField->rules = json_decode(json_encode("sometimes:required:" . $childField->attribute)); + $childField->rules = json_decode((array)json_encode("sometimes:required:" . $childField->attribute)); } else { $childField->rules[] = "sometimes:required:" . $childField->attribute; } From bce3dba3555ad64bb219b8a26f1f57365362a2b9 Mon Sep 17 00:00:00 2001 From: MEG Date: Sun, 27 Sep 2020 13:45:36 +0300 Subject: [PATCH 25/30] logger --- src/HasDependencies.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/HasDependencies.php b/src/HasDependencies.php index ef8fe22..8e4aa08 100644 --- a/src/HasDependencies.php +++ b/src/HasDependencies.php @@ -135,7 +135,7 @@ protected function applyRulesForChildFields($childField) logger('$childField->rules before ... ' . json_encode($childField->rules)); if (gettype($childField->rules) == 'object') { - $childField->rules = json_decode((array)json_encode("sometimes:required:" . $childField->attribute)); + $childField->rules = (array)json_encode("sometimes:required:" . $childField->attribute); } else { $childField->rules[] = "sometimes:required:" . $childField->attribute; } From 84b1bb890c5e549d0858618d61d91e6504c3d30e Mon Sep 17 00:00:00 2001 From: MEG Date: Sun, 27 Sep 2020 14:15:08 +0300 Subject: [PATCH 26/30] logger --- src/HasDependencies.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/HasDependencies.php b/src/HasDependencies.php index 8e4aa08..46481a5 100644 --- a/src/HasDependencies.php +++ b/src/HasDependencies.php @@ -135,7 +135,7 @@ protected function applyRulesForChildFields($childField) logger('$childField->rules before ... ' . json_encode($childField->rules)); if (gettype($childField->rules) == 'object') { - $childField->rules = (array)json_encode("sometimes:required:" . $childField->attribute); + $childField->rules = json_decode(json_encode("sometimes:required:" . $childField->attribute)); } else { $childField->rules[] = "sometimes:required:" . $childField->attribute; } From a9435c0357c97c222286b613cd7bc01bce2f1e2c Mon Sep 17 00:00:00 2001 From: MEG Date: Sun, 27 Sep 2020 14:20:00 +0300 Subject: [PATCH 27/30] logger --- src/HasDependencies.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/HasDependencies.php b/src/HasDependencies.php index 46481a5..270c840 100644 --- a/src/HasDependencies.php +++ b/src/HasDependencies.php @@ -132,6 +132,7 @@ protected function applyRulesForChildFields($childField) if (isset($childField->rules)) { logger('COMPONENT --> ' . $childField->component); + logger('CHILD . ' . json_encode($childField)); logger('$childField->rules before ... ' . json_encode($childField->rules)); if (gettype($childField->rules) == 'object') { From 399f01dd4c2c0741acde60e808565e1a86060828 Mon Sep 17 00:00:00 2001 From: MEG Date: Sun, 27 Sep 2020 14:23:41 +0300 Subject: [PATCH 28/30] logger --- src/HasDependencies.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/HasDependencies.php b/src/HasDependencies.php index 270c840..61b7b93 100644 --- a/src/HasDependencies.php +++ b/src/HasDependencies.php @@ -135,11 +135,14 @@ protected function applyRulesForChildFields($childField) logger('CHILD . ' . json_encode($childField)); logger('$childField->rules before ... ' . json_encode($childField->rules)); - if (gettype($childField->rules) == 'object') { - $childField->rules = json_decode(json_encode("sometimes:required:" . $childField->attribute)); - } else { - $childField->rules[] = "sometimes:required:" . $childField->attribute; - } +// if (gettype($childField->rules) == 'object') { +// $childField->rules = json_decode(json_encode("sometimes:required:" . $childField->attribute)); +// } else { +// $childField->rules[] = "sometimes:required:" . $childField->attribute; +// } + + $childField->rules[] = "sometimes:required:" . $childField->attribute; + logger('$childField->rules after ... ' . json_encode($childField->rules)); From 4a884607dd480e1d1203cf6a452fbc00881fc344 Mon Sep 17 00:00:00 2001 From: MEG Date: Sun, 27 Sep 2020 14:31:54 +0300 Subject: [PATCH 29/30] logger --- src/HasDependencies.php | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/HasDependencies.php b/src/HasDependencies.php index 61b7b93..3d5c508 100644 --- a/src/HasDependencies.php +++ b/src/HasDependencies.php @@ -135,14 +135,10 @@ protected function applyRulesForChildFields($childField) logger('CHILD . ' . json_encode($childField)); logger('$childField->rules before ... ' . json_encode($childField->rules)); -// if (gettype($childField->rules) == 'object') { + if (gettype($childField->rules) == 'array') { + $childField->rules[] = "sometimes:required:" . $childField->attribute; // $childField->rules = json_decode(json_encode("sometimes:required:" . $childField->attribute)); -// } else { -// $childField->rules[] = "sometimes:required:" . $childField->attribute; -// } - - $childField->rules[] = "sometimes:required:" . $childField->attribute; - + } logger('$childField->rules after ... ' . json_encode($childField->rules)); From ad55270ecaf8cc9a7787a18c8bdb323c868c6995 Mon Sep 17 00:00:00 2001 From: MEG Date: Mon, 28 Sep 2020 08:41:51 +0300 Subject: [PATCH 30/30] fix --- src/HasDependencies.php | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/HasDependencies.php b/src/HasDependencies.php index 3d5c508..ee4080c 100644 --- a/src/HasDependencies.php +++ b/src/HasDependencies.php @@ -130,18 +130,9 @@ protected function applyRulesForChildFields($childField) { if (isset($childField->rules)) { - - logger('COMPONENT --> ' . $childField->component); - logger('CHILD . ' . json_encode($childField)); - logger('$childField->rules before ... ' . json_encode($childField->rules)); - if (gettype($childField->rules) == 'array') { $childField->rules[] = "sometimes:required:" . $childField->attribute; -// $childField->rules = json_decode(json_encode("sometimes:required:" . $childField->attribute)); } - - logger('$childField->rules after ... ' . json_encode($childField->rules)); - } if (isset($childField->creationRules)) {