Merge pull request #41 from SMillerDev/http/statuscodes

Http/statuscodes

Author: SMillerDev

.travis.yml

@@ -2,11 +2,13 @@ language: php
 php:
 - '5.6'
 - '7.0'
+- '7.1'
+- '7.2'
+- nightly
 before_script:
 - composer -n install
-- if [[ ${TRAVIS_PHP_VERSION:0:3} == "5.6" ]]; then pecl install runkit; fi
+- if [[ ${TRAVIS_PHP_VERSION:0:3} == "5.6" ]]; then pecl install runkit; else pecl install uopz; fi
 - if [[ ${TRAVIS_PHP_VERSION:0:3} == "5.6" ]]; then echo "runkit.internal_override=1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi
-- if [[ ${TRAVIS_PHP_VERSION:0:3} == "7.0" ]]; then pecl install uopz; fi
 - export PATH=$PATH:$PWD
 script: vendor/bin/phpunit --configuration tests/phpunit.xml
 before_deploy:

composer.json

@@ -19,7 +19,7 @@
     "php": "5.6.* || 7.*",
     "ql/uri-template": "1.*",
     "michelf/php-markdown": "1.*",
-    "enjoy/http-status-code": "master-dev"
+    "lukasoppermann/http-status": "^1.0@dev"
   },
   "require-dev": {
     "phpunit/phpunit": "5.7.*",

src/PHPDraft/Out/HTML/default.phtml

@@ -231,7 +231,7 @@ use Enjoy\HttpStatusCode\Statuscodes;
                                                     data-toggle="collapse"
                                                     data-target="#request-coll--<?= $transition->get_href() . '-' . $response->statuscode; ?>">
                                                     Response <var
-                                                        class="<?= $this->get_response_status($response->statuscode) ?>"><?= StatusCodes::getMessageForCode($response->statuscode)?></var>
+                                                        class="<?= $this->get_response_status($response->statuscode) ?>"><?= $response->statuscode." ".$this->http_status->getReasonPhrase($response->statuscode)?></var>
                                                     <span
                                                         class="glyphicon
                                                         indicator

src/PHPDraft/Out/HTML/material.phtml

@@ -98,7 +98,7 @@ use Enjoy\HttpStatusCode\Statuscodes;
                                     <?php foreach ($transition->responses as $key => $response): ?>
                                         <a href="#<?= $transition->get_href() . '-' . $response->statuscode; ?>-panel"
                                            class="mdl-tabs__tab <?= $this->get_response_status($response->statuscode) ?>"
-                                            title="<?= StatusCodes::getMessageForCode($response->statuscode)?>"><?= $response->statuscode; ?></a>
+                                            title="<?= $response->statuscode." ".$this->http_status->getReasonPhrase($response->statuscode)?>"><?= $response->statuscode; ?></a>
                                     <?php endforeach;?>
                                 <?php endif;?>
                                     </div>

src/PHPDraft/Out/TemplateGenerator.php

@@ -8,6 +8,7 @@
 
 namespace PHPDraft\Out;
 
+use Lukasoppermann\Httpstatus\Httpstatus;
 use Michelf\MarkdownExtra;
 use PHPDraft\Model\Category;
 use PHPDraft\Model\Elements\ObjectStructureElement;
@@ -56,6 +57,12 @@ class TemplateGenerator
      * @var
      */
     protected $base_data;
+    /**
+     * The Http Status resolver
+     *
+     * @var Httpstatus
+     */
+    protected $http_status;
     /**
      * Structures used in all data
      *
@@ -73,6 +80,7 @@ public function __construct($template, $image)
     {
         $this->template = $template;
         $this->image    = $image;
+        $this->http_status = new Httpstatus();
     }
 
     /**