From ca0fcced20eef89dfbea6f76fcab5b854cc6e870 Mon Sep 17 00:00:00 2001
From: Stephan Unverwerth <s.unverwerth@gmx.de>
Date: Mon, 19 Sep 2016 23:57:29 +0200
Subject: [PATCH] Added tests for pathToUri and findFilesRecursive

---
 fixtures/recursive/a.txt                |  1 +
 fixtures/recursive/search/b.txt         |  1 +
 fixtures/recursive/search/here/c.txt    |  1 +
 src/utils.php                           | 62 +++++++++++++------------
 tests/Utils/FileUriTest.php             | 36 ++++++++++++++
 tests/Utils/RecursiveFileSearchTest.php | 21 +++++++++
 6 files changed, 92 insertions(+), 30 deletions(-)
 create mode 100644 fixtures/recursive/a.txt
 create mode 100644 fixtures/recursive/search/b.txt
 create mode 100644 fixtures/recursive/search/here/c.txt
 create mode 100644 tests/Utils/FileUriTest.php
 create mode 100644 tests/Utils/RecursiveFileSearchTest.php

diff --git a/fixtures/recursive/a.txt b/fixtures/recursive/a.txt
new file mode 100644
index 0000000..8c7e5a6
--- /dev/null
+++ b/fixtures/recursive/a.txt
@@ -0,0 +1 @@
+A
\ No newline at end of file
diff --git a/fixtures/recursive/search/b.txt b/fixtures/recursive/search/b.txt
new file mode 100644
index 0000000..7371f47
--- /dev/null
+++ b/fixtures/recursive/search/b.txt
@@ -0,0 +1 @@
+B
\ No newline at end of file
diff --git a/fixtures/recursive/search/here/c.txt b/fixtures/recursive/search/here/c.txt
new file mode 100644
index 0000000..d5274b3
--- /dev/null
+++ b/fixtures/recursive/search/here/c.txt
@@ -0,0 +1 @@
+Peeakboo!
\ No newline at end of file
diff --git a/src/utils.php b/src/utils.php
index 2743439..2d62dc0 100644
--- a/src/utils.php
+++ b/src/utils.php
@@ -1,31 +1,33 @@
-<?php
-
-namespace LanguageServer;
-
-/**
- * Recursively Searches files with matching filename, starting at $path. 
- *
- * @param string $path
- * @param string $pattern
- * @return array
- */
-function findFilesRecursive(string $path, string $pattern): array {
-    $dir = new \RecursiveDirectoryIterator($path);
-    $ite = new \RecursiveIteratorIterator($dir);
-    $files = new \RegexIterator($ite, $pattern, \RegexIterator::GET_MATCH);
-    $fileList = array();
-    foreach($files as $file) {
-        $fileList = array_merge($fileList, $file);
-    }
-    return $fileList;
-}
-
-/**
- * Transforms an absolute file path into a URI as used by the language server protocol. 
- *
- * @param string $filepath
- * @return string
- */
-function pathToUri(string $filepath): string {
-    return 'file://'.($filepath[0] == '/' || $filepath[0] == '\\' ? '' : '/').str_replace('\\', '/', $filepath);
+<?php
+
+namespace LanguageServer;
+
+/**
+ * Recursively Searches files with matching filename, starting at $path. 
+ *
+ * @param string $path
+ * @param string $pattern
+ * @return array
+ */
+function findFilesRecursive(string $path, string $pattern): array {
+    $dir = new \RecursiveDirectoryIterator($path);
+    $ite = new \RecursiveIteratorIterator($dir);
+    $files = new \RegexIterator($ite, $pattern, \RegexIterator::GET_MATCH);
+    $fileList = array();
+    foreach($files as $file) {
+        $fileList = array_merge($fileList, $file);
+    }
+    return $fileList;
+}
+
+/**
+ * Transforms an absolute file path into a URI as used by the language server protocol. 
+ *
+ * @param string $filepath
+ * @return string
+ */
+function pathToUri(string $filepath): string {
+    $filepath = trim(str_replace('\\', '/', $filepath), '/');
+    $filepath = implode('/', array_map('urlencode', explode('/', $filepath)));
+    return 'file:///'.$filepath;
 }
\ No newline at end of file
diff --git a/tests/Utils/FileUriTest.php b/tests/Utils/FileUriTest.php
new file mode 100644
index 0000000..dcd3242
--- /dev/null
+++ b/tests/Utils/FileUriTest.php
@@ -0,0 +1,36 @@
+<?php
+declare(strict_types = 1);
+
+namespace LanguageServer\Tests\Utils;
+
+use PHPUnit\Framework\TestCase;
+
+class FileUriTest extends TestCase
+{
+    public function testSpecialCharsAreEscaped()
+    {
+        $uri = \LanguageServer\pathToUri('c:/path/to/file/dürüm döner.php');
+        $this->assertEquals('file:///c%3A/path/to/file/d%C3%BCr%C3%BCm+d%C3%B6ner.php', $uri);
+    }
+
+    public function testUriIsWellFormed()
+    {
+        $uri = \LanguageServer\pathToUri('var/log');
+        $this->assertEquals('file:///var/log', $uri);
+
+        $uri = \LanguageServer\pathToUri('/usr/local/bin');
+        $this->assertEquals('file:///usr/local/bin', $uri);
+
+        $uri = \LanguageServer\pathToUri('a/b/c/');
+        $this->assertEquals('file:///a/b/c', $uri);
+
+        $uri = \LanguageServer\pathToUri('/d/e/f');
+        $this->assertEquals('file:///d/e/f', $uri);
+    }
+
+    public function testBackslashesAreTransformed()
+    {
+        $uri = \LanguageServer\pathToUri('c:\\foo\\bar.baz');
+        $this->assertEquals('file:///c%3A/foo/bar.baz', $uri);
+    }
+}
diff --git a/tests/Utils/RecursiveFileSearchTest.php b/tests/Utils/RecursiveFileSearchTest.php
new file mode 100644
index 0000000..bcefbdc
--- /dev/null
+++ b/tests/Utils/RecursiveFileSearchTest.php
@@ -0,0 +1,21 @@
+<?php
+declare(strict_types = 1);
+
+namespace LanguageServer\Tests\Utils;
+
+use PHPUnit\Framework\TestCase;
+
+class RecursiveFileSearchTest extends TestCase
+{
+    public function testFilesAreFound()
+    {
+        $path = realpath(__DIR__ . '/../../fixtures/recursive');
+        $files = \LanguageServer\findFilesRecursive($path, '/.+\.txt/');
+        
+        $this->assertEquals([
+            $path . DIRECTORY_SEPARATOR . 'a.txt',
+            $path . DIRECTORY_SEPARATOR . 'search' . DIRECTORY_SEPARATOR . 'b.txt',
+            $path . DIRECTORY_SEPARATOR . 'search' . DIRECTORY_SEPARATOR . 'here' . DIRECTORY_SEPARATOR . 'c.txt',
+        ], $files);
+    }
+}