Ability to define custom Graph class in TypeMapper. closes #380

lib/GraphStore.php

@@ -86,14 +86,16 @@ public function getUri()
      */
     public function get($uriRef)
     {
+        $graphClass = TypeMapper::getDefaultGraphClass();
+
         if ($uriRef === self::DEFAULT_GRAPH) {
             $dataUrl = $this->urlForGraph(self::DEFAULT_GRAPH);
-            $graph = new Graph();
+            $graph = new $graphClass();
         } else {
             $graphUri = $this->parsedUri->resolve($uriRef)->toString();
             $dataUrl = $this->urlForGraph($graphUri);
 
-            $graph = new Graph($graphUri);
+            $graph = new $graphClass($graphUri);
         }
 
         $graph->load($dataUrl);

lib/Sparql/Client.php

@@ -40,6 +40,7 @@
 use EasyRdf\Graph;
 use EasyRdf\Http;
 use EasyRdf\RdfNamespace;
+use EasyRdf\TypeMapper;
 use EasyRdf\Utils;
 
 /**
@@ -392,7 +393,8 @@ protected function parseResponseToQuery($response)
             $result = new Result($response->getBody(), $content_type);
             return $result;
         } else {
-            $result = new Graph($this->queryUri, $response->getBody(), $content_type);
+            $graphClass = TypeMapper::getDefaultGraphClass();
+            $result = new $graphClass($this->queryUri, $response->getBody(), $content_type);
             return $result;
         }
     }

lib/TypeMapper.php

@@ -51,6 +51,9 @@ class TypeMapper
     /** Default resource class */
     private static $defaultResourceClass = 'EasyRdf\Resource';
 
+    /** Default graph class */
+    private static $defaultGraphClass = 'EasyRdf\Graph';
+
     /** Get the registered class for an RDF type
      *
      * If a type is not registered, then this method will return null.
@@ -162,6 +165,46 @@ public static function setDefaultResourceClass($class)
 
         return self::$defaultResourceClass = $class;
     }
+
+        /**
+     * @return string           The default Graph class
+     */
+    public static function getDefaultGraphClass()
+    {
+        return self::$defaultGraphClass;
+    }
+
+    /**
+     * Sets the default graph class
+     *
+     * @param  string $class The graph full class name (e.g. \MyCompany\Graph)
+     *
+     * @throws \InvalidArgumentException
+     * @return string           The default Graph class
+     */
+    public static function setDefaultGraphClass($class)
+    {
+        if (!is_string($class) or $class == null or $class == '') {
+            throw new \InvalidArgumentException(
+                "\$class should be a string and cannot be null or empty"
+            );
+        }
+
+        if (!class_exists($class)) {
+            throw new \InvalidArgumentException(
+                "Given class should be an existing class"
+            );
+        }
+
+        $ancestors = class_parents($class);
+        if (($class != 'EasyRdf\Graph') && (empty($ancestors) || !in_array('EasyRdf\Graph', $ancestors))) {
+            throw new \InvalidArgumentException(
+                "Given class should have EasyRdf\\Graph as an ancestor"
+            );
+        }
+
+        return self::$defaultGraphClass = $class;
+    }
 }
 
 

test/EasyRdf/TypeMapperTest.php

@@ -46,6 +46,13 @@ public function myMethod()
     }
 }
 
+class MyGraphClass extends Graph
+{
+    public function myMethod()
+    {
+        return true;
+    }
+}
 
 class TypeMapperTest extends TestCase
 {
@@ -290,4 +297,70 @@ public function testInstantiate()
         $this->assertClass('EasyRdf\MyTypeClass', $joesFoaf);
         $this->assertTrue($joesFoaf->myMethod());
     }
+
+    public function testSetNonExtendingDefaultGraphClass()
+    {
+        $this->setExpectedException(
+            'InvalidArgumentException',
+            'Given class should have EasyRdf\Graph as an ancestor'
+        );
+        TypeMapper::setDefaultGraphClass('EasyRdf\Resource');
+    }
+
+    public function testSetBaseDefaultGraphClass()
+    {
+        TypeMapper::setDefaultGraphClass('EasyRdf\Graph');
+        $this->assertEquals('EasyRdf\Graph', TypeMapper::getDefaultGraphClass());
+    }
+
+    public function testSetDefaultGraphClass()
+    {
+        $this->setExpectedException(
+            'InvalidArgumentException',
+            'Given class should be an existing class'
+        );
+        TypeMapper::setDefaultGraphClass('FooBar\Graph');
+    }
+
+    public function testSetDefaultGraphClassEmptyString()
+    {
+        $this->setExpectedException(
+            'InvalidArgumentException',
+            '$class should be a string and cannot be null or empty'
+        );
+        TypeMapper::setDefaultGraphClass('');
+    }
+
+    public function testSetDefaultGraphClassNull()
+    {
+        $this->setExpectedException(
+            'InvalidArgumentException',
+            '$class should be a string and cannot be null or empty'
+        );
+        TypeMapper::setDefaultGraphClass(null);
+    }
+
+    public function testSetDefaultGraphClassNonString()
+    {
+        $this->setExpectedException(
+            'InvalidArgumentException',
+            '$class should be a string and cannot be null or empty'
+        );
+        TypeMapper::setDefaultGraphClass(array());
+    }
+
+    public function testGraphInstantiate()
+    {
+        TypeMapper::setDefaultGraphClass('EasyRdf\MyGraphClass');
+        $graphClass = TypeMapper::getDefaultGraphClass();
+        $data = readFixture('foaf.json');
+        $graph = new $graphClass(
+            'http://www.example.com/joe/foaf.rdf',
+            $data,
+            'json'
+        );
+        $joe = $graph->resource('http://www.example.com/joe#me');
+        $this->assertClass('EasyRdf\MyGraphClass', $joe->getGraph());
+        $this->assertTrue($joe->getGraph()->myMethod());
+    }
 }