Merge pull request #191 from phpcr/fix-stream-handling

fix stream assertions and avoid phpunit warnings

Author: dbu

tests/NodeTypeManagement/NodeTypeBaseCase.php

@@ -148,6 +148,8 @@ public function testValidateCustomNodeType()
 
         $node->setProperty('phpcr:class', ['x', 'y']);
         $this->session->save();
+
+        $this->addToAssertionCount(1);
     }
 
     public function testRegisterNodeTypesNoUpdate()

tests/Query/CharacterTest.php

@@ -120,6 +120,8 @@ public function testQueryWithColon()
             ',
             QueryInterface::JCR_SQL2
         )->execute();
+
+        $this->addToAssertionCount(1);
     }
 
     public function testQueryWithAmpersand()

tests/Writing/MixinReferenceableTest.php

@@ -219,5 +219,7 @@ public function testCreateReferenceInSingleTransaction()
         $child1->setProperty('someref', $child2, PropertyType::REFERENCE);
 
         $this->session->save();
+
+        $this->addToAssertionCount(1);
     }
 }

tests/Writing/SetPropertyTypesTest.php

@@ -82,7 +82,8 @@ public function testCreateValueBinaryFromStream()
         $oldSession = $this->session;
         $this->saveAndRenewSession(); // either this
         $oldSession->logout(); // or this should close the stream
-        $this->assertNotInternalType('resource', $stream, 'The responsibility for the stream goes into phpcr who must close it');
+        // phpunit assertNotInternalType type still considers the closed stream a resource
+        $this->assertFalse(\is_resource($stream), 'The responsibility for the stream goes into phpcr who must close it');
 
         $bin = $this->session->getProperty('/tests_general_base/numberPropertyNode/jcr:content/newBinaryStream');
         $this->assertEquals(PropertyType::BINARY, $bin->getType());
@@ -102,7 +103,8 @@ public function testCreateValueBinaryFromStreamAndRead()
         $oldSession = $this->session;
         $this->saveAndRenewSession(); // either this
         $oldSession->logout(); // or this should close the stream
-        $this->assertNotInternalType('resource', $stream, 'The responsibility for the stream goes into phpcr who must close it');
+        // phpunit assertNotInternalType type still considers the closed stream a resource
+        $this->assertFalse(\is_resource($stream), 'The responsibility for the stream goes into phpcr who must close it');
 
         $bin = $this->session->getProperty('/tests_general_base/numberPropertyNode/jcr:content/newBinaryStream');
         $this->assertEquals(PropertyType::BINARY, $bin->getType());