From d5bf2c4523f0f80c6b7d2e084d7b4199c4f19de1 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Mon, 8 Oct 2018 22:51:40 +0200
Subject: Move normalizePath to regexes instead of looping

This is IMO a bit more readable and it seems to make the code faster.
Tested it on the company instance where there are over 3k calls to this
function. It shaves off around 10ms.

The advantage here is that the pattern gets optimized by php itsel and
cached.
Also looking for all patterns at the same time and especially no longer
looping for /./ patterns should save time.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
---
 tests/lib/Files/FilesystemTest.php | 129 +++++++++++++++++++------------------
 1 file changed, 68 insertions(+), 61 deletions(-)

(limited to 'tests/lib/Files/FilesystemTest.php')

diff --git a/tests/lib/Files/FilesystemTest.php b/tests/lib/Files/FilesystemTest.php
index a98af220ba1..6fc6fbe9d7c 100644
--- a/tests/lib/Files/FilesystemTest.php
+++ b/tests/lib/Files/FilesystemTest.php
@@ -115,73 +115,80 @@ class FilesystemTest extends \Test\TestCase {
 	}
 
 	public function normalizePathData() {
-		return array(
-			array('/', ''),
-			array('/', '/'),
-			array('/', '//'),
-			array('/', '/', false),
-			array('/', '//', false),
-
-			array('/path', '/path/'),
-			array('/path/', '/path/', false),
-			array('/path', 'path'),
-
-			array('/foo/bar', '/foo//bar/'),
-			array('/foo/bar/', '/foo//bar/', false),
-			array('/foo/bar', '/foo////bar'),
-			array('/foo/bar', '/foo/////bar'),
-			array('/foo/bar', '/foo/bar/.'),
-			array('/foo/bar', '/foo/bar/./'),
-			array('/foo/bar/', '/foo/bar/./', false),
-			array('/foo/bar', '/foo/bar/./.'),
-			array('/foo/bar', '/foo/bar/././'),
-			array('/foo/bar/', '/foo/bar/././', false),
-			array('/foo/bar', '/foo/./bar/'),
-			array('/foo/bar/', '/foo/./bar/', false),
-			array('/foo/.bar', '/foo/.bar/'),
-			array('/foo/.bar/', '/foo/.bar/', false),
-			array('/foo/.bar/tee', '/foo/.bar/tee'),
+		return [
+			['/', ''],
+			['/', '/'],
+			['/', '//'],
+			['/', '/', false],
+			['/', '//', false],
+
+			['/path', '/path/'],
+			['/path/', '/path/', false],
+			['/path', 'path'],
+
+			['/foo/bar', '/foo//bar/'],
+			['/foo/bar/', '/foo//bar/', false],
+			['/foo/bar', '/foo////bar'],
+			['/foo/bar', '/foo/////bar'],
+			['/foo/bar', '/foo/bar/.'],
+			['/foo/bar', '/foo/bar/./'],
+			['/foo/bar/', '/foo/bar/./', false],
+			['/foo/bar', '/foo/bar/./.'],
+			['/foo/bar', '/foo/bar/././'],
+			['/foo/bar/', '/foo/bar/././', false],
+			['/foo/bar', '/foo/./bar/'],
+			['/foo/bar/', '/foo/./bar/', false],
+			['/foo/.bar', '/foo/.bar/'],
+			['/foo/.bar/', '/foo/.bar/', false],
+			['/foo/.bar/tee', '/foo/.bar/tee'],
+
+			['/foo/bar', '/.///././//./foo/.///././//./bar/./././.'],
+			['/foo/bar/', '/.///././//./foo/.///././//./bar/./././.', false],
+			['/foo/bar', '/.///././//./foo/.///././//./bar/././././'],
+			['/foo/bar/', '/.///././//./foo/.///././//./bar/././././', false],
 
 			// Windows paths
-			array('/', ''),
-			array('/', '\\'),
-			array('/', '\\', false),
-			array('/', '\\\\'),
-			array('/', '\\\\', false),
-
-			array('/path', '\\path'),
-			array('/path', '\\path', false),
-			array('/path', '\\path\\'),
-			array('/path/', '\\path\\', false),
-
-			array('/foo/bar', '\\foo\\\\bar\\'),
-			array('/foo/bar/', '\\foo\\\\bar\\', false),
-			array('/foo/bar', '\\foo\\\\\\\\bar'),
-			array('/foo/bar', '\\foo\\\\\\\\\\bar'),
-			array('/foo/bar', '\\foo\\bar\\.'),
-			array('/foo/bar', '\\foo\\bar\\.\\'),
-			array('/foo/bar/', '\\foo\\bar\\.\\', false),
-			array('/foo/bar', '\\foo\\bar\\.\\.'),
-			array('/foo/bar', '\\foo\\bar\\.\\.\\'),
-			array('/foo/bar/', '\\foo\\bar\\.\\.\\', false),
-			array('/foo/bar', '\\foo\\.\\bar\\'),
-			array('/foo/bar/', '\\foo\\.\\bar\\', false),
-			array('/foo/.bar', '\\foo\\.bar\\'),
-			array('/foo/.bar/', '\\foo\\.bar\\', false),
-			array('/foo/.bar/tee', '\\foo\\.bar\\tee'),
+			['/', ''],
+			['/', '\\'],
+			['/', '\\', false],
+			['/', '\\\\'],
+			['/', '\\\\', false],
+
+			['/path', '\\path'],
+			['/path', '\\path', false],
+			['/path', '\\path\\'],
+			['/path/', '\\path\\', false],
+
+			['/foo/bar', '\\foo\\\\bar\\'],
+			['/foo/bar/', '\\foo\\\\bar\\', false],
+			['/foo/bar', '\\foo\\\\\\\\bar'],
+			['/foo/bar', '\\foo\\\\\\\\\\bar'],
+			['/foo/bar', '\\foo\\bar\\.'],
+			['/foo/bar', '\\foo\\bar\\.\\'],
+			['/foo/bar/', '\\foo\\bar\\.\\', false],
+			['/foo/bar', '\\foo\\bar\\.\\.'],
+			['/foo/bar', '\\foo\\bar\\.\\.\\'],
+			['/foo/bar/', '\\foo\\bar\\.\\.\\', false],
+			['/foo/bar', '\\foo\\.\\bar\\'],
+			['/foo/bar/', '\\foo\\.\\bar\\', false],
+			['/foo/.bar', '\\foo\\.bar\\'],
+			['/foo/.bar/', '\\foo\\.bar\\', false],
+			['/foo/.bar/tee', '\\foo\\.bar\\tee'],
 
 			// Absolute windows paths NOT marked as absolute
-			array('/C:', 'C:\\'),
-			array('/C:/', 'C:\\', false),
-			array('/C:/tests', 'C:\\tests'),
-			array('/C:/tests', 'C:\\tests', false),
-			array('/C:/tests', 'C:\\tests\\'),
-			array('/C:/tests/', 'C:\\tests\\', false),
+			['/C:', 'C:\\'],
+			['/C:/', 'C:\\', false],
+			['/C:/tests', 'C:\\tests'],
+			['/C:/tests', 'C:\\tests', false],
+			['/C:/tests', 'C:\\tests\\'],
+			['/C:/tests/', 'C:\\tests\\', false],
+			['/C:/tests/bar', 'C:\\tests\\.\\.\\bar'],
+			['/C:/tests/bar/', 'C:\\tests\\.\\.\\bar\\.\\', false],
 
 			// normalize does not resolve '..' (by design)
-			array('/foo/..', '/foo/../'),
-			array('/foo/..', '\\foo\\..\\'),
-		);
+			['/foo/..', '/foo/../'],
+			['/foo/..', '\\foo\\..\\'],
+		];
 	}
 
 	/**
-- 
cgit v1.2.3