Remove obsolete type check

easyrdf · Oct 30, 2015 · 5447b78 · 5447b78
1 parent 0bb2df5
commit 5447b78
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 18 deletions.
diff --git a/lib/Serialiser.php b/lib/Serialiser.php
@@ -61,14 +61,8 @@ protected function addPrefix($qname)
      * Check and cleanup parameters passed to serialise() method
      * @ignore
      */
-    protected function checkSerialiseParams(&$graph, &$format)
+    protected function checkSerialiseParams(&$format)
     {
-        if (is_null($graph) or !is_object($graph) or !($graph instanceof Graph)) {
-            throw new \InvalidArgumentException(
-                '$graph should be an EasyRdf\Graph object and cannot be null'
-            );
-        }
-
         if (is_null($format) or $format == '') {
             throw new \InvalidArgumentException(
                 "\$format cannot be null or empty"

diff --git a/lib/Serialiser/Arc.php b/lib/Serialiser/Arc.php
@@ -78,7 +78,7 @@ public function __construct()
      */
     public function serialise(Graph $graph, $format, array $options = array())
     {
-        parent::checkSerialiseParams($graph, $format);
+        parent::checkSerialiseParams($format);
 
         if (array_key_exists($format, self::$supportedTypes)) {
             $className = self::$supportedTypes[$format];

diff --git a/lib/Serialiser/GraphViz.php b/lib/Serialiser/GraphViz.php
@@ -379,7 +379,7 @@ public function renderImage(Graph $graph, $format = 'png')
      */
     public function serialise(Graph $graph, $format, array $options = array())
     {
-        parent::checkSerialiseParams($graph, $format);
+        parent::checkSerialiseParams($format);
 
         switch($format) {
             case 'dot':

diff --git a/lib/Serialiser/Json.php b/lib/Serialiser/Json.php
@@ -63,7 +63,7 @@ class Json extends RdfPhp
      */
     public function serialise(Graph $graph, $format, array $options = array())
     {
-        parent::checkSerialiseParams($graph, $format);
+        parent::checkSerialiseParams($format);
 
         if ($format != 'json') {
             throw new Exception(

diff --git a/lib/Serialiser/JsonLd.php b/lib/Serialiser/JsonLd.php
@@ -70,7 +70,7 @@ public function __construct()
      */
     public function serialise(Graph $graph, $format, array $options = array())
     {
-        parent::checkSerialiseParams($graph, $format);
+        parent::checkSerialiseParams($format);
 
         if ($format != 'jsonld') {
             throw new Exception(__CLASS__.' does not support: '.$format);

diff --git a/lib/Serialiser/Ntriples.php b/lib/Serialiser/Ntriples.php
@@ -205,7 +205,7 @@ public function serialiseValue($value)
      */
     public function serialise(Graph $graph, $format, array $options = array())
     {
-        parent::checkSerialiseParams($graph, $format);
+        parent::checkSerialiseParams($format);
 
         if ($format == 'ntriples') {
             $nt = '';

diff --git a/lib/Serialiser/Rapper.php b/lib/Serialiser/Rapper.php
@@ -85,7 +85,7 @@ public function __construct($rapperCmd = 'rapper')
      */
     public function serialise(Graph $graph, $format, array $options = array())
     {
-        parent::checkSerialiseParams($graph, $format);
+        parent::checkSerialiseParams($format);
 
         $ntriples = parent::serialise($graph, 'ntriples');
 

diff --git a/lib/Serialiser/RdfPhp.php b/lib/Serialiser/RdfPhp.php
@@ -64,7 +64,7 @@ class RdfPhp extends Serialiser
      */
     public function serialise(Graph $graph, $format, array $options = array())
     {
-        parent::checkSerialiseParams($graph, $format);
+        parent::checkSerialiseParams($format);
 
         if ($format != 'php') {
             throw new Exception(

diff --git a/lib/Serialiser/RdfXml.php b/lib/Serialiser/RdfXml.php
@@ -205,7 +205,7 @@ protected function rdfxmlResource($res, $showNodeId, $depth = 1)
      */
     public function serialise(Graph $graph, $format, array $options = array())
     {
-        parent::checkSerialiseParams($graph, $format);
+        parent::checkSerialiseParams($format);
 
         if ($format != 'rdfxml') {
             throw new Exception(

diff --git a/lib/Serialiser/Turtle.php b/lib/Serialiser/Turtle.php
@@ -365,7 +365,7 @@ protected function serialiseSubjects(Graph $graph, $filterType)
      */
     public function serialise(Graph $graph, $format, array $options = array())
     {
-        parent::checkSerialiseParams($graph, $format);
+        parent::checkSerialiseParams($format);
 
         if ($format != 'turtle' and $format != 'n3') {
             throw new Exception(

diff --git a/test/EasyRdf/Serialiser/NtriplesArray.php b/test/EasyRdf/Serialiser/NtriplesArray.php
@@ -80,7 +80,7 @@ protected function compareTriples($a, $b)
      */
     public function serialise(Graph $graph, $format, array $options = array())
     {
-        parent::checkSerialiseParams($graph, $format);
+        parent::checkSerialiseParams($format);
 
         $triples = array();
         foreach ($graph->toRdfPhp() as $resource => $properties) {

diff --git a/test/EasyRdf/SerialiserTest.php b/test/EasyRdf/SerialiserTest.php
@@ -42,7 +42,7 @@ class MockSerialiser extends Serialiser
 {
     public function serialise(Graph $graph, $format, array $options = array())
     {
-        parent::checkSerialiseParams($graph, $format);
+        parent::checkSerialiseParams($format);
         // Serialising goes here
         return true;
     }