Merge pull request #23 from ray-di/to_string

__toString exception handling

Author: koriym

src/AbstractForm.php

@@ -14,6 +14,7 @@
 use Aura\Input\BuilderInterface;
 use Aura\Input\Fieldset;
 use Ray\WebFormModule\Exception\CsrfViolationException;
+use Ray\WebFormModule\Exception\LogicException;
 
 abstract class AbstractForm extends Fieldset implements FormInterface
 {
@@ -47,6 +48,26 @@ public function __clone()
         $this->init();
     }
 
+    /**
+     * Return form markup string
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        try {
+            if (! $this instanceof ToStringInterface) {
+                throw new LogicException(ToStringInterface::class . ' is not implemented');
+            }
+
+            return $this->toString();
+        } catch (\Exception $e) {
+            trigger_error($e->getMessage() . PHP_EOL . $e->getTraceAsString(), E_USER_ERROR);
+
+            return '';
+        }
+    }
+
     /**
      * @param BuilderInterface     $builder
      * @param FilterFactory        $filterFactory
@@ -140,9 +161,8 @@ public function apply(array $data)
             throw new CsrfViolationException;
         }
         $this->fill($data);
-        $isValid = $this->filter->apply($data);
 
-        return $isValid;
+        return $this->filter->apply($data);
     }
 
     /**
@@ -152,9 +172,7 @@ public function apply(array $data)
      */
     public function getFailureMessages()
     {
-        $messages = $this->filter->getFailures()->getMessages();
-
-        return $messages;
+        return $this->filter->getFailures()->getMessages();
     }
 
     /**

src/ToStringInterface.php

@@ -0,0 +1,15 @@
+<?php
+/**
+ * This file is part of the Ray.WebFormModule package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
+namespace Ray\WebFormModule;
+
+/**
+ * Return form markup string
+ */
+interface ToStringInterface
+{
+    public function toString() : string;
+}

src/VndErrorHandler.php

@@ -32,9 +32,8 @@ public function handle(AbstractValidation $formValidation, MethodInvocation $inv
         unset($formValidation);
         $vndError = $this->reader->getMethodAnnotation($invocation->getMethod(), VndError::class);
         $error = new FormValidationError($this->makeVndError($form, $vndError));
-        $e = new ValidationException('Validation failed.', 400, null, $error);
 
-        throw $e;
+        throw new ValidationException('Validation failed.', 400, null, $error);
     }
 
     private function makeVndError(AbstractForm $form, VndError $vndError = null)

tests/AbstractAuraFormTest.php

@@ -60,4 +60,17 @@ public function tesetInputDataReamainedOnValidationFailure($html)
         $expected = '<input id="name" type="text" name="name" value="@invalid@" />';
         $this->assertContains($expected, $html);
     }
+
+    public function testNotToStringImplemented()
+    {
+        $errNo = $errStr = '';
+        set_error_handler(function (int $no, string $str) use (&$errNo, &$errStr) {
+            $errNo = $no;
+            $errStr = $str;
+        });
+        $form = new FakeErrorForm;
+        (string) $form;
+        $this->assertSame(256, $errNo);
+        restore_error_handler();
+    }
 }

tests/Fake/FakeErrorForm.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Ray\WebFormModule;
+
+class FakeErrorForm extends AbstractForm
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function init()
+    {
+    }
+}

tests/Fake/FakeNameForm.php

@@ -4,7 +4,7 @@
 
 use Aura\Html\Helper\Tag;
 
-class FakeNameForm extends AbstractForm
+class FakeNameForm extends AbstractForm implements ToStringInterface
 {
     /**
      * {@inheritdoc}
@@ -41,7 +41,7 @@ public function submit()
     /**
      * {@inheritdoc}
      */
-    public function __toString()
+    public function toString() : string
     {
         $form = $this->form([
             'method' => 'post',