Some miscellaneous fixes to interface adherance

padraic · padraic · commit f114b3eaad09 · 2013-03-16T13:04:45.000Z
diff --git a/library/SecurityMultiTool/Csrf/Provider.php b/library/SecurityMultiTool/Csrf/Provider.php
@@ -63,7 +63,7 @@ public function isValid($token, $tokenName = null)
         try {
             $array = $this->retrieveTokenFromSession($tokenName);
         } catch (Exception\RuntimeException $e) {
-            return false;
+            return false; //TODO: Set lastException for debug recall
         }
         if (empty($array) || !is_array($array) || !isset($array['token'])
         || !isset($array['expire'])) {
diff --git a/library/SecurityMultiTool/Http/Headers.php b/library/SecurityMultiTool/Http/Headers.php
@@ -3,8 +3,10 @@
 namespace SecurityMultiTool\Http;
 
 use SecurityMultiTool\Http\Header;
+use SecurityMultiTool\Common;
+use SecurityMultiTool\Exception;
 
-class Headers implements \Countable
+class Headers implements \Countable, Common\OptionsInterface
 {
 
     protected $options = array();
diff --git a/library/SecurityMultiTool/Markdown/Parser.php b/library/SecurityMultiTool/Markdown/Parser.php
@@ -7,7 +7,7 @@
 use SecurityMultiTool\Exception;
 use SecurityMultiTool\Common;
 
-class Parser extends Common\AbstractOptions implements Common\OptionsInterface
+class Parser implements Common\OptionsInterface
 {
 
     protected $parser = null;
@@ -19,7 +19,7 @@ class Parser extends Common\AbstractOptions implements Common\OptionsInterface
     public function __construct($cachePath, array $options = null)
     {
         $this->sanitizer = new Sanitizer($cachePath, $options);
-        $this->sanitizer->setOption('HTML.Allowed', $this->filter);
+        //$this->sanitizer->setOption('HTML.Allowed', $this->filter);
         $this->parser = new MarkdownParser;
     }
 
@@ -47,6 +47,13 @@ public function getFilterDefinition()
         return $this->filter;
     }
 
+    public function setOptions(array $options)
+    {
+        foreach ($options as $key => $value) {
+            $this->setOption($key, $value);
+        }
+    }
+
     public function setOption($key, $value)
     {
         $this->sanitizer->setOption($key, $value);

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public function isValid($token, $tokenName = null)`
`63`	`63`	`try {`
`64`	`64`	`$array = $this->retrieveTokenFromSession($tokenName);`
`65`	`65`	`} catch (Exception\RuntimeException $e) {`
`66`		`- return false;`
	`66`	`+ return false; //TODO: Set lastException for debug recall`
`67`	`67`	`}`
`68`	`68`	`if (empty($array) \|\| !is_array($array) \|\| !isset($array['token'])`
`69`	`69`	`\|\| !isset($array['expire'])) {`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,10 @@`
`3`	`3`	`namespace SecurityMultiTool\Http;`
`4`	`4`
`5`	`5`	`use SecurityMultiTool\Http\Header;`
	`6`	`+use SecurityMultiTool\Common;`
	`7`	`+use SecurityMultiTool\Exception;`
`6`	`8`
`7`		`-class Headers implements \Countable`
	`9`	`+class Headers implements \Countable, Common\OptionsInterface`
`8`	`10`	`{`
`9`	`11`
`10`	`12`	`protected $options = array();`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`use SecurityMultiTool\Exception;`
`8`	`8`	`use SecurityMultiTool\Common;`
`9`	`9`
`10`		`-class Parser extends Common\AbstractOptions implements Common\OptionsInterface`
	`10`	`+class Parser implements Common\OptionsInterface`
`11`	`11`	`{`
`12`	`12`
`13`	`13`	`protected $parser = null;`
`@@ -19,7 +19,7 @@ class Parser extends Common\AbstractOptions implements Common\OptionsInterface`
`19`	`19`	`public function __construct($cachePath, array $options = null)`
`20`	`20`	`{`
`21`	`21`	`$this->sanitizer = new Sanitizer($cachePath, $options);`
`22`		`- $this->sanitizer->setOption('HTML.Allowed', $this->filter);`
	`22`	`+ //$this->sanitizer->setOption('HTML.Allowed', $this->filter);`
`23`	`23`	`$this->parser = new MarkdownParser;`
`24`	`24`	`}`
`25`	`25`
`@@ -47,6 +47,13 @@ public function getFilterDefinition()`
`47`	`47`	`return $this->filter;`
`48`	`48`	`}`
`49`	`49`
	`50`	`+ public function setOptions(array $options)`
	`51`	`+ {`
	`52`	`+ foreach ($options as $key => $value) {`
	`53`	`+ $this->setOption($key, $value);`
	`54`	`+ }`
	`55`	`+ }`
	`56`	`+`
`50`	`57`	`public function setOption($key, $value)`
`51`	`58`	`{`
`52`	`59`	`$this->sanitizer->setOption($key, $value);`