improved svg macro for detecting theme name mention in path,

typo fixed;

Author: landsman

src/TwigExtension/Food.php

@@ -12,7 +12,7 @@
 
 /**
  * @package Twig Food
- * @author Michal Landsman <michal.landsman@burda.cz>
+ * @author Michal Landsman <landsman@studioart.cz>
  */
 class Food extends \Drupal\Core\Template\TwigExtension
 {
@@ -22,20 +22,36 @@ class Food extends \Drupal\Core\Template\TwigExtension
      */
     protected $entityTypeManager;
 
-    /**
+
+    /**á
      * @var string
      */
     protected $themeName;
 
 
-    public function __construct(RendererInterface $renderer, UrlGeneratorInterface $url_generator, ThemeManagerInterface $theme_manager, DateFormatterInterface $date_formatter, EntityTypeManagerInterface $entity_type_manager)
-    {
+    /**
+     * @param RendererInterface $renderer
+     * @param UrlGeneratorInterface $url_generator
+     * @param ThemeManagerInterface $theme_manager
+     * @param DateFormatterInterface $date_formatter
+     * @param EntityTypeManagerInterface $entity_type_manager
+     */
+    public function __construct
+    (
+        RendererInterface $renderer,
+        UrlGeneratorInterface $url_generator,
+        ThemeManagerInterface $theme_manager,
+        DateFormatterInterface $date_formatter,
+        EntityTypeManagerInterface $entity_type_manager
+    ){
         $this->entityTypeManager = $entity_type_manager;
         $this->themeName         = $theme_manager->getActiveTheme()->getName();
 
+
         parent::__construct($renderer, $url_generator, $theme_manager, $date_formatter, $date_formatter);
     }
 
+
     /**
      * Gets a unique identifier for this Twig extension.
      */
@@ -44,6 +60,7 @@ public function getName()
         return 'twig_food.twig_extension';
     }
 
+
     /**
      * Generate a list of all twig functions
      * @return array
@@ -62,6 +79,7 @@ public function getFunctions()
         ];
     }
 
+
     /**
      * Generates a list of all Twig filters that this extension defines.
      */
@@ -73,22 +91,41 @@ public function getFilters()
         ];
     }
 
+
+    /**
+     * Return full path used in macro, supports dynamic paths like: '@marianne/images/image.svg' for child themes
+     * @param $string
+     * @return string
+     */
+    public function themeFullPath($string)
+    {
+        $s      = explode('/', $string);
+        $f      = strpos($s[0], '@') !== false ? str_replace('@', '', $s[0]) : '';
+        $s[0]   = drupal_get_path("theme", !empty($f) ? $f : $this->themeName);
+        $p      = implode('/', $s);
+
+
+        return $p;
+    }
+
+
     /**
      * Return SVG source code as string to Twig - usage: {{ svg('bgCarousel.svg')|raw }}
      * @param $path
      * @return string
      */
     public function renderSVG($path)
     {
-        $theme      = drupal_get_path("theme", $this->themeName);
-        $fullPath   = "{$theme}/{$path}";
+        $fullPath   = $this->themeFullPath($path);
         $handle     = fopen($fullPath, "r");
         $contents   = fread($handle, filesize($fullPath));
         fclose($handle);
 
+
         return $contents;
     }
 
+
     /**
      * Make render of var, removes html comments from string, do strip_tags, remove new lines => naked string
      * Example: A string which has value  <!-- Start DEBUG --> ABCD <!-- End DEBUG -->
@@ -102,9 +139,11 @@ public function renderNakedField($string)
         $withoutComments = preg_replace('/<!--(.|\s)*?-->/', '', $rendered);
         $naked           = strip_tags(str_replace(["\n", "\r"], '', html_entity_decode($withoutComments, ENT_QUOTES, 'UTF-8')));
 
+
         return $naked;
     }
 
+
     /**
      * Check string length and return him summary or in original
      * @param $string
@@ -124,9 +163,11 @@ public function renderWithMaxLength($string, $max = 0, $dots = true)
             $string = (isset($items[0]) ? $items[0] : "") . ($dots ? "..." : "");
         }
 
+
         return $string;
     }
 
+
     /**
      * Return array of selected block
      * @param $id string
@@ -135,9 +176,12 @@ public function renderWithMaxLength($string, $max = 0, $dots = true)
     public function loadBlock($id)
     {
         $block = $this->entityTypeManager->getStorage('block')->load($id);
+
+
         return $block ? $this->entityTypeManager->getViewBuilder('block')->view($block) : '';
     }
 
+
     /**
      * Render region by id
      * @param $id
@@ -156,9 +200,11 @@ public function loadRegion($id)
             $result[] = $this->loadBlock($id);
         }
 
+
         return $result;
     }
 
+
     /**
      * Prev gallery
      * @param $id
@@ -170,6 +216,7 @@ public function loadGalleryPrev($id, $thumbnail = 'thumbnail')
         return $this->getMediaData($id, '<', 'DESC', $thumbnail);
     }
 
+
     /**
      * Next gallery
      * @param $id
@@ -181,6 +228,7 @@ public function loadGalleryNext($id, $thumbnail = 'thumbnail')
         return $this->getMediaData($id, '>', 'ASC', $thumbnail);
     }
 
+
     /**
      * Load gallery images
      * @param $id
@@ -194,10 +242,10 @@ public function loadGalleryThumbs($id, $thumbnail = 'thumbnail')
             ->load($id);
 
         $images = $gallery->get('field_media_images');
+        $result = [];
 
         if($images)
         {
-            $result = [];
             foreach($images as $image)
             {
                 $mid        = $image->entity->id();
@@ -211,13 +259,13 @@ public function loadGalleryThumbs($id, $thumbnail = 'thumbnail')
                     'thumb' => ImageStyle::load($thumbnail)->buildUrl($imageUrl),
                 ];
             }
-
-            return $result;
         }
 
-        return [];
+
+        return $result;
     }
 
+
     /**
      * Load main node object anywhere
      * @param bool|true $returnId
@@ -231,9 +279,11 @@ public function getMainNode($returnId = true)
             return $returnId ? $node->id() : $node;
         }
 
+
         return null;
     }
 
+
     /**
      * Load one gallery
      * @param $currentId
@@ -287,9 +337,11 @@ public function getMediaData($currentId, $dateComparator, $sortOrder, $thumbnail
             ];
         }
 
+
         return null;
     }
 
+
     /**
      * @param $viewName
      * @param $displayId
@@ -307,7 +359,9 @@ public function viewEmbed($viewName, $displayId)
 
         }
 
+
         return "Missing viewName or displayId parameter";
     }
 
+
 }