Skip to content

Commit

Permalink
fixed twig extensions
Browse files Browse the repository at this point in the history
  • Loading branch information
Rico Kaltofen committed Apr 30, 2018
1 parent 6459583 commit bc5906c
Show file tree
Hide file tree
Showing 3 changed files with 92 additions and 31 deletions.
6 changes: 0 additions & 6 deletions src/Item/DefaultItem.php
Original file line number Diff line number Diff line change
Expand Up @@ -362,12 +362,6 @@ public function parse(string $cssClass = '', int $count = 0): string

$twig = $this->_manager->getTwig();

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());
}

Expand Down
91 changes: 67 additions & 24 deletions src/Resources/config/config.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,67 @@
huh:
list:
managers:
- { name: default, id: huh.list.manager.list }
lists:
- { name: default, class: HeimrichHannot\ListBundle\Lists\DefaultList }
items:
- { name: default, class: HeimrichHannot\ListBundle\Item\DefaultItem }
config_element_types:
- { name: image, class: HeimrichHannot\ListBundle\ConfigElementType\ImageConfigElementType }
templates:
list:
- { name: default, template: "@HeimrichHannotContaoList/list/list_default.html.twig" }
- { name: table_default, template: "@HeimrichHannotContaoList/list/list_table_default.html.twig" }
list_prefixes:
- list_(?!item)
item:
- { name: default, template: "@HeimrichHannotContaoList/item/list_item_default.html.twig" }
- { name: table_default, template: "@HeimrichHannotContaoList/item/list_item_table_default.html.twig" }
item_prefixes:
- list_item_
- item_
- news_
- event_
services:
huh.list.choice.template.list:
class: HeimrichHannot\ListBundle\Choice\ListTemplateChoice
arguments:
- "@contao.framework"
huh.list.choice.template.item:
class: HeimrichHannot\ListBundle\Choice\ListItemTemplateChoice
arguments:
- "@contao.framework"
huh.list.choice.parent-list-config:
class: HeimrichHannot\ListBundle\Choice\ParentListConfigChoice
arguments:
- "@contao.framework"
huh.list.manager.list:
class: HeimrichHannot\ListBundle\Manager\ListManager
arguments:
- "@contao.framework"
- "@huh.list.list-config-registry"
- "@huh.list.list-config-element-registry"
- "@huh.filter.manager"
- "@huh.request"
- "@huh.utils.model"
- "@huh.utils.url"
- "@huh.utils.container"
- "@huh.utils.image"
- "@huh.utils.form"
- "@twig"
huh.list.list-config-registry:
class: HeimrichHannot\ListBundle\Registry\ListConfigRegistry
arguments:
- "@contao.framework"
huh.list.list-config-element-registry:
class: HeimrichHannot\ListBundle\Registry\ListConfigElementRegistry
arguments:
- "@contao.framework"
huh.list.backend.module:
class: HeimrichHannot\ListBundle\Backend\Module
huh.list.choice.manager:
class: HeimrichHannot\ListBundle\Choice\ManagerChoice
arguments:
- "@contao.framework"
huh.list.choice.list:
class: HeimrichHannot\ListBundle\Choice\ListChoice
arguments:
- "@contao.framework"
huh.list.choice.item:
class: HeimrichHannot\ListBundle\Choice\ItemChoice
arguments:
- "@contao.framework"
twig.extension.text:
class: Twig_Extensions_Extension_Text
tags:
- { name: twig.extension }
twig.extension.intl:
class: Twig_Extensions_Extension_Intl
tags:
- { name: twig.extension }
twig.extension.array:
class: Twig_Extensions_Extension_Array
tags:
- { name: twig.extension }
twig.extension.date:
class: Twig_Extensions_Extension_Date
tags:
- { name: twig.extension }
arguments:
- "@translator"
26 changes: 25 additions & 1 deletion src/Resources/config/services.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,28 @@ services:
huh.list.choice.item:
class: HeimrichHannot\ListBundle\Choice\ItemChoice
arguments:
- "@contao.framework"
- "@contao.framework"
twig.extension.text:
class: Twig_Extensions_Extension_Text
tags:
- { name: twig.extension }
twig.extension.intl:
class: Twig_Extensions_Extension_Intl
tags:
- { name: twig.extension }
twig.extension.array:
class: Twig_Extensions_Extension_Array
tags:
- { name: twig.extension }
twig.extension.date:
class: Twig_Extensions_Extension_Date
tags:
- { name: twig.extension }
arguments:
- "@translator"
twig.extension.truncate.html:
class: Urodoz\Truncate\Bridge\Twig\TruncateExtension
arguments:
- "@twig.truncate.html.service"
tags:
- { name: twig.extension }

0 comments on commit bc5906c

Please sign in to comment.