feature/Unit-test was added

alexdodonov · Jan 26, 2022 · ed3d599 · ed3d599
1 parent 5b25920
commit ed3d599
Show file tree

Hide file tree

Showing 19 changed files with 93 additions and 53 deletions.
diff --git a/Mezon/Gui/Control.php b/Mezon/Gui/Control.php
@@ -8,7 +8,7 @@
  * @subpackage Control
  * @author Dodonov A.A.
  * @version v.1.0 (2019/09/14)
- * @copyright Copyright (c) 2019, aeon.org
+ * @copyright Copyright (c) 2019, http://aeon.su
  */
 
 /**

diff --git a/Mezon/Gui/Field/CustomField.php b/Mezon/Gui/Field/CustomField.php
@@ -2,6 +2,7 @@
 namespace Mezon\Gui\Field;
 
 use Mezon\TemplateEngine\TemplateEngine;
+use Mezon\Gui\Field;
 
 /**
  * Class CustomField
@@ -10,13 +11,13 @@
  * @subpackage CustomField
  * @author Dodonov A.A.
  * @version v.1.0 (2019/09/13)
- * @copyright Copyright (c) 2019, aeon.org
+ * @copyright Copyright (c) 2019, http://aeon.su
  */
 
 /**
  * Custom field control
  */
