Merge branch 'Raistlfiren-v3.0' into v3.x

composer.json

@@ -12,8 +12,10 @@
         "tagclouds"
     ],
     "require": {
-        "bolt/bolt": ">=2.0.0,<3.0.0"
+        "bolt/bolt": "^3.0"
     },
+    "minimum-stability": "dev",
+    "prefer-stable": true,
     "authors": [
         {
             "name": "Lodewijk Evers",
@@ -22,16 +24,11 @@
         }
     ],
     "autoload": {
-        "files": [
-            "init.php"
-        ],
         "psr-4" : {
-            "Bolt\\Extension\\Jadwigo\\TaxonomyList\\" : ""
+            "Bolt\\Extension\\Jadwigo\\TaxonomyList\\" : "src"
         }
     },
     "extra": {
-        "branch-alias": {
-            "dev-master": "2.0.*"
-        }
+        "bolt-class": "Bolt\\Extension\\Jadwigo\\TaxonomyList\\TaxonomyListExtension"
     }
 }

config.yml.dist → config/config.yml.dist

@@ -1,6 +1,6 @@
 # taxonomylist settings
 
-template: assets/taxonomylist.twig
+template: taxonomylist.twig
 
 default_taxonomy: tags
 route_path: /taxonomies

src/TaxonomyListExtension.php

@@ -0,0 +1,86 @@
+<?php
+// Taxonomy listing Extension for Bolt, by Lodewijk Evers
+
+namespace Bolt\Extension\Jadwigo\TaxonomyList;
+
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Silex\ControllerCollection;
+use Bolt\Extension\SimpleExtension;
+use Silex\Application;
+
+class TaxonomyListExtension extends SimpleExtension
+{
+
+    /**
+     * @param ControllerCollection $collection
+     */
+    protected function registerFrontendRoutes(ControllerCollection $collection)
+    {
+        $config = $this->getConfig();
+
+        $collection->match($config['route_path'], [$this, 'taxonomies']);
+    }
+
+    /**
+     * @return array
+     */
+    protected function getDefaultConfig()
+    {
+        return [
+            'template' => 'taxonomylist.twig',
+            'default_taxonomy' => 'tags',
+            'route_path' => '/taxonomies'
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    protected function registerTwigFunctions()
+    {
+        $app = $this->getContainer();
+
+        return [
+            'taxonomylist' => [
+                [$app['taxonomylist.twig'], 'twigTaxonomyList'],
+
+            ]
+        ];
+    }
+
+    /**
+     * @param Application $app
+     */
+    protected function registerServices(Application $app)
+    {
+        $app['taxonomylist.twig'] = $app->share(
+            function ($app) {
+                $config = $app['extensions']->get('Jadwigo/TaxonomyList')->getConfig();
+
+                return new \Bolt\Extension\Jadwigo\TaxonomyList\Twig\TaxonomyListExtension($config, $app);
+            }
+        );
+    }
+
+    /**
+     * @param Application $app
+     * @param Request $request
+     * @return Response
+     */
+    public function taxonomies(Application $app, Request $request)
+    {
+        $config = $this->getConfig();
+
+        $taxonomy = $app['config']->get('taxonomy');
+        $taxonomies = array_keys($taxonomy);
+
+        $template = $config['template'];
+
+        $body = $this->renderTemplate($template, [
+            'taxonomies' => $taxonomies
+        ]);
+
+        return new Response($body);
+    }
+}