add templateimg

system/src/Grav/Common/Config/ConfigFileFinder.php

@@ -207,7 +207,7 @@ class ConfigFileFinder
                     continue;
                 }
 
-                $name = $directory->getBasename();
+                $name = $directory->getFilename();
                 $find = ($lookup ?: $name) . '.yaml';
                 $filename = "{$path}/{$name}/{$find}";
 

system/src/Grav/Common/GPM/Installer.php

@@ -296,17 +296,17 @@ class Installer
     {
         foreach (new \DirectoryIterator($source_path) as $file) {
 
-            if ($file->isLink() || $file->isDot() || in_array($file->getBasename(),$ignores)) {
+            if ($file->isLink() || $file->isDot() || in_array($file->getFilename(), $ignores)) {
                 continue;
             }
 
-            $path = $install_path . DS . $file->getBasename();
+            $path = $install_path . DS . $file->getFilename();
 
             if ($file->isDir()) {
                 Folder::delete($path);
                 Folder::move($file->getPathname(), $path);
 
-                if ($file->getBasename() == 'bin') {
+                if ($file->getFilename() === 'bin') {
                     foreach (glob($path . DS . '*') as $bin_file) {
                         @chmod($bin_file, 0755);
                     }

system/src/Grav/Common/Page/Media.php

@@ -86,7 +86,7 @@ class Media extends AbstractMedia
         /** @var \DirectoryIterator $info */
         foreach ($iterator as $path => $info) {
             // Ignore folders and Markdown files.
-            if (!$info->isFile() || $info->getExtension() === 'md' || $info->getBasename()[0] === '.') {
+            if (!$info->isFile() || $info->getExtension() === 'md' || $info->getFilename()[0] === '.') {
                 continue;
             }
 

system/src/Grav/Common/Page/Page.php

@@ -1790,7 +1790,7 @@ class Page
     public function routeCanonical($var = null)
     {
         if ($var !== null) {
-            $this->routes['canonical'] = (array)$var;
+            $this->routes['canonical'] = $var;
         }
 
         if (!empty($this->routes) && isset($this->routes['canonical'])) {

system/src/Grav/Common/Page/Pages.php

@@ -1041,7 +1041,7 @@ class Pages
             }
 
             // Ignore all files in ignore list.
-            if (\in_array($file->getBasename(), $this->ignore_files, true)) {
+            if (\in_array($filename, $this->ignore_files, true)) {
                 continue;
             }
 

system/src/Grav/Common/Plugins.php

@@ -33,7 +33,7 @@ class Plugins extends Iterator
             if (!$directory->isDir()) {
                 continue;
             }
-            $plugins[] = $directory->getBasename();
+            $plugins[] = $directory->getFilename();
         }
 
         natsort($plugins);

system/src/Grav/Common/Themes.php

@@ -98,7 +98,7 @@ class Themes extends Iterator
                 continue;
             }
 
-            $theme = $directory->getBasename();
+            $theme = $directory->getFilename();
             $result = self::get($theme);
 
             if ($result) {

system/src/Grav/Common/Twig/Twig.php

@@ -238,7 +238,7 @@ class Twig
             // Process Modular Twig
             if ($item->modularTwig()) {
                 $twig_vars['content'] = $content;
-                $extension = $this->grav['uri']->extension();
+                $extension = $item->templateFormat();
                 $extension = $extension ? ".{$extension}.twig" : TEMPLATE_EXT;
                 $template = $item->template() . $extension;
                 $output = $content = $local_twig->render($template, $twig_vars);