Merge pull request #44 from editor-js/choose-allowed-null

Choose allowed null

Author: khaydarov

EditorJS/BlockHandler.php

@@ -136,6 +136,14 @@ private function validate($rules, $blockData)
                 continue;
             }
 
+            /**
+             * Do not check element type if it is not required and null
+             */
+            if (isset($rule['required']) && $rule['required'] === false &&
+                isset($rule['allow_null']) && $rule['allow_null'] === true && $value === null) {
+                continue;
+            }
+
             /**
              * Validate element types
              */

tests/TypeTest.php

@@ -11,6 +11,7 @@
 class TypeTest extends TestCase
 {
     const CONFIGURATION_FILE = TESTS_DIR . "/samples/type-test-config.json";
+    const CONFIGURATION_FILE_REQUIRED = TESTS_DIR . "/samples/type-test-config-required.json";
 
     /**
      * Sample configuration
@@ -66,4 +67,28 @@ public function testStringFailed()
 
         $this->assertException($callable, EditorJSException::class, null, 'Option \'string_test\' with value `17` must be string');
     }
+
+    public function testAllowedNullNotRequired()
+    {
+        new EditorJS('{"blocks":[{"type":"test","data":{"int_test": null}}]}', $this->configuration);
+    }
+
+    public function testDisallowedNullNotRequired()
+    {
+        $callable = function () {
+            new EditorJS('{"blocks":[{"type":"test","data":{"string_test": null}}]}', $this->configuration);
+        };
+
+        $this->assertException($callable, EditorJSException::class, null, 'string_test\' with value `` must be string');
+    }
+
+    public function testNullRequired()
+    {
+        new EditorJS('{"blocks":[{"type":"test","data":{"string_test": "qwe"}}]}', file_get_contents(TypeTest::CONFIGURATION_FILE_REQUIRED));
+
+        $callable = function () {
+            new EditorJS('{"blocks":[{"type":"test","data":{"string_test": null}}]}', file_get_contents(TypeTest::CONFIGURATION_FILE_REQUIRED));
+        };
+        $this->assertException($callable, EditorJSException::class, null, 'Not found required param `string_test`');
+    }
 }

tests/samples/type-test-config-required.json

@@ -0,0 +1,11 @@
+{
+  "tools": {
+    "test": {
+      "string_test": {
+        "type": "string",
+        "required": true,
+        "allow_null": true
+      }
+    }
+  }
+}

tests/samples/type-test-config.json

@@ -7,11 +7,13 @@
       },
       "int_test": {
         "type": "integer",
-        "required": false
+        "required": false,
+        "allow_null": true
       },
       "string_test": {
         "type": "string",
-        "required": false
+        "required": false,
+        "allow_null": false
       }
     }
   }