Fixed a minor taxonomy issue and added comments.

jadwigo · May 25, 2016 · 9e1d4e4 · 9e1d4e4
1 parent 6664033
commit 9e1d4e4
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 2 deletions.
diff --git a/src/TaxonomyListExtension.php b/src/TaxonomyListExtension.php
@@ -11,13 +11,20 @@
 
 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 [
@@ -27,6 +34,9 @@ protected function getDefaultConfig()
         ];
     }
 
+    /**
+     * @return array
+     */
     protected function registerTwigFunctions()
     {
         $app = $this->getContainer();
@@ -39,7 +49,9 @@ protected function registerTwigFunctions()
         ];
     }
 
-
+    /**
+     * @param Application $app
+     */
     protected function registerServices(Application $app)
     {
         $app['taxonomylist.twig'] = $app->share(
@@ -51,6 +63,11 @@ function ($app) {
         );
     }
 
+    /**
+     * @param Application $app
+     * @param Request $request
+     * @return Response
+     */
     public function taxonomies(Application $app, Request $request)
     {
         $config = $this->getConfig();

diff --git a/src/Twig/TaxonomyListExtension.php b/src/Twig/TaxonomyListExtension.php
@@ -21,11 +21,21 @@ public function __construct(array $config, Application $app)
 
     /**
      * Return an array with items in a taxonomy
+     *
+     * @param bool $name
+     * @param bool $params
+     * @return null
      */
     public function twigTaxonomyList($name = false, $params = false)
     {
         // if $name isn't set, use the one from the config.yml. Unless that's empty too, then use "tags".
-        $name = $this->config['default_taxonomy'];
+        if (empty($name)) {
+            if (!empty($this->config['default_taxonomy'])) {
+                $name = $this->config['default_taxonomy'];
+            } else {
+                $name = "tags";
+            }
+        }
 
         $taxonomy = $this->app['config']->get('taxonomy');
 
@@ -70,6 +80,12 @@ public function twigTaxonomyList($name = false, $params = false)
 
     /**
      * Get the full taxonomy data from the database, count all occurences of a certain taxonomy name
+     *
+     * @param null $name
+     * @param null $taxonomy
+     * @param null $params
+     * @return null
+     * @throws \Doctrine\DBAL\DBALException
      */
     protected function getFullTaxonomy($name = null, $taxonomy = null, $params = null)
     {