Fixing exceptions

Author: lstrojny

lib/IDS/Caching/FileCache.php

@@ -33,6 +33,8 @@
 
 namespace IDS\Caching;
 
+use IDS\Init;
+
 /**
  * File caching wrapper
  *
@@ -56,28 +58,28 @@ class FileCache implements CacheInterface
      *
      * @var string
      */
-    private $type = null;
+    private $type;
 
     /**
      * Cache configuration
      *
      * @var array
      */
-    private $config = null;
+    private $config;
 
     /**
      * Path to cache file
      *
      * @var string
      */
-    private $path = null;
+    private $path;
 
     /**
      * Holds an instance of this class
      *
      * @var object
      */
-    private static $cachingInstance = null;
+    private static $cachingInstance;
 
     /**
      * Constructor
@@ -88,7 +90,7 @@ class FileCache implements CacheInterface
      *
      * @return void
      */
-    public function __construct($type, $init)
+    public function __construct($type, Init $init)
     {
         $this->type   = $type;
         $this->config = $init->config['Caching'];

lib/IDS/Filter/Storage.php

@@ -201,22 +201,18 @@ public function getFilterFromXML()
              * If they aren't, parse the source file
              */
             if (!$filters) {
-                if (file_exists($this->source)) {
-                    if (LIBXML_VERSION >= 20621) {
-                        $filters = simplexml_load_file(
-                                $this->source,
-                                null,
-                                LIBXML_COMPACT
-                                );
-                    } else {
-                        $filters = simplexml_load_file($this->source);
-                    }
+
+                if (!file_exists($this->source)) {
+                    throw new \InvalidArgumentException(
+                        sprintf('Invalid config: %s doesn\'t exist.', $this->source)
+                    );
                 }
 
-                throw new \InvalidArgumentException(
-                    sprintf( 'Invalid config: %s doesn\'t exist. ',
-                             $this->source )
-                        );
+                if (LIBXML_VERSION >= 20621) {
+                    $filters = simplexml_load_file($this->source, null, LIBXML_COMPACT);
+                } else {
+                    $filters = simplexml_load_file($this->source);
+                }
             }
 
             /*
@@ -306,21 +302,16 @@ public function getFilterFromJson()
              * If they aren't, parse the source file
              */
             if (!$filters) {
-                if (file_exists($this->source)) {
-                    $filters = json_decode(file_get_contents($this->source));
+                if (!file_exists($this->source)) {
+                    throw new \InvalidArgumentException(
+                        sprintf('Invalid config: %s doesn\'t exist.', $this->source)
+                    );
                 }
-
-                throw new \RuntimeException(
-                        'JSON data could not be loaded.' .
-                        ' Make sure you specified the correct path.'
-                        );
+                $filters = json_decode(file_get_contents($this->source));
             }
 
             if (!$filters) {
-                throw new \RuntimeException(
-                        'JSON data could not be loaded.' .
-                        ' Make sure you specified the correct path. ' . $this->source
-                        );
+                throw new \RuntimeException('JSON data could not be loaded. Make sure you specified the correct path.');
             }
 
             /*

tests/IDS/Tests/CachingTest.php

@@ -49,6 +49,7 @@ public function testCachingFileSetCache()
     {
         $this->init->config['Caching']['caching'] = 'file';
         $this->init->config['Caching']['expiration_time'] = 0;
+        $this->init->config['Caching']['path'] = IDS_FILTER_CACHE_FILE;
         $cache = CacheFactory::factory($this->init, 'storage');
         $cache = $cache->setCache(array(1,2,3,4));
         $this->assertTrue($cache instanceof FileCache);
@@ -57,8 +58,8 @@ public function testCachingFileSetCache()
     public function testCachingFileGetCache()
     {
         $this->init->config['Caching']['caching'] = 'file';
-        $this->init->config['Caching']['path'] =  IDS_FILTER_CACHE_FILE;
         $this->init->config['Caching']['expiration_time'] = 0;
+        $this->init->config['Caching']['path'] = IDS_FILTER_CACHE_FILE;
         $cache = CacheFactory::factory($this->init, 'storage');
         $cache = $cache->setCache(array(1,2,3,4));
         $this->assertEquals($cache->getCache(), array(1,2,3,4));

tests/IDS/Tests/ExceptionTest.php

@@ -96,7 +96,7 @@ public function testInitConfigWrongPathException()
 
     public function testWrongXmlFilterPathException()
     {
-        $this->setExpectedException('RuntimeException');
+        $this->setExpectedException('InvalidArgumentException');
         $this->init->config['General']['filter_type'] = 'xml';
         $this->init->config['General']['filter_path'] = 'IDS/wrong_path';
         new Monitor(array('test', 'bla'), $this->init);