Move from drafter v3 to v4.

Issue #47,#73,#74

Author: SMillerDev

composer.json

@@ -18,7 +18,7 @@
     }
   ],
   "require": {
-    "php": "~7.2",
+    "php": "^7.2",
     "ql/uri-template": "~1.0",
     "vanilla/garden-cli": "~2.0",
     "michelf/php-markdown": "~1.9",
@@ -32,7 +32,7 @@
     "theseer/autoload": "~1.0",
     "phing/phing": "~2.0",
     "phpstan/phpstan-phpunit": "^0.12.6",
-    "phpstan/phpstan": "^0.12.8"
+    "phpstan/phpstan": "^0.12.17"
   },
   "scripts": {
     "test": [

composer.lock

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * Set up include path for source handling
  */

phpdraft

@@ -1,5 +1,10 @@
 parameters:
 	bootstrap: tests/test.bootstrap.inc.php
+	excludes_analyse:
+		- src/PHPDraft/Out/Version.php
+		- src/PHPDraft/Parse/Tests/BaseParserTest.php
+		- src/PHPDraft/Parse/Tests/DrafterTest.php
+		- src/PHPDraft/Parse/Tests/DrafterAPITest.php
 	ignoreErrors:
 		- '#Access to an undefined property object::\$[a-zA-Z0-9\\_]+#'
 		- '#Access to an undefined property PHPUnit\\Framework\\MockObject\\MockObject::\$[a-zA-Z0-9_]+#'

phpstan.neon

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * This file contains the Autoloader.
@@ -12,7 +13,7 @@
  * Autoload classes according to PSR-1.
  */
 spl_autoload_register(
-    function ($classname) {
+    function (string $classname): void {
         $classname = ltrim($classname, '\\');
         preg_match('/^(.+)?([^\\\\]+)$/U', $classname, $match);
         $classname = str_replace('\\', '/', $match[1]) . str_replace(['\\', '_'], '/', $match[2]) . '.php';

src/PHPDraft/Core/Autoloader.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * This file contains the ApibFileParser.
@@ -65,6 +66,16 @@ public function parse(): self
         return $this;
     }
 
+    /**
+     * Set apib content.
+     *
+     * @param string $content The content
+     */
+    public function set_apib_content(string $content): void
+    {
+        $this->full_apib = $content;
+    }
+
     /**
      * Parse a given API Blueprint file
      * This changes all `include(file)` tags to the contents of the file.
@@ -152,13 +163,23 @@ private function get_schema(string $url): string
         return $result;
     }
 
+    /**
+     * Return the value of the file.
+     *
+     * @return string
+     */
+    public function content(): string
+    {
+        return $this->full_apib;
+    }
+
     /**
      * Return the value of the class.
      *
      * @return string
      */
     public function __toString(): string
     {
-        return $this->full_apib;
+        return $this->content();
     }
 }

src/PHPDraft/In/ApibFileParser.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * This file contains the Category.php.
@@ -55,10 +56,10 @@ public function parse(stdClass $object)
                     $deps         = [];
                     $struct       = new ObjectStructureElement();
                     $struct->deps = $deps;
-                    $struct->parse($item, $deps);
+                    $struct->parse($item->content, $deps);
 
-                    if (is_array($item->content) && isset($item->content[0]->meta->id)) {
-                        $this->structures[$item->content[0]->meta->id] = $struct;
+                    if (isset($item->content->content) && is_array($item->content->content) && isset($item->content->content[0]->meta->id)) {
+                        $this->structures[$item->content->content[0]->meta->id] = $struct;
                     } elseif (isset($item->content->meta->id->content)) {
                         $this->structures[$item->content->meta->id->content] = $struct;
                     } else {

src/PHPDraft/Model/Category.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Created by PhpStorm.

src/PHPDraft/Model/Comparable.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * This file contains the ArrayStructureElement.php.
@@ -18,14 +19,14 @@ class ArrayStructureElement extends BasicStructureElement
     /**
      * Parse an array object.
      *
-     * @param object $object       APIB Item to parse
-     * @param array  $dependencies List of dependencies build
+     * @param object|null $object       APIB Item to parse
+     * @param array       $dependencies List of dependencies build
      *
      * @return self Self reference
      */
-    public function parse(object $object, array &$dependencies): StructureElement
+    public function parse(?object $object, array &$dependencies): StructureElement
     {
-        $this->element = (isset($object->element)) ? $object->element : 'array';
+        $this->element = $object->element ?? 'array';
 
         $this->parse_common($object, $dependencies);
 
@@ -40,7 +41,9 @@ public function parse(object $object, array &$dependencies): StructureElement
                 $dependencies[] = $sub_item->element;
             }
 
-            $this->value[] = (isset($sub_item->element)) ? $sub_item->element : '';
+            $key   = $sub_item->element ?? 'any';
+            $value = $sub_item->content ?? NULL;
+            $this->value[] = [$value => $key];
         }
 
         $this->deps = $dependencies;
@@ -62,13 +65,16 @@ public function __toString(): string
         }
 
         foreach ($this->value as $item) {
-            $type = (in_array($item, self::DEFAULTS)) ? $item : '<a href="#object-' . str_replace(
+            $value = key($item);
+            $key = $item[$value];
+            $type = (in_array($key, self::DEFAULTS)) ? "<code>$key</code>" : '<a href="#object-' . str_replace(
                 ' ',
                 '-',
-                strtolower($item)
-            ) . '">' . $item . '</a>';
+                strtolower($key)
+            ) . '">' . $key . '</a>';
 
-            $return .= '<li class="list-group-item mdl-list__item">' . $type . '</li>';
+            $value = empty($value) ? '' : " - <span class=\"example-value pull-right\">$value</span>";
+            $return .= '<li class="list-group-item mdl-list__item">' . $type . $value . '</li>';
         }
 
         $return .= '</ul>';