-class CustomField extends \Mezon\Gui\Field
+class CustomField extends Field
 {
 
     /**

diff --git a/Mezon/Gui/Field/InputDate.php b/Mezon/Gui/Field/InputDate.php
@@ -1,20 +1,22 @@
 <?php
 namespace Mezon\Gui\Field;
 
+use Mezon\Gui\Field;
+
 /**
  * Class InputDate
  *
  * @package Field
  * @subpackage InputDate
  * @author Dodonov A.A.
  * @version v.1.0 (2019/09/13)
- * @copyright Copyright (c) 2019, aeon.org
+ * @copyright Copyright (c) 2019, http://aeon.su
  */
 
 /**
  * Input field control
  */
-class InputDate extends \Mezon\Gui\Field
+class InputDate extends Field
 {
 
     /**

diff --git a/Mezon/Gui/Field/InputFile.php b/Mezon/Gui/Field/InputFile.php
@@ -1,20 +1,22 @@
 <?php
 namespace Mezon\Gui\Field;
 
+use Mezon\Gui\Field;
+
 /**
  * Class InputFile
  *
  * @package Field
  * @subpackage InputFile
  * @author Dodonov A.A.
  * @version v.1.0 (2019/09/04)
- * @copyright Copyright (c) 2019, aeon.org
+ * @copyright Copyright (c) 2019, http://aeon.su
  */
 
 /**
  * Input field control
  */
-class InputFile extends \Mezon\Gui\Field
+class InputFile extends Field
 {
 
     /**

diff --git a/Mezon/Gui/Field/InputText.php b/Mezon/Gui/Field/InputText.php
@@ -1,20 +1,22 @@
 <?php
 namespace Mezon\Gui\Field;
 
+use Mezon\Gui\Field;
+
 /**
  * Class InputText
  *
  * @package Field
  * @subpackage InputText
  * @author Dodonov A.A.
  * @version v.1.0 (2019/09/04)
- * @copyright Copyright (c) 2019, aeon.org
+ * @copyright Copyright (c) 2019, http://aeon.su
  */
 
 /**
  * Input field control
  */
-class InputText extends \Mezon\Gui\Field
+class InputText extends Field
 {
 
     /**

diff --git a/Mezon/Gui/Field/LabelField.php b/Mezon/Gui/Field/LabelField.php
@@ -8,13 +8,13 @@
  * @subpackage LabelField
  * @author Dodonov A.A.
  * @version v.1.0 (2019/09/04)
- * @copyright Copyright (c) 2019, aeon.org
+ * @copyright Copyright (c) 2019, http://aeon.su
  */
 
 /**
  * Form header control
  */
-class LabelField extends \Mezon\Gui\Field\TextField
+class LabelField extends TextField
 {
 
     /**

diff --git a/Mezon/Gui/Field/Select.php b/Mezon/Gui/Field/Select.php
@@ -1,20 +1,22 @@
 <?php
 namespace Mezon\Gui\Field;
 
+use Mezon\Gui\Field;
+
 /**
  * Class Select
  *
  * @package Field
  * @subpackage Select
  * @author Dodonov A.A.
  * @version v.1.0 (2019/09/04)
- * @copyright Copyright (c) 2019, aeon.org
+ * @copyright Copyright (c) 2019, http://aeon.su
  */
 
 /**
  * Text area control
  */
-class Select extends \Mezon\Gui\Field
+class Select extends Field
 {
 
     /**

diff --git a/Mezon/Gui/Field/TextField.php b/Mezon/Gui/Field/TextField.php
@@ -1,20 +1,22 @@
 <?php
 namespace Mezon\Gui\Field;
 
+use Mezon\Gui\Control;
+
 /**
  * Class TextField
  *
  * @package Field
  * @subpackage TextField
  * @author Dodonov A.A.
  * @version v.1.0 (2019/09/04)
- * @copyright Copyright (c) 2019, aeon.org
+ * @copyright Copyright (c) 2019, http://aeon.su
  */
 
 /**
  * Text field control
  */
-class TextField implements \Mezon\Gui\Control
+class TextField implements Control
 {
 
     /**

diff --git a/Mezon/Gui/Field/Textarea.php b/Mezon/Gui/Field/Textarea.php
@@ -1,20 +1,22 @@
 <?php
 namespace Mezon\Gui\Field;
 
+use Mezon\Gui\Field;
+
 /**
  * Class Textarea
  *
  * @package Field
  * @subpackage Textarea
  * @author Dodonov A.A.
  * @version v.1.0 (2019/09/04)
- * @copyright Copyright (c) 2019, aeon.org
+ * @copyright Copyright (c) 2019, http://aeon.su
  */
 
 /**
  * Text area control
  */
-class Textarea extends \Mezon\Gui\Field
+class Textarea extends Field
 {
 
     /**

diff --git a/Mezon/Gui/FieldsAlgorithms.php b/Mezon/Gui/FieldsAlgorithms.php
@@ -11,6 +11,7 @@
 use Mezon\Gui\Field\Textarea;
 use Mezon\Gui\FormBuilder\RowsField;
 use Mezon\Security\Security;
+use Mezon\FieldsSet;
 
 /**
  * Class FieldsAlgorithms
@@ -19,13 +20,13 @@
  * @subpackage FieldsAlgorithms
  * @author Dodonov A.A.
  * @version v.1.0 (2019/08/08)
- * @copyright Copyright (c) 2019, aeon.org
+ * @copyright Copyright (c) 2019, http://aeon.su
  */
 
 /**
  * Class constructs forms
  */
-class FieldsAlgorithms extends \Mezon\FieldsSet
+class FieldsAlgorithms extends FieldsSet
 {
 
     /**
@@ -276,7 +277,7 @@ public function fetchCustomField(array &$record, string $name): array
      * @param string $name
      *            name od the field
      */
-    public function fetchField(array &$record, string $name)
+    public function fetchField(array &$record, string $name):void
     {
         if (isset($_POST[$this->entityName . '-' . $name])) {
             $record[$name] = $this->getSecureValue($name, $_POST[$this->entityName . '-' . $name]);
@@ -304,10 +305,15 @@ protected function constructControl(array $field)
 
                 $field['session-id'] = $this->sessionId;
 
-                return new $className($field);
+                /** @var Control|Field $control */
+                $control = new $className($field);
+
+                return $control;
             } else {
                 return new InputText($field);
             }
+        } else {
+            throw (new \Exception('Can not define control\'s type', - 1));
         }
     }
 
@@ -322,7 +328,7 @@ protected function initObject(array $field)
     {
         if (isset($field['control']) && $field['control'] == 'textarea') {
             $control = new Textarea($field);
-        } elseif ($field['type'] == 'rows') {
+        } elseif (isset($field['type']) && $field['type'] == 'rows') {
             $control = new RowsField($field['type']['rows'], $this->entityName);
         } else {
             $control = $this->constructControl($field);

diff --git a/Mezon/Gui/FormBuilder/FormHeader.php b/Mezon/Gui/FormBuilder/FormHeader.php
@@ -1,20 +1,22 @@
 <?php
 namespace Mezon\Gui\FormBuilder;
 
+use Mezon\Gui\Field\TextField;
+
 /**
  * Class FormHeader
  *
  * @package Field
  * @subpackage FormHeader
  * @author Dodonov A.A.
  * @version v.1.0 (2019/09/04)
- * @copyright Copyright (c) 2019, aeon.org
+ * @copyright Copyright (c) 2019, http://aeon.su
  */
 
 /**
  * Form header control
  */
-class FormHeader extends \Mezon\Gui\Field\TextField
+class FormHeader extends TextField
 {
 
     /**

diff --git a/Mezon/Gui/FormBuilder/RowsField.php b/Mezon/Gui/FormBuilder/RowsField.php
@@ -11,7 +11,7 @@
  * @subpackage RowsField
  * @author Dodonov A.A.
  * @version v.1.0 (2019/09/22)
- * @copyright Copyright (c) 2019, aeon.org
+ * @copyright Copyright (c) 2019, http://aeon.su
  */
 
 /**