modif comtabilite

user/plugins/admin/classes/Twig/AdminTwigExtension.php

@@ -2,10 +2,9 @@
 namespace Grav\Plugin\Admin\Twig;
 
 use Grav\Common\Grav;
+use Grav\Common\Yaml;
 use Grav\Common\Language\Language;
 use Grav\Common\Page\Page;
-use Symfony\Component\Yaml\Yaml;
-use Symfony\Component\Yaml\Parser;
 
 class AdminTwigExtension extends \Twig_Extension
 {
@@ -32,6 +31,7 @@ class AdminTwigExtension extends \Twig_Extension
             new \Twig_SimpleFilter('toYaml', [$this, 'toYamlFilter']),
             new \Twig_SimpleFilter('fromYaml', [$this, 'fromYamlFilter']),
             new \Twig_SimpleFilter('adminNicetime', [$this, 'adminNicetimeFilter']),
+            new \Twig_SimpleFilter('nested', [$this, 'nestedFilter']),
         ];
     }
 
@@ -43,6 +43,23 @@ class AdminTwigExtension extends \Twig_Extension
         ];
     }
 
+    public function nestedFilter($current, $name)
+    {
+        $path = explode('.', trim($name, '.'));
+
+        foreach ($path as $field) {
+            if (is_object($current) && isset($current->{$field})) {
+                $current = $current->{$field};
+            } elseif (is_array($current) && isset($current[$field])) {
+                $current = $current[$field];
+            } else {
+                return null;
+            }
+        }
+
+        return $current;
+    }
+
     public function cloneFunc($obj)
     {
         return clone $obj;
@@ -81,7 +98,7 @@ class AdminTwigExtension extends \Twig_Extension
         return $this->grav['admin']->translate($args, $lang);
     }
 
-    public function toYamlFilter($value, $inline = true)
+    public function toYamlFilter($value, $inline = null)
     {
         return Yaml::dump($value, $inline);
 
@@ -89,8 +106,7 @@ class AdminTwigExtension extends \Twig_Extension
 
     public function fromYamlFilter($value)
     {
-        $yaml = new Parser();
-        return $yaml->parse($value);
+        return Yaml::parse($value);
     }
 
     public function adminNicetimeFilter($date, $long_strings = true)