Merge pull request #73 from zobzn/php7

Fix unit tests in PHP 7 This addresses #50
lanthaler · Aug 25, 2016 · 8eaca98 · 8eaca98
2 parents c4af252 + 190ade9
commit 8eaca98
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,7 +12,6 @@ matrix:
   fast_finish: true
   allow_failures:
     - php: hhvm
-    - php: 7.0
 
 before_script:
   - composer install
diff --git a/Processor.php b/Processor.php
@@ -1262,13 +1262,16 @@ private function compactIri($iri, $activectx, $inversectx, $value = null, $vocab
         foreach ($inversectx as $termIri => $def) {
             $termIriLen = strlen($termIri);
 
-            if (isset($def['term']) && (0 === strncmp($iri, $termIri, $termIriLen)) &&
-                (false !== ($compactIri = substr($iri, $termIriLen)))) {
-                $compactIri = $def['term'] . ':' . $compactIri;
+            if (isset($def['term']) && (0 === strncmp($iri, $termIri, $termIriLen))) {
+                $compactIri = substr($iri, $termIriLen);
 
-                if (false === isset($activectx[$compactIri]) ||
-                    ((false === $vocabRelative) && ($iri === $activectx[$compactIri]['@id']))) {
-                    return $compactIri;
+                if (false !== $compactIri && '' !== $compactIri) {
+                    $compactIri = $def['term'] . ':' . $compactIri;
+
+                    if (false === isset($activectx[$compactIri]) ||
+                        ((false === $vocabRelative) && ($iri === $activectx[$compactIri]['@id']))) {
+                        return $compactIri;
+                    }
                 }
             }
         }