fixed queries with dots #101

Author: oscarotero

src/Url.php

@@ -443,18 +443,42 @@ protected function parseUrl($url)
         $this->info = parse_url($url);
 
         if (isset($this->info['query'])) {
-            parse_str($this->info['query'], $this->info['query']);
+            $queryString = preg_replace_callback('/(^|(?<=&))[^=[&]+/', function ($key) {
+                return bin2hex(urldecode($key[0]));
+            }, $this->info['query']);
 
-            array_walk_recursive($this->info['query'], function (&$value) {
-                $value = urldecode($value);
-            });
+            parse_str($queryString, $query);
+
+            $this->info['query'] = self::fixQuery($query);
         }
 
         if (isset($this->info['path'])) {
             $this->setPath($this->info['path']);
         }
     }
 
+    /**
+     * Fix query's key and values.
+     * 
+     * @param array $query
+     * 
+     * @return array
+     */
+    private static function fixQuery(array $query)
+    {
+        $fixed = [];
+
+        foreach ($query as $key => $value) {
+            if (is_array($value)) {
+                $fixed[hex2bin($key)] = self::fixQuery($value);
+            } else {
+                $fixed[hex2bin($key)] = urldecode($value);
+            }
+        }
+
+        return $fixed;
+    }
+
     /**
      * Return an absolute url based in a relative.
      *

tests/MovimTest.php

@@ -0,0 +1,16 @@
+<?php
+
+class MovimTest extends TestCaseBase
+{
+    public function testOne()
+    {
+        $this->assertEmbed(
+            'https://nl.movim.eu/?node/blabla.movim.eu/random/1fb06a3cc05c4490bf659c227b39a9aa',
+            [
+                'title' => 'Paris Attacks, cat not giving a fuck',
+                'description' => 'Can you find the cat?',
+                'image' => 'http://hugelolcdn.com/i700/361973.jpg',
+            ]
+        );
+    }
+}