From 1997e9f187796231b50c1c466bc399021ddd834d Mon Sep 17 00:00:00 2001
From: Serghei Iakovlev <sadhooklay@gmail.com>
Date: Sat, 2 Nov 2019 13:39:50 +0200
Subject: [PATCH] Cleaned up API templates

---
 templates/Api/themes/api-base/theme.json      |  6 +-
 .../zephir/partials/class/content.phtml       | 62 +++++++++++--------
 .../partials/class/method-details.phtml       | 23 ++++---
 .../class/method-summary-params.phtml         |  4 +-
 templates/Api/themes/zephir/theme.json        |  8 +--
 5 files changed, 54 insertions(+), 49 deletions(-)

diff --git a/templates/Api/themes/api-base/theme.json b/templates/Api/themes/api-base/theme.json
index 8c646d3dca..d32cdc13eb 100644
--- a/templates/Api/themes/api-base/theme.json
+++ b/templates/Api/themes/api-base/theme.json
@@ -1,11 +1,7 @@
 {
-
   "javascript" : [
-
     "api_definition.js",
     "static/jquery.min.js",
     "static/zephir-doc.js"
-
   ]
-
-}
\ No newline at end of file
+}
diff --git a/templates/Api/themes/zephir/partials/class/content.phtml b/templates/Api/themes/zephir/partials/class/content.phtml
index 8e74df144f..2dde01a6fd 100644
--- a/templates/Api/themes/zephir/partials/class/content.phtml
+++ b/templates/Api/themes/zephir/partials/class/content.phtml
@@ -1,55 +1,63 @@
 <?php
-
-    $items = array(
-        array("name" => "Classes" , "url" => "/classes.html" ),
-        $items[] = array("name" => $fullName)
-    );
+/**
+ * @var string $fullName
+ * @var string $className
+ * @var array $methods
+ * @var string[] $namespacePieces
+ * @var Zephir\ClassDefinition $classDefinition
+ * @var Zephir\CompilerFile $compilerFile
+ */
+
+$items = [
+    ['name' => 'Classes' , 'url' => '/classes.html'],
+    $items[] = ['name' => $fullName]
+];
 ?>
 
-<?= $this->partial("partials/breadcrumb.phtml",array("items"=> $items)) ?>
+<?= $this->partial('partials/breadcrumb.phtml', ['items'=> $items]) ?>
 
 <div class="class-header clearfix">
-    
-    
+
     <div class="access-buttons">
         <a class="zep-button" href="<?= $this->url(Zephir\Documentation::sourceUrl($classDefinition)) ?>">Source</a>
