fixed twig extension bug and getDetailsUrl added to ItemInterface

heimrichhannot · Apr 27, 2018 · 6459583 · 6459583
1 parent 3e39438
commit 6459583
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/src/Item/DefaultItem.php b/src/Item/DefaultItem.php
@@ -362,11 +362,11 @@ public function parse(string $cssClass = '', int $count = 0): string
 
         $twig = $this->_manager->getTwig();
 
-        $twig->hasExtension('\Twig_Extensions_Extension_Text') ?: $twig->addExtension(new \Twig_Extensions_Extension_Text());
-        $twig->hasExtension('\Twig_Extensions_Extension_Intl') ?: $twig->addExtension(new \Twig_Extensions_Extension_Intl());
-        $twig->hasExtension('\Twig_Extensions_Extension_Array') ?: $twig->addExtension(new \Twig_Extensions_Extension_Array());
-        $twig->hasExtension('\Twig_Extensions_Extension_Date') ?: $twig->addExtension(new \Twig_Extensions_Extension_Date());
-        $twig->hasExtension('Urodoz\Truncate\Bridge\Twig\TruncateExtension') ?: $twig->addExtension(new TruncateExtension(TruncateService::create()));
+        true === $twig->hasExtension('\Twig_Extensions_Extension_Text') ?: $twig->addExtension(new \Twig_Extensions_Extension_Text());
+        true === $twig->hasExtension('\Twig_Extensions_Extension_Intl') ?: $twig->addExtension(new \Twig_Extensions_Extension_Intl());
+        true === $twig->hasExtension('\Twig_Extensions_Extension_Array') ?: $twig->addExtension(new \Twig_Extensions_Extension_Array());
+        true === $twig->hasExtension('\Twig_Extensions_Extension_Date') ?: $twig->addExtension(new \Twig_Extensions_Extension_Date());
+        true === $twig->hasExtension('Urodoz\Truncate\Bridge\Twig\TruncateExtension') ?: $twig->addExtension(new TruncateExtension(TruncateService::create()));
 
         return $twig->render($this->_manager->getItemTemplateByName($listConfig->itemTemplate ?: 'default'), $this->jsonSerialize());
     }

diff --git a/src/Item/ItemInterface.php b/src/Item/ItemInterface.php
@@ -46,8 +46,8 @@ public function getRawValue(string $name);
     /**
      * Set a raw value for a given property.
      *
-     * @param string $name  The property name
-     * @param mixed  $value The property value
+     * @param string $name The property name
+     * @param mixed $value The property value
      */
     public function setRawValue(string $name, $value): void;
 
@@ -77,8 +77,8 @@ public function getFormattedValue(string $name);
     /**
      * Set a formatted value for a given property.
      *
-     * @param string $name  The property name
-     * @param mixed  $value The property value
+     * @param string $name The property name
+     * @param mixed $value The property value
      */
     public function setFormattedValue(string $name, $value): void;
 
@@ -111,7 +111,7 @@ public function getModule(): ?array;
     /**
      * Compute id (or alias) for a given item.
      *
-     * @param ItemInterface   $item
+     * @param ItemInterface $item
      * @param ListConfigModel $listConfig
      *
      * @return string
@@ -122,15 +122,15 @@ public function generateIdOrAlias(self $item, ListConfigModel $listConfig): ?str
      * Adds a details url to the item data.
      *
      * @param $idOrAlias
-     * @param ItemInterface   $item
+     * @param ItemInterface $item
      * @param ListConfigModel $listConfig
      */
     public function addDetailsUrl($idOrAlias, self $item, ListConfigModel $listConfig): void;
 
     /**
      * Adds a share url to the item data.
      *
-     * @param ItemInterface   $item
+     * @param ItemInterface $item
      * @param ListConfigModel $listConfig
      */
     public function addShareUrl(self $item, ListConfigModel $listConfig): void;
@@ -234,4 +234,10 @@ public function getTableFields();
      * @param array $tableFields
      */
     public function setTableFields(array $tableFields);
+
+    /**
+     * Get the details url
+     * @return null|string
+     */
+    public function getDetailsUrl():?string;
 }