Merge branch 'hotfix/4361' into develop

Close zendframework/zendframework#4361
Fixes zendframework/zendframework#3895

src/Ldif/Encoder.php

@@ -65,14 +65,17 @@ protected function _decode($string)
         $items = array();
         $item  = array();
         $last  = null;
+        $inComment = false;
         foreach (explode("\n", $string) as $line) {
             $line    = rtrim($line, "\x09\x0A\x0D\x00\x0B");
             $matches = array();
-            if (substr($line, 0, 1) === ' ' && $last !== null) {
+            if (substr($line, 0, 1) === ' ' && $last !== null && !$inComment) {
                 $last[2] .= substr($line, 1);
             } elseif (substr($line, 0, 1) === '#') {
+                $inComment = true;
                 continue;
-            } elseif (preg_match('/^([a-z0-9;-]+)(:[:<]?\s*)([^:<]*)$/i', $line, $matches)) {
+            } elseif (preg_match('/^([a-z0-9;-]+)(:[:<]?\s*)([^<]*)$/i', $line, $matches)) {
+                $inComment = false;
                 $name  = strtolower($matches[1]);
                 $type  = trim($matches[2]);
                 $value = $matches[3];

test/Ldif/SimpleDecoderTest.php

@@ -370,4 +370,42 @@ public function testRoundtripEncoding()
         $expected = array_merge(array('dn' => $node->getDnString()), $node->getData(false));
         $this->assertEquals($expected, $data);
     }
+
+    public function testDecodeSimpleSingleItemWithUri()
+    {
+        $data =
+"version: 1
+dn: cn=test3,ou=example,dc=cno
+objectclass: oc1
+memberurl: ldap:///(&(cn=myName)(uid=something))";
+        $expected = array(
+            'dn'          => 'cn=test3,ou=example,dc=cno',
+            'objectclass' => array('oc1'),
+            'memberurl'   => array('ldap:///(&(cn=myName)(uid=something))'));
+        $actual   = Ldif\Encoder::decode($data);
+        $this->assertEquals($expected, $actual);
+    }
+
+
+    public function testDecodeSimpleSingleItemWithMultilineComment()
+    {
+        $data =
+"version: 1
+dn: cn=test3,ou=example,dc=cno
+objectclass: oc1
+attr3:: w7bDpMO8
+
+# This is a comment
+ on multiple lines
+dn: cn=test4,ou=example,dc=cno
+objectclass: oc1
+attr3:: w7bDpMO8";
+
+        $expected = array(
+            'dn'          => 'cn=test3,ou=example,dc=cno',
+            'objectclass' => array('oc1'),
+            'attr3'       => array('öäü'));
+        $actual   = Ldif\Encoder::decode($data);
+        $this->assertEquals($expected, $actual[0]);
+    }
 }