From 9de384fb22619088793378bb28c164bdf369d45f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= <rubencm@gmail.com>
Date: Tue, 27 Jun 2017 17:06:54 +0200
Subject: [PATCH] [ticket/15253] Make symfony_filesystem variable static

PHPBB3-15253
---
 phpBB/phpbb/filesystem/helper.php | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/phpBB/phpbb/filesystem/helper.php b/phpBB/phpbb/filesystem/helper.php
index a8a792bebc..1f434bac50 100644
--- a/phpBB/phpbb/filesystem/helper.php
+++ b/phpBB/phpbb/filesystem/helper.php
@@ -17,6 +17,12 @@ use Symfony\Component\Filesystem\Filesystem as symfony_filesystem;
 
 class helper
 {
+
+	/**
+	* @var \Symfony\Component\Filesystem\Filesystem
+	*/
+	protected static $symfony_filesystem;
+
 	/**
 	 * Eliminates useless . and .. components from specified path.
 	 *
@@ -207,8 +213,7 @@ class helper
 	 */
 	public static function make_path_relative($end_path, $start_path)
 	{
-		$symfony_filesystem = new symfony_filesystem();
-		return $symfony_filesystem->makePathRelative($end_path, $start_path);
+		self::get_symfony_filesystem()->makePathRelative($end_path, $start_path);
 	}
 
 	/**
@@ -363,4 +368,19 @@ class helper
 
 		return ($return_array) ? $resolved : $resolved_path;
 	}
+
+	/**
+	 * Get an instance of symfony's filesystem object.
+	 *
+	 * @return \Symfony\Component\Filesystem\Filesystem	Symfony filesystem
+	 */
+	protected static function get_symfony_filesystem()
+	{
+		if (self::$symfony_filesystem === null)
+		{
+			self::$symfony_filesystem = new symfony_filesystem();
+		}
+
+		return self::$symfony_filesystem;
+	}
 }