Updating phpunit to a version that's still used

Author: SMillerDev

.travis.yml

@@ -8,6 +8,7 @@ php:
 env: # important!
 matrix:
   allow_failures:
+  - php: 5.6
   - php: nightly
 
 before_script:

composer.json

@@ -24,7 +24,7 @@
     "lukasoppermann/http-status": "2.*"
   },
   "require-dev": {
-    "phpunit/phpunit": "5.7.*",
+    "phpunit/phpunit": "7.*",
     "theseer/autoload": "1.*"
   },
   "autoload": {

src/PHPDraft/In/ApibFileParser.php

@@ -9,6 +9,8 @@
 
 namespace PHPDraft\In;
 
+use PHPDraft\Parse\ExecutionException;
+
 /**
  * Class ApibFileParser.
  */
@@ -92,7 +94,7 @@ private function get_apib($filename)
     private function file_check($filename)
     {
         if (!file_exists($filename)) {
-            throw new \RuntimeException("API File not found: $filename", 1);
+            throw new ExecutionException("API File not found: $filename", 1);
         }
     }
 

src/PHPDraft/In/Tests/ApibFileParserTest.php

@@ -53,7 +53,7 @@ public function testFilenameSetup()
 
     /**
      * Test if exception when the file doesn't exist
-     * @expectedException \RuntimeException
+     * @expectedException \PHPDraft\Parse\ExecutionException
      * @expectedExceptionCode 1
      * @expectedExceptionMessageRegExp "API File not found: [\w\W]*\/drafter\/non_existing_including_apib"
      *

src/PHPDraft/Out/TemplateGenerator.php

@@ -13,6 +13,7 @@
 use Michelf\MarkdownExtra;
 use PHPDraft\Model\Category;
 use PHPDraft\Model\Elements\ObjectStructureElement;
+use PHPDraft\Parse\ExecutionException;
 
 class TemplateGenerator
 {
@@ -98,7 +99,7 @@ public function get($object)
     {
         $include = $this->find_include_file($this->template);
         if ($include === NULL) {
-            throw new \RuntimeException("Couldn't find template '$this->template'", 1);
+            throw new ExecutionException("Couldn't find template '$this->template'", 1);
         }
 
         //Prepare base data

src/PHPDraft/Out/UI.php

@@ -9,6 +9,8 @@
 
 namespace PHPDraft\Out;
 
+use PHPDraft\Parse\ExecutionException;
+
 /**
  * Class UI.
  */
@@ -50,7 +52,7 @@ public static function main($argv = [])
             file_put_contents('php://stderr', 'Not enough arguments' . PHP_EOL);
             (new self())->help();
 
-            throw new \RuntimeException('', 1);
+            throw new ExecutionException('', 1);
         }
 
         $sorting = -1;
@@ -65,19 +67,19 @@ public static function main($argv = [])
             if (isset($options['h'])) {
                 (new self())->help();
 
-                throw new \RuntimeException('', 0);
+                throw new ExecutionException('', 0);
             }
 
             if (isset($options['v'])) {
                 (new self())->version();
 
-                throw new \RuntimeException('', 0);
+                throw new ExecutionException('', 0);
             }
 
             if (isset($options['f'])) {
                 $file = $options['f'];
             } else {
-                throw new \RuntimeException('No file to parse', 1);
+                throw new ExecutionException('No file to parse', 1);
             }
         } else {
             $file = $argv[1];

src/PHPDraft/Parse/BaseParser.php

@@ -76,7 +76,7 @@ public function parseToJson()
         if (json_last_error() !== JSON_ERROR_NONE) {
             file_put_contents('php://stderr', 'ERROR: invalid json in ' . $this->tmp_dir . '/index.json');
 
-            throw new \RuntimeException('Drafter generated invalid JSON (' . json_last_error_msg() . ')', 2);
+            throw new ExecutionException('Drafter generated invalid JSON (' . json_last_error_msg() . ')', 2);
         }
 
         $warnings = FALSE;
@@ -91,7 +91,7 @@ public function parseToJson()
         }
 
         if ($warnings) {
-            throw new \RuntimeException('Parsing encountered errors and stopped', 2);
+            throw new ExecutionException('Parsing encountered errors and stopped', 2);
         }
 
         return $this->json;

src/PHPDraft/Parse/ExecutionException.php

@@ -0,0 +1,19 @@
+<?php
+/**
+ * This file contains the ExecutionException.php.
+ *
+ * @package PHPDraft\Parse
+ *
+ * @author  Sean Molenaar<[email protected]>
+ */
+
+namespace PHPDraft\Parse;
+
+/**
+ * Class ExecutionException.
+ *
+ * @package Parse
+ */
+class ExecutionException extends \Exception
+{
+}

src/PHPDraft/Parse/Tests/BaseParserTest.php

@@ -9,7 +9,6 @@
 namespace PHPDraft\Parse\Tests;
 
 use PHPDraft\Core\BaseTest;
-use PHPDraft\Parse\Drafter;
 use ReflectionClass;
 
 /**
@@ -115,7 +114,7 @@ public function testParseToJSONMkTmp()
      * Check if parsing the fails when invalid JSON
      *
      * @covers                   \PHPDraft\Parse\Drafter::parseToJson()
-     * @expectedException \RuntimeException
+     * @expectedException        \PHPDraft\Parse\ExecutionException
      * @expectedExceptionMessage Drafter generated invalid JSON (ERROR)
      * @expectedExceptionCode    2
      */

src/PHPDraft/Parse/Tests/DrafterAPITest.php

@@ -9,10 +9,9 @@
 namespace PHPDraft\Parse\Tests;
 
 use PHPDraft\Core\BaseTest;
-use PHPDraft\Parse\Drafter;
 use PHPDraft\Parse\DrafterAPI;
+
 use ReflectionClass;
-use SebastianBergmann\GlobalState\RuntimeException;
 
 /**
  * Class DrafterAPITest
@@ -66,7 +65,7 @@ public function testSetupCorrectly()
     /**
      * Test if the value the class is initialized with is correct
      *
-     * @expectedException RuntimeException
+     * @expectedException \PHPDraft\Parse\ResourceException
      * @expectedExceptionMessage Drafter webservice is not available!
      * @expectedExceptionCode    1
      */
@@ -92,7 +91,7 @@ public function testPreRunStringIsEmpty()
      * Check if parsing the fails without drafter
      *
      * @covers                   \PHPDraft\Parse\DrafterAPI::parseToJson()
-     * @expectedException \RuntimeException
+     * @expectedException        \PHPDraft\Parse\ResourceException
      * @expectedExceptionMessage Drafter webservice failed to parse input
      * @expectedExceptionCode    1
      */