* Various CS fix and better exception handling

Author: jayzeng

lib/IDS/Event.php

@@ -105,7 +105,7 @@ class Event implements \Countable, \IteratorAggregate
      *
      * @return void
      */
-    public function __construct($name, $value, Array $filters)
+    public function __construct($name, $value, array $filters)
     {
         if (!is_scalar($name)) {
             throw new \InvalidArgumentException(

lib/IDS/Filter.php

@@ -108,22 +108,22 @@ public function __construct($id, $rule, $description, array $tags, $impact)
      * Matches given string against the filter rule the specific object of this
      * class represents
      *
-     * @param string $string the string to match
+     * @param string $input the string input to match
      *
      * @throws InvalidArgumentException if argument is no string
      * @return boolean
      */
-    public function match($string)
+    public function match($input)
     {
-        if (!is_string($string)) {
+        if (!is_string($input)) {
             throw new \InvalidArgumentException(
-                'Invalid argument. Expected a string, received ' . gettype($string)
+                'Invalid argument. Expected a string, received ' . gettype($input)
             );
         }
 
         return (bool) preg_match(
             '/' . $this->getRule() . '/ms',
-            strtolower($string)
+            strtolower($input)
         );
     }
 

lib/IDS/Filter/Storage.php

@@ -98,12 +98,10 @@ final public function __construct(Init $init)
     {
         if ($init->config) {
 
-            $caching = isset($init->config['Caching']['caching']) ?
-                $init->config['Caching']['caching'] : 'none';
+            $caching      = isset($init->config['Caching']['caching']) ? $init->config['Caching']['caching'] : 'none';
 
             $type         = $init->config['General']['filter_type'];
-            $this->source = $init->getBasePath()
-                . $init->config['General']['filter_path'];
+            $this->source = $init->getBasePath(). $init->config['General']['filter_path'];
 
             if ($caching && $caching !== 'none') {
                 $this->cacheSettings = $init->config['Caching'];
@@ -186,6 +184,7 @@ private function isCached()
      * If caching mode is enabled the result will be cached to increase
      * the performance.
      *
+     * @throws \InvalidArgumentException if source file doesn't exist
      * @throws \RuntimeException if problems with fetching the XML data occur
      * @return object    $this
      */
@@ -205,14 +204,19 @@ public function getFilterFromXML()
                 if (file_exists($this->source)) {
                     if (LIBXML_VERSION >= 20621) {
                         $filters = simplexml_load_file(
-                            $this->source,
-                            null,
-                            LIBXML_COMPACT
-                        );
+                                $this->source,
+                                null,
+                                LIBXML_COMPACT
+                                );
                     } else {
                         $filters = simplexml_load_file($this->source);
                     }
                 }
+
+                throw new \InvalidArgumentException(
+                    sprintf( 'Invalid config: %s doesn\'t exist. ',
+                             $this->source )
+                        );
             }
 
             /*
@@ -304,12 +308,12 @@ public function getFilterFromJson()
             if (!$filters) {
                 if (file_exists($this->source)) {
                     $filters = json_decode(file_get_contents($this->source));
-                } else {
-                    throw new \RuntimeException(
-                            'JSON data could not be loaded.' .
-                            ' Make sure you specified the correct path.'
-                            );
                 }
+
+                throw new \RuntimeException(
+                        'JSON data could not be loaded.' .
+                        ' Make sure you specified the correct path.'
+                        );
             }
 
             if (!$filters) {

lib/IDS/Monitor.php

@@ -225,7 +225,7 @@ public function __construct(array $request, Init $init, array $tags = null)
             );
         }
 
-        $this->report = new Report;
+        $this->report = new Report();
     }
 
     /**

lib/IDS/Report.php

@@ -76,7 +76,7 @@ class Report implements \Countable, \IteratorAggregate
      * Impact level
      *
      * The impact level is calculated on demand by adding the results of the
-     * event objects on IDS_Report->getImpact()
+     * event objects on IDS\Report->getImpact()
      *
      * @var integer
      */