Fixing some issues introduced by multi responses

Author: Sean Molenaar

.gitignore

@@ -6,6 +6,8 @@
 /build/phar
 /build/*.phar
 /tests/statics/index.*
+src/Michelf/*
+src/.gitignore
 
 # JIRA plugin
 atlassian-ide-plugin.xml

src/PHPDraft/Out/HTML/default.phtml

@@ -238,7 +238,10 @@ $base = $this->categories;
                                                     Response <var
                                                         class="<?= $this->get_response_status($response->statuscode) ?>"><?= $response->statuscode; ?></var>
                                                     <span
-                                                        class="glyphicon indicator glyphicon-menu-down pull-right"></span>
+                                                        class="glyphicon
+                                                        indicator
+                                                        glyphicon-menu-<?php if ($key < 1): ?>down<?php else: ?>up<?php endif; ?>
+                                                        pull-right"></span>
                                                 </h4>
                                             </div>
                                             <div
@@ -312,22 +315,22 @@ $base = $this->categories;
         </div>
     </div>
 </div>
-<?php $extras = array_filter($this->base_data, function ($value){
+<?php $extras = array_filter($this->base_data, function ($value) {
     return !in_array($value, ['HOST', 'TITLE', 'ALT_HOST', 'FORMAT', 'DESC']);
 }, ARRAY_FILTER_USE_KEY);
 if (!empty($extras)):
-    $extras['host']=$this->base_data['HOST'];?>
+    $extras['host'] = $this->base_data['HOST']; ?>
     <button
         type="button"
         class="btn btn-lg extra-info"
         data-toggle="popover"
         title="Extra info"
         data-placement="top"
         data-html="true"
-        data-content="<?php foreach ($extras as $key=>$value): ?><p><?= $key;?>: <?= $value;?></p><?php endforeach;?>">
+        data-content="<?php foreach ($extras as $key => $value): ?><p><?= $key; ?>: <?= $value; ?></p><?php endforeach; ?>">
         <span class="glyphicon glyphicon-question-sign"></span>
     </button>
-<?php endif;?>
+<?php endif; ?>
 <?php foreach ($this->js as $js): ?>
     <script src="<?= $js ?>"></script>
 <?php endforeach; ?>

src/PHPDraft/Out/TemplateGenerator.php

@@ -85,6 +85,10 @@ public function __construct($template, $image)
     public function get($object)
     {
         $include = null;
+        if (stream_resolve_include_path('templates' . DIRECTORY_SEPARATOR . $this->template . DIRECTORY_SEPARATOR . $this->template . '.phtml')) {
+            $include =
+                'templates' . DIRECTORY_SEPARATOR . $this->template . DIRECTORY_SEPARATOR . $this->template . '.phtml';
+        }
         if (stream_resolve_include_path($this->template . DIRECTORY_SEPARATOR . $this->template . '.phtml')) {
             $include = $this->template . DIRECTORY_SEPARATOR . $this->template . '.phtml';
         }
@@ -113,11 +117,13 @@ public function get($object)
                     continue;
                 }
 
-                $cat                = new Category();
-                $this->categories[] = $cat->parse($value);
+                $cat = new Category();
+                $cat = $cat->parse($value);
 
                 if ($value->meta->classes[0] === 'dataStructures') {
                     $this->base_structures = array_merge($this->base_structures, $cat->structures);
+                } else {
+                    $this->categories[] = $cat;
                 }
             }
 
@@ -127,12 +133,14 @@ public function get($object)
             ksort($this->base_structures);
         }
         if ($this->sorting === UI::$PHPD_SORT_OPT_ALL || $this->sorting === UI::$PHPD_SORT_OPT_WEBSERVICES) {
-            usort($this->categories[0]->children, function ($a, $b) {
-                return strcmp($a->title, $b->title);
-            });
+            foreach ($this->categories as &$category) {
+                usort($category->children, function ($a, $b) {
+                    return strcmp($a->title, $b->title);
+                });
+            }
         }
 
-        include_once $include;
+        require_once $include;
     }
 
     /**