Fix @secure and @transactional annotations wrongly requiring attribute

brick · Mar 24, 2019 · 01bf66f · 01bf66f
1 parent 3056bb4
commit 01bf66f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/Controller/Annotation/Secure.php b/src/Controller/Annotation/Secure.php
@@ -25,7 +25,7 @@
 final class Secure extends AbstractAnnotation
 {
     /**
-     * @var string
+     * @var string|null
      */
     public $hsts;
 
@@ -34,6 +34,6 @@ final class Secure extends AbstractAnnotation
      */
     public function __construct(array $values)
     {
-        $this->hsts = $this->getRequiredString($values, 'hsts', true);
+        $this->hsts = $this->getOptionalString($values, 'hsts', true);
     }
 }
diff --git a/src/Controller/Annotation/Transactional.php b/src/Controller/Annotation/Transactional.php
@@ -46,13 +46,15 @@ final class Transactional extends AbstractAnnotation
      */
     public function __construct(array $values)
     {
-        $isolationLevel = $this->getRequiredString($values, 'isolationLevel', true);
+        $isolationLevel = $this->getOptionalString($values, 'isolationLevel', true);
 
-        if (! isset(self::ISOLATION_LEVELS[$isolationLevel])) {
-            throw new \LogicException('Invalid transaction isolation level: ' . $isolationLevel);
-        }
+        if ($isolationLevel !== null) {
+            if (! isset(self::ISOLATION_LEVELS[$isolationLevel])) {
+                throw new \LogicException('Invalid transaction isolation level: ' . $isolationLevel);
+            }
 
-        $this->isolationLevel = self::ISOLATION_LEVELS[$isolationLevel];
+            $this->isolationLevel = self::ISOLATION_LEVELS[$isolationLevel];
+        }
     }
 
     /**