replaced remaining nodeUtils variables with rdfHelpers

SaftIng · May 8, 2017 · 7670285 · 7670285
1 parent 5c6c204
commit 7670285
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/NQuadsParser.php b/NQuadsParser.php
@@ -35,7 +35,7 @@ public function __construct(
         RdfHelpers $rdfHelpers
     ) {
         $this->nodeFactory = $nodeFactory;
-        $this->nodeUtils = $rdfHelpers;
+        $this->rdfHelpers = $rdfHelpers;
         $this->statementFactory = $statementFactory;
         $this->statementIteratorFactory = $statementIteratorFactory;
     }
@@ -65,19 +65,19 @@ public function getCurrentPrefixList()
     public function parseStringToIterator($inputString, $baseUri = null)
     {
         // check $baseUri
-        if (null !== $baseUri && false == $this->nodeUtils->simpleCheckURI($baseUri)) {
+        if (null !== $baseUri && false == $this->rdfHelpers->simpleCheckURI($baseUri)) {
             throw new \Exception('No base URI support for now. To continue, just leave $baseUri = null.');
         }
 
         $statements = array();
 
         $pattern = '/' .
-            $this->nodeUtils->getRegexStringForNodeRecognition(true) .'\s*|\t*'.
-            $this->nodeUtils->getRegexStringForNodeRecognition() .'\s*|\t*'.
-            $this->nodeUtils->getRegexStringForNodeRecognition(
+            $this->rdfHelpers->getRegexStringForNodeRecognition(true) .'\s*|\t*'.
+            $this->rdfHelpers->getRegexStringForNodeRecognition() .'\s*|\t*'.
+            $this->rdfHelpers->getRegexStringForNodeRecognition(
                 true, true, true, true, true, true
             ) . '\s*|\t*'.
-            $this->nodeUtils->getRegexStringForNodeRecognition() .
+            $this->rdfHelpers->getRegexStringForNodeRecognition() .
             '/is';
 
         foreach (explode(PHP_EOL, $inputString) as $line) {

diff --git a/RDFXMLParser.php b/RDFXMLParser.php
@@ -38,7 +38,7 @@ public function __construct(
         RdfHelpers $rdfHelpers
     ) {
         $this->nodeFactory = $nodeFactory;
-        $this->nodeUtils = $rdfHelpers;
+        $this->rdfHelpers = $rdfHelpers;
         $this->statementFactory = $statementFactory;
         $this->statementIteratorFactory = $statementIteratorFactory;
     }
@@ -68,7 +68,7 @@ public function getCurrentPrefixList()
     public function parseStringToIterator($inputString, $baseUri = null)
     {
         // check $baseUri
-        if (null !== $baseUri && false == $this->nodeUtils->simpleCheckURI($baseUri)) {
+        if (null !== $baseUri && false == $this->rdfHelpers->simpleCheckURI($baseUri)) {
             throw new \Exception('No base URI support for now. To continue, just leave $baseUri = null.');
         }
 
@@ -125,7 +125,7 @@ public function parseStringToIterator($inputString, $baseUri = null)
 
                             // object is URI
                             if (isset($objectValue['attributes'][$rdfResourceString])
-                                && $this->nodeUtils->simpleCheckURI(
+                                && $this->rdfHelpers->simpleCheckURI(
                                     $objectValue['attributes'][$rdfResourceString])
                                 ) {
 
@@ -134,7 +134,7 @@ public function parseStringToIterator($inputString, $baseUri = null)
                                 );
 
                             // object is blank node
-                            } elseif ($this->nodeUtils->simpleCheckBlankNodeId($objectValue['value'])) {
+                            } elseif ($this->rdfHelpers->simpleCheckBlankNodeId($objectValue['value'])) {
                                 $object = $this->nodeFactory->createBlankNode($objectValue['value']);
 
                             // guess object is of type literal