-
-        <?php if($this->themeOption("github")){ ?>
-        <a class="zep-button" href="<?= $this->themeOption("github") . "/tree/master/" . $compilerFile->getFilePath() ?>">Github</a>
+        <?php if ($this->themeOption('github')) { ?>
+        <a class="zep-button"
+           href="<?= rtrim($this->themeOption('github'), '/') . "/tree/master/{$compilerFile->getFilePath()}" ?>">
+            GitHub
+        </a>
         <?php } ?>
     </div>
     
     <div class="class-full-name">
-        
         <span class="class-type">Class</span>
         
-        <?php foreach($namespacePieces as $nsname => $nspath){ ?>
+        <?php foreach ($namespacePieces as $nsname => $nspath) { ?>
         <span class="namespace-piece">
-            <a href="<?= $this->url(Zephir\Documentation::namespaceUrl($nspath)) ?>"><?=$nsname?></a>
+            <a href="<?= $this->url(Zephir\Documentation::namespaceUrl($nspath)) ?>">
+                <?=$nsname?>
+            </a>
         </span>
         <?php } ?>
+
         <h1 class="class-name"><?= $className ?></h1>
     </div>
-
 </div>
 
 
 <div class="hidden-anchor"  id="methods"></div>
 <div class="methods-summary standard-bandeau">Methods</div>
-<ul class="method-summary-list">
-    <?php foreach($methods as $method){ ?>
-
-        <?= $this->partial("partials/class/method-summary.phtml",array("method"=>$method)) ?>
 
-    <?php } ?>
+<ul class="method-summary-list">
+    <?php foreach ($methods as $method): ?>
+        <?= $this->partial('partials/class/method-summary.phtml', ['method' => $method]) ?>
+    <?php endforeach; ?>
 </ul>
 
-<div class="hidden-anchor"  id="methods-details"></div>
+<div class="hidden-anchor" id="methods-details"></div>
 <div class="methods-summary standard-bandeau">Methods Details</div>
-<ul class="method-details-list">
-    <?php foreach($methods as $method){ ?>
 
-        <?= $this->partial("partials/class/method-details.phtml",array("method"=>$method)) ?>
-
-    <?php } ?>
-</ul>
\ No newline at end of file
+<ul class="method-details-list">
+    <?php foreach ($methods as $method): ?>
+        <?= $this->partial('partials/class/method-details.phtml', ['method' => $method]) ?>
+    <?php endforeach; ?>
+</ul>
diff --git a/templates/Api/themes/zephir/partials/class/method-details.phtml b/templates/Api/themes/zephir/partials/class/method-details.phtml
index 55c71aaba5..578291f48e 100644
--- a/templates/Api/themes/zephir/partials/class/method-details.phtml
+++ b/templates/Api/themes/zephir/partials/class/method-details.phtml
@@ -1,21 +1,27 @@
 <?php
-/* @var $method \Zephir\ClassMethod */
-
-$visibilities = $method->getVisibility();
-$docblock =  $method->getParsedDocBlock();
+/**
+ * @var Zephir\ClassMethod $method
+ */
 ?>
 
 <li class="class-method clearfix">
     <div class="hidden-anchor" id="method-details-<?= $method->getName() ?>"></div>
     <div class="method-details">
         <div class="method-details-details">
-            <div class="method-signature">
-                <?php foreach($visibilities as $visibility): ?>
+
+            <p class="method-signature">
+                <?php foreach ($method->getVisibility() as $visibility): ?>
                     <span class="visibility-<?= $visibility ?> keyword"><?= $visibility ?></span>
                 <?php endforeach; ?>
-                <span class="keyword">function</span>&nbsp;<span class="method-name"><?= $method->getName() ?></span>(<?= $this->partial("partials/class/method-summary-params.phtml" ) ?>)
-            </div>
+                <span class="keyword">function</span>
+                <!-- method-details -->
+                <!-- Do not remove comments below. It's a trick to remove the spaces. -->
+                <span class="method-name"><?= $method->getName() ?></span><!--
+                -->(<?= $this->partial('partials/class/method-summary-params.phtml') ?>)
+            </p>
+
             <div class="method-doc">
+                <?php $docblock =  $method->getParsedDocBlock(); ?>
                 <?php if ($docblock):  ?>
                     <div class="summary">
                         <?= $docblock->getSummary() ?>
@@ -25,6 +31,7 @@ $docblock =  $method->getParsedDocBlock();
                     </div>
                 <?php endif; ?>
             </div>
+
         </div>
     </div>
 </li>
diff --git a/templates/Api/themes/zephir/partials/class/method-summary-params.phtml b/templates/Api/themes/zephir/partials/class/method-summary-params.phtml
index 52d0db32ea..f4f36fbf68 100644
--- a/templates/Api/themes/zephir/partials/class/method-summary-params.phtml
+++ b/templates/Api/themes/zephir/partials/class/method-summary-params.phtml
@@ -1,6 +1,6 @@
 <?php
 /**
- * @var $method \Zephir\ClassMethod
+ * @var $method Zephir\ClassMethod
  */
 
 if ($method->getParameters()) {
@@ -16,5 +16,5 @@ if ($method->getParameters()) {
         $i++;
     }
 
-    echo trim(join(', ', $parameters));
+    echo trim(implode(', ', $parameters));
 }
diff --git a/templates/Api/themes/zephir/theme.json b/templates/Api/themes/zephir/theme.json
index 838a06582f..337e567bda 100644
--- a/templates/Api/themes/zephir/theme.json
+++ b/templates/Api/themes/zephir/theme.json
@@ -1,18 +1,12 @@
 {
-
   "extends" : "api-base",
 
   "javascript" : [
-
     "static/prettify.js"
-
   ],
 
   "css" : [
-
     "static/prettify.css",
     "static/zephir-theme.css"
-
   ]
-
-}
\ No newline at end of file
+}