[ticket/15538] Extract service and enhance icon function

PHPBB3-15538

phpBB/config/default/container/services.yml

@@ -29,6 +29,7 @@ imports:
     - { resource: services_text_formatter.yml }
     - { resource: services_text_reparser.yml }
     - { resource: services_twig.yml }
+    - { resource: services_twig_extensions.yml }
     - { resource: services_ucp.yml }
     - { resource: services_user.yml }
 

phpBB/config/default/container/services_twig.yml

@@ -54,13 +54,6 @@ services:
         tags:
             - { name: twig.extension }
 
-    template.twig.extensions.icon:
-        class: phpbb\template\twig\extension\icon
-        arguments:
-            - '@user'
-        tags:
-            - { name: twig.extension }
-
     template.twig.extensions.routing:
         class: phpbb\template\twig\extension\routing
         arguments:

phpBB/config/default/container/services_twig_extensions.yml

@@ -0,0 +1,9 @@
+# Twig extensions not needed by the installer
+
+services:
+    template.twig.extensions.icon:
+        class: phpbb\template\twig\extension\icon
+        arguments:
+            - '@user'
+        tags:
+            - { name: twig.extension }

phpBB/phpbb/template/twig/extension/icon.php

@@ -67,7 +67,7 @@ class icon extends \Twig\Extension\AbstractExtension
 	 */
 	public function icon(environment $environment, $type, $icon, $title = '', $hidden = false, $classes = '', array $attributes = [])
 	{
-		$type = utf8_strtolower($type);
+		$type = strtolower($type);
 
 		switch ($type)
 		{
@@ -141,16 +141,9 @@ class icon extends \Twig\Extension\AbstractExtension
 		{
 			if ($element->nodeName === 'svg')
 			{
-				$children = [];
+				while (isset($element->firstChild))
-
-				foreach ($element->childNodes as $node)
 				{
-					$children[] = $node;
+					$element->parentNode->insertBefore($element->firstChild, $element);
-				}
-
-				foreach ($children as $child)
-				{
-					$element->parentNode->insertBefore($child, $element);
 				}
 			}