cleanup

joomla · Oct 30, 2020 · 8ef4846 · 8ef4846
1 parent 3332b0d
commit 8ef4846
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/libraries/src/HTML/Helpers/Icons.php b/libraries/src/HTML/Helpers/Icons.php
@@ -11,11 +11,8 @@
 defined('JPATH_PLATFORM') or die;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\HTML\HTMLHelper;
-use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\FileLayout;
-use Joomla\CMS\MVC\Controller\Exception;
 use Joomla\CMS\Uri\Uri;
 
 /**
@@ -99,11 +96,11 @@ public static function button($button)
 	 * @param   string   $file      The relative or absolute PATH to use for the src attribute.
 	 * @param   boolean  $relative  Flag if the path to the file is relative to the /media folder (and searches in template).
 	 *
-	 * @return  string
+	 * @return  string|null
 	 *
 	 * @since   4.0
 	 */
-	public static function svg(string $file, $relative = true)
+	public static function svg(string $file, bool $relative = true): ?string
 	{
 		// Check extension for .svg
 		$extension = strtolower(substr($file, -3, strrpos($file, ".")));
@@ -123,7 +120,7 @@ public static function svg(string $file, $relative = true)
 		}
 
 		// Get contents to display inline
-		$file = file_get_contents(Path::clean(JPATH_ROOT . '/' . substr($file, \strlen(Uri::root(true)))));
+		$file = file_get_contents(JPATH_ROOT . '/' . substr($file, \strlen(Uri::root(true))));
 
 		return $file;
 	}