Merge pull request #2 from t3ran13/master

merge updates
GolosChain · May 17, 2018 · 1a10d2d · 1a10d2d
2 parents af08ccb + 5a328cc
commit 1a10d2d
Show file tree

Hide file tree

Showing 71 changed files with 1,399 additions and 997 deletions.
diff --git a/Commands/Broadcast/BroadcastTransactionCommand.php b/Commands/Broadcast/BroadcastTransactionCommand.php
diff --git a/Commands/Broadcast/BroadcastTransactionSynchronousCommand.php b/Commands/Broadcast/BroadcastTransactionSynchronousCommand.php
diff --git a/Commands/Broadcast/CommandAbstract.php b/Commands/Broadcast/CommandAbstract.php
diff --git a/Commands/Broadcast/CommandInterface.php b/Commands/Broadcast/CommandInterface.php
diff --git a/Commands/Login/CommandInterface.php → Commands/CommandInterface.php b/Commands/Login/CommandInterface.php → Commands/CommandInterface.php
@@ -1,9 +1,8 @@
 <?php
 
 
-namespace GolosPHP\Commands\Login;
+namespace GolosPHP\Commands;
 
-use GolosPHP\Commands\CommandQueryDataInterface;
 
 interface CommandInterface
 {

diff --git a/Commands/CommandQueryData.php b/Commands/CommandQueryData.php
@@ -97,12 +97,16 @@ protected function validate($value, $rule)
     {
         if ($rule === 'required') {
             return $value === null ? false : true;
+        } elseif ($rule === 'bool') {
+            return  $value !== null && is_bool($value);
         } elseif ($rule === 'array') {
             return $value !== null && is_array($value);
         } elseif ($rule === 'string') {
             return $value !== null && is_string($value);
         } elseif ($rule === 'integer') {
             return $value !== null && is_int($value);
+        } elseif ($rule === 'nullOrBool') {
+            return $value === null || is_bool($value);
         } elseif ($rule === 'nullOrArray') {
             return $value === null || is_array($value);
         } elseif ($rule === 'nullOrString') {