Skip to content
GitLab

Resolve "internal forms with same className"

Merged Карим Шарафутдинов requested to merge 3-internal-forms-with-same-classname into master
Compare
and
1 file
+ 115
- 77
src/Form.php
+ 115
- 77
@@ -11,31 +11,41 @@ abstract class Form extends Model
public function load($data, $formName = null): bool
{
$formData = $data;
foreach ($this->internalForms() as $className => $name) {
unset($formData[$name]);
foreach ($this->internalForms() as $names) {
if (!is_array($names)) {
$names = [$names];
}
foreach ($names as $name) {
unset($formData[$name]);
}
}
$success = parent::load($data, $formName);
foreach ($this->internalForms() as $className => $name) {
if (property_exists($this, $name) === false) {
continue;
foreach ($this->internalForms() as $className => $names) {
if (!is_array($names)) {
$names = [$names];
}
if (isset($data[$name]) === false){
$rp = new ReflectionProperty(static::class, $name);
if ($rp->getType() === "array"){
$this->$name = [];
}else{
$this->$name = new $className;
foreach ($names as $name) {
if (property_exists($this, $name) === false) {
continue;
}
continue;
}
if (count(array_filter(array_keys($data[$name]), 'is_string')) === 0) {
foreach ($data[$name] as $ignored) {
$this->$name[] = new $className();
if (isset($data[$name]) === false){
$rp = new ReflectionProperty(static::class, $name);
if ($rp->getType() === "array"){
$this->$name = [];
}else{
$this->$name = new $className;
}
continue;
}
if (count(array_filter(array_keys($data[$name]), 'is_string')) === 0) {
foreach ($data[$name] as $ignored) {
$this->$name[] = new $className();
}
$success = Model::loadMultiple($this->$name, $data[$name], '') || $success;
} else {
$this->$name = new $className();
$success = $this->$name->load($data[$name], '') || $success;
}
$success = Model::loadMultiple($this->$name, $data[$name], '') || $success;
} else {
$this->$name = new $className();
$success = $this->$name->load($data[$name], '') || $success;
}
}
return $success;
@@ -49,14 +59,19 @@ abstract class Form extends Model
} else {
$success = parent::validate(null, $clearErrors);
}
foreach ($this->internalForms() as $name) {
$form = $this->$name;
if ($attributeNames === null || array_key_exists($name, $attributeNames) || in_array($name, $attributeNames, true)) {
$innerNames = ArrayHelper::getValue($attributeNames, $name);
if (is_array($form)) {
$success = Model::validateMultiple($form, $innerNames) && $success;
} else {
$success = $form->validate($innerNames, $clearErrors) && $success;
foreach ($this->internalForms() as $names) {
if (!is_array($names)) {
$names = [$names];
}
foreach ($names as $name) {
$form = $this->$name;
if ($attributeNames === null || array_key_exists($name, $attributeNames) || in_array($name, $attributeNames, true)) {
$innerNames = ArrayHelper::getValue($attributeNames, $name);
if (is_array($form)) {
$success = Model::validateMultiple($form, $innerNames) && $success;
} else {
$success = $form->validate($innerNames, $clearErrors) && $success;
}
}
}
}
@@ -71,30 +86,35 @@ abstract class Form extends Model
if (parent::hasErrors($attribute)) {
return true;
}
foreach ($this->internalForms() as $name) {
$form = $this->$name;
if (is_array($form)) {
foreach ($form as $i => $item) {
foreach ($this->internalForms() as $names) {
if (!is_array($names)) {
$names = [$names];
}
foreach ($names as $name) {
$form = $this->$name;
if (is_array($form)) {
foreach ($form as $i => $item) {
if ($attribute === null) {
if ($item->hasErrors()) {
return true;
}
} elseif (mb_strpos($attribute, $name . '.' . $i . '.') === 0) {
if ($item->hasErrors(mb_substr($attribute, mb_strlen($name . '.' . $i . '.')))) {
return true;
}
}
}
} else {
if ($attribute === null) {
if ($item->hasErrors()) {
if ($form->hasErrors()) {
return true;
}
} elseif (mb_strpos($attribute, $name . '.' . $i . '.') === 0) {
if ($item->hasErrors(mb_substr($attribute, mb_strlen($name . '.' . $i . '.')))) {
} elseif (mb_strpos($attribute, $name . '.') === 0) {
if ($form->hasErrors(mb_substr($attribute, mb_strlen($name . '.')))) {
return true;
}
}
}
} else {
if ($attribute === null) {
if ($form->hasErrors()) {
return true;
}
} elseif (mb_strpos($attribute, $name . '.') === 0) {
if ($form->hasErrors(mb_substr($attribute, mb_strlen($name . '.')))) {
return true;
}
}
}
}
return false;
@@ -103,14 +123,33 @@ abstract class Form extends Model
public function getErrors($attribute = null): array
{
$result = parent::getErrors($attribute);
foreach ($this->internalForms() as $name) {
$form = $this->$name;
if (is_array($form)) {
/** @var Model[] $form */
foreach ($form as $i => $item) {
foreach ($item->getErrors() as $attr => $errors) {
foreach ($this->internalForms() as $names) {
if (!is_array($names)) {
$names = [$names];
}
foreach ($names as $name) {
$form = $this->$name;
if (is_array($form)) {
/** @var Model[] $form */
foreach ($form as $i => $item) {
foreach ($item->getErrors() as $attr => $errors) {
/** @var array $errors */
$errorAttr = $name . '.' . $i . '.' . $attr;
if ($attribute === null) {
foreach ($errors as $error) {
$result[$errorAttr][] = $error;
}
} elseif ($errorAttr === $attribute) {
foreach ($errors as $error) {
$result[] = $error;
}
}
}
}
} else {
foreach ($form->getErrors() as $attr => $errors) {
/** @var array $errors */
$errorAttr = $name . '.' . $i . '.' . $attr;
$errorAttr = $name . '.' . $attr;
if ($attribute === null) {
foreach ($errors as $error) {
$result[$errorAttr][] = $error;
@@ -122,20 +161,6 @@ abstract class Form extends Model
}
}
}
} else {
foreach ($form->getErrors() as $attr => $errors) {
/** @var array $errors */
$errorAttr = $name . '.' . $attr;
if ($attribute === null) {
foreach ($errors as $error) {
$result[$errorAttr][] = $error;
}
} elseif ($errorAttr === $attribute) {
foreach ($errors as $error) {
$result[] = $error;
}
}
}
}
}
return $result;
@@ -144,17 +169,22 @@ abstract class Form extends Model
public function getFirstErrors(): array
{
$result = parent::getFirstErrors();
foreach ($this->internalForms() as $name) {
$form = $this->$name;
if (is_array($form)) {
foreach ($form as $i => $item) {
foreach ($item->getFirstErrors() as $attr => $error) {
$result[$name . '.' . $i . '.' . $attr] = $error;
foreach ($this->internalForms() as $names) {
if (!is_array($names)) {
$names = [$names];
}
foreach ($names as $name) {
$form = $this->$name;
if (is_array($form)) {
foreach ($form as $i => $item) {
foreach ($item->getFirstErrors() as $attr => $error) {
$result[$name . '.' . $i . '.' . $attr] = $error;
}
}
} else {
foreach ($form->getFirstErrors() as $attr => $error) {
$result[$name . '.' . $attr] = $error;
}
}
} else {
foreach ($form->getFirstErrors() as $attr => $error) {
$result[$name . '.' . $attr] = $error;
}
}
}
@@ -163,7 +193,15 @@ abstract class Form extends Model
public function __set($name, $value)
{
if (in_array($name, $this->internalForms(), true) === false) {
$internalFormsNames = [];
foreach ($this->internalForms() as $names) {
if (is_array($names)) {
$internalFormsNames = array_merge($internalFormsNames, $names);
} else {
$internalFormsNames[] = $names;
}
}
if (in_array($name, $internalFormsNames, true) === false) {
parent::__set($name, $value);
}
}