replaced bin2hex for base64_encode #101

Author: oscarotero

src/Url.php

@@ -444,7 +444,7 @@ protected function parseUrl($url)
 
         if (isset($this->info['query'])) {
             $queryString = preg_replace_callback('/(^|(?<=&))[^=[&]+/', function ($key) {
-                return bin2hex(urldecode($key[0]));
+                return base64_encode(urldecode($key[0]));
             }, $this->info['query']);
 
             parse_str($queryString, $query);
@@ -470,9 +470,9 @@ private static function fixQuery(array $query)
 
         foreach ($query as $key => $value) {
             if (is_array($value)) {
-                $fixed[hex2bin($key)] = self::fixQuery($value);
+                $fixed[base64_decode($key)] = self::fixQuery($value);
             } else {
-                $fixed[hex2bin($key)] = urldecode($value);
+                $fixed[base64_decode($key)] = urldecode($value);
             }
         }
 

tests/MovimTest.php

@@ -8,6 +8,7 @@ public function testOne()
             'https://nl.movim.eu/?node/blabla.movim.eu/random/1fb06a3cc05c4490bf659c227b39a9aa',
             [
                 'title' => 'Paris Attacks, cat not giving a fuck',
+                'url' => 'https://nl.movim.eu/?node/blabla.movim.eu/random/1fb06a3cc05c4490bf659c227b39a9aa',
                 'description' => 'Can you find the cat?',
                 'image' => 'http://hugelolcdn.com/i700/361973.jpg',
             ]