Fixing unittests

Author: SMillerDev

.gitignore

@@ -5,6 +5,7 @@
 /build/logs
 /build/phar
 /build/*.phar
+/tests/statics/index.*
 
 # JIRA plugin
 atlassian-ide-plugin.xml

.travis.yml

@@ -1,7 +1,8 @@
 language: php
 php:
-  - '5.5'
   - '5.6'
-  - '7.0'
-  - '7.1'
+
+before_script:
+  - pecl install runkit
+  - echo "runkit.internal_override=1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
 script: phpunit --configuration tests/phpunit.xml

index.php

@@ -11,15 +11,15 @@
 require_once 'PHPDraft/Core/Autoloader.php';
 use PHPDraft\In\ApibFileParser;
 use PHPDraft\Out\UI;
-use PHPDraft\Parse\ApibToJson;
+use PHPDraft\Parse\Drafter;
 use PHPDraft\Parse\JsonToHTML;
 
 define('VERSION', '0');
 
 $values = UI::main($argv);
 
 $apib = new ApibFileParser($values['file']);
-$json = new ApibToJson($apib);
+$json = new Drafter($apib);
 $html = new JsonToHTML($json->parseToJson());
 $html->get_html($values['template'], $values['image']);
 

src/PHPDraft/Core/TestBase.php

@@ -0,0 +1,50 @@
+<?php
+/**
+ * This file contains the TestBase.php
+ *
+ * @package php-drafter\SOMETHING
+ * @author  Sean Molenaar<[email protected]>
+ */
+
+namespace PHPDraft\Core;
+
+
+use PHPUnit_Framework_TestCase;
+use ReflectionClass;
+
+class TestBase extends PHPUnit_Framework_TestCase
+{
+    const FUNCTION_ID = '_phpdraftbu';
+    /**
+     * Test Class
+     * @var mixed
+     */
+    protected $class;
+
+    /**
+     * Test reflection
+     * @var ReflectionClass
+     */
+    protected $reflection;
+
+    protected function mock_function($name, $mock)
+    {
+        if (function_exists($name . self::FUNCTION_ID) === FALSE)
+        {
+            runkit_function_copy($name, $name . self::FUNCTION_ID);
+        }
+        runkit_function_redefine($name, '', $mock);
+    }
+    /**
+     * Unmock a PHP function.
+     *
+     * @param String $name Function name
+     *
+     * @return void
+     */
+    protected function unmock_function($name)
+    {
+        runkit_function_remove($name);
+        runkit_function_rename($name . self::FUNCTION_ID, $name);
+    }
+}

src/PHPDraft/Model/Tests/DataStructureElementTest.php

@@ -9,23 +9,12 @@
 namespace PHPDraft\Model\Tests;
 
 
+use PHPDraft\Core\TestBase;
 use PHPDraft\Model\DataStructureElement;
-use PHPUnit_Framework_TestCase;
 use ReflectionClass;
 
-class DataStructureElementTest extends PHPUnit_Framework_TestCase
+class DataStructureElementTest extends TestBase
 {
-    /**
-     * Test Class
-     * @var DataStructureElement
-     */
-    protected $class;
-
-    /**
-     * Test reflection
-     * @var ReflectionClass
-     */
-    protected $reflection;
 
     public function setUp()
     {

src/PHPDraft/Parse/ApibToJson.php renamed to src/PHPDraft/Parse/Drafter.php

@@ -1,22 +1,27 @@
 <?php
 /**
- * This file contains the ApibToJson.php
+ * This file contains the Drafter.php
  *
  * @package PHPDraft\Parse
  * @author  Sean Molenaar<[email protected]>
  */
 
 namespace PHPDraft\Parse;
 
-class ApibToJson
+class Drafter
 {
+    /**
+     * The API Blueprint output (JSON)
+     *
+     * @var string
+     */
+    public $json;
     /**
      * Configuration
      *
      * @var array
      */
     protected $config;
-
     /**
      * The API Blueprint input
      *
@@ -25,11 +30,11 @@ class ApibToJson
     protected $apib;
 
     /**
-     * The API Blueprint output (JSON)
+     * The location of the drafter executable
      *
      * @var string
      */
-    public $json;
+    protected $drafter;
 
     /**
      * ApibToJson constructor.
@@ -39,8 +44,27 @@ class ApibToJson
     public function __construct($apib)
     {
         global $config;
-        $this->config = $config;
+        $this->config = &$config;
         $this->apib   = $apib;
+
+        if (!$this->location())
+        {
+            throw new \RuntimeException("Drafter was not installed!", 1);
+        }
+        $this->drafter = $this->location();
+    }
+
+    /**
+     * Return drafter location if found
+     *
+     * @return bool|string
+     */
+    function location()
+    {
+        $returnVal = shell_exec('which drafter 2> /dev/null');
+        $returnVal = preg_replace('/^\s+|\n|\r|\s+$/m', '', $returnVal);
+
+        return (empty($returnVal) ? FALSE : $returnVal);
     }
 
     /**
@@ -58,20 +82,16 @@ public function parseToJson()
         }
 
         file_put_contents($tmp_dir . '/index.apib', $this->apib);
-        if (!$this->drafter_location())
-        {
-            file_put_contents('php://stderr', "Drafter was not installed!\n");
-            exit(1);
-        }
 
-        shell_exec($this->drafter_location() . ' ' . $tmp_dir . '/index.apib -f json -o ' . $tmp_dir . '/index.json 2> /dev/null');
+        shell_exec($this->drafter . ' ' . $tmp_dir . '/index.apib -f json -o ' . $tmp_dir . '/index.json 2> /dev/null');
         $this->json = json_decode(file_get_contents($tmp_dir . '/index.json'));
+
         if (json_last_error() !== JSON_ERROR_NONE)
         {
-            file_put_contents('php://stderr', "Drafter generated invalid JSON!\n" . json_last_error_msg() . "\n");
-            file_put_contents('php://stdout', file_get_contents($tmp_dir . '/index.json') . "\n");
-            exit(2);
+            file_put_contents('php://stdout', "ERROR: invalid json in " . $tmp_dir . '/index.json');
+            throw new \RuntimeException("Drafter generated invalid JSON (" . json_last_error_msg() . ")", 2);
         }
+
         $warnings = FALSE;
         foreach ($this->json->content as $item)
         {
@@ -85,24 +105,10 @@ public function parseToJson()
         }
         if ($warnings)
         {
-            file_put_contents('php://stderr', "Parsing encountered errors and stopped\n");
-            exit(2);
+            throw new \RuntimeException("Parsing encountered errors and stopped", 2);
         }
 
         return $this->json;
     }
 
-    /**
-     * Return drafter location if found
-     *
-     * @return bool|string
-     */
-    function drafter_location()
-    {
-        $returnVal = shell_exec('which drafter 2> /dev/null');
-        $returnVal = preg_replace('/^\s+|\n|\r|\s+$/m', '', $returnVal);
-
-        return (empty($returnVal) ? FALSE : $returnVal);
-    }
-
 }