Dont reset document when their is partial data

fabiang · Nov 19, 2014 · 9032ee7 · n10ty · Nov 20, 2014 · fabiang
1 parent c59f050
commit 9032ee7
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 2 deletions.
diff --git a/src/Client.php b/src/Client.php
@@ -85,6 +85,7 @@ public function __construct(Options $options, EventManagerInterface $eventManage
             $connection = $options->getConnection();
         } else {
             $connection = Socket::factory($options);
+            $options->setConnection($connection);
         }
         $this->options    = $options;
         $this->connection = $connection;

diff --git a/src/Stream/XMLStream.php b/src/Stream/XMLStream.php
@@ -183,15 +183,15 @@ protected function clearDocument($source)
         $documentElement = $this->document->documentElement;
 
         // collect xml declaration
-        if ('<?xml' === substr($source, 0, 5) || null === $documentElement) {
+        if ('<?xml' === substr($source, 0, 5)) {
             $this->reset();
 
             $matches = array();
             if (preg_match('/^<\?xml.*encoding=(\'|")([\w-]+)\1.*?>/i', $source, $matches)) {
                 $this->encoding = $matches[2];
                 xml_parser_set_option($this->parser, XML_OPTION_TARGET_ENCODING, $this->encoding);
             }
-        } else {
+        } elseif (null !== $documentElement) {
             // clean the document
             /* @var $childNode \DOMNode */
             while ($documentElement->hasChildNodes()) {

diff --git a/tests/src/Stream/XMLStreamTest.php b/tests/src/Stream/XMLStreamTest.php
@@ -352,4 +352,26 @@ public function testSetAndGetEventManager()
         $this->assertSame($eventManager, $this->object->setEventManager($eventManager)->getEventManager());
     }
 
+    /**
+     * @covers ::parse
+     * @uses Fabiang\Xmpp\Event\Event
+     * @uses Fabiang\Xmpp\Event\XMLEvent
+     * @uses Fabiang\Xmpp\Event\EventManager
+     * @uses Fabiang\Xmpp\Stream\XmlStream::__construct
+     * @uses Fabiang\Xmpp\Stream\XmlStream::clearDocument
+     * @uses Fabiang\Xmpp\Stream\XmlStream::startXml
+     * @uses Fabiang\Xmpp\Stream\XmlStream::endXml
+     * @uses Fabiang\Xmpp\Stream\XmlStream::createAttributeNodes
+     * @uses Fabiang\Xmpp\Stream\XmlStream::cacheEvent
+     * @uses Fabiang\Xmpp\Stream\XmlStream::trigger
+     * @uses Fabiang\Xmpp\Stream\XmlStream::reset
+     * @uses Fabiang\Xmpp\Stream\XmlStream::getEventManager
+     * @uses Fabiang\Xmpp\Stream\XmlStream::setEventManager
+     * @uses Fabiang\Xmpp\Stream\XmlStream::getEventObject
+     */
+    public function testParseCutted()
+    {
+        $this->assertInstanceOf('DOMDocument', $this->object->parse('<'));
+        $this->assertInstanceOf('DOMDocument', $this->object->parse('features xmlns="test"></features>'));
+    }
 }