Merge pull request #90 from phpcr/importer-bug

trigger a bug we had in jackalope with parsing

Author: dbu

fixtures/general/base.xml

@@ -370,6 +370,9 @@
                 <sv:value>10</sv:value>
             </sv:property>
 
+            <!-- at the very end of the document on purpose -->
+            <sv:property sv:name="multi-empty" sv:type="String" sv:multiple="true"></sv:property>
+            <sv:property sv:name="multi-empty-selfclosing" sv:type="String" sv:multiple="true"/>
         </sv:node>
     </sv:node>
 

tests/11_Import/ImportRepositoryContentTest.php

@@ -60,15 +60,15 @@ private function doTestImportXMLSystem($connect, $session)
     }
 
     /**
-     * @expectedException PHPCR\PathNotFoundException
+     * @expectedException \PHPCR\PathNotFoundException
      */
     public function testImportXMLSystemPathNotFoundSession()
     {
         $session = $this->sharedFixture['session'];
         $session->importXML('/inexistent-path', __DIR__.'/../../fixtures/general/base.xml', ImportUUIDBehaviorInterface::IMPORT_UUID_COLLISION_THROW);
     }
     /**
-     * @expectedException PHPCR\PathNotFoundException
+     * @expectedException \PHPCR\PathNotFoundException
      */
     public function testImportXMLSystemPathNotFoundWorkspace()
     {
@@ -77,7 +77,7 @@ public function testImportXMLSystemPathNotFoundWorkspace()
     }
 
     /**
-     * @expectedException PHPCR\ItemExistsException
+     * @expectedException \PHPCR\ItemExistsException
      */
     public function testImportXMLSystemIdCollisionSession()
     {
@@ -87,7 +87,7 @@ public function testImportXMLSystemIdCollisionSession()
     }
 
     /**
-     * @expectedException PHPCR\ItemExistsException
+     * @expectedException \PHPCR\ItemExistsException
      */
     public function testImportXMLSystemIdCollisionWorkspace()
     {
@@ -98,7 +98,7 @@ public function testImportXMLSystemIdCollisionWorkspace()
 
     /**
      * try to replace the path to which we are importing atm
-     * @expectedException PHPCR\NodeType\ConstraintViolationException
+     * @expectedException \PHPCR\NodeType\ConstraintViolationException
      */
     public function testImportXMLUuidRemoveParentSession()
     {
@@ -109,7 +109,7 @@ public function testImportXMLUuidRemoveParentSession()
 
     /**
      * try to replace the path to which we are importing atm
-     * @expectedException PHPCR\NodeType\ConstraintViolationException
+     * @expectedException \PHPCR\NodeType\ConstraintViolationException
      */
     public function testImportXMLUuidRemoveParentWorkspace()
     {
@@ -316,7 +316,7 @@ public function testImportXMLUuidReplaceRoot()
     /**
      * Provoke an io error
      *
-     * @expectedException RuntimeException
+     * @expectedException \RuntimeException
      */
     public function testImportXMLNoFile()
     {