Merge pull request #8 from UrosPurtic/master

update runner with application version number

Author: ppavlovic

composer.json

@@ -33,7 +33,8 @@
         "g4/profiler"    : ">=1.10.0",
         "g4/factory"     : "1.*",
         "twig/twig"      : "1.*",
-        "twig/extensions": "^1.2"
+        "twig/extensions": "^1.2",
+        "g4/version": "^0.0.2"
     },
     "require-dev": {
         "phpunit/phpunit"           : "5.*",
@@ -60,4 +61,4 @@
             "./vendor/bin/phpcbf --colors --standard=PSR2 src/"
         ]
     }
-}
+}

src/Presenter/DataTransfer.php

@@ -30,13 +30,32 @@ class DataTransfer
      */
     private $response;
 
+    /**
+     * @var string|null
+     */
+    private $version;
 
-    public function __construct(HttpRequest $httpRequest, Profiler $profiler, Request $request, Response $response)
-    {
+
+    public function __construct(
+        HttpRequest $httpRequest,
+        Profiler $profiler,
+        Request $request,
+        Response $response,
+        string $version = null
+    ){
         $this->httpRequest  = $httpRequest;
         $this->profiler     = $profiler;
         $this->request      = $request;
         $this->response     = $response;
+        $this->version      = $version;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getVersion()
+    {
+        return $this->version;
     }
 
     /**
@@ -70,4 +89,4 @@ public function getResponse()
     {
         return $this->response;
     }
-}
+}

src/Presenter/Formatter/FormatterAbstract.php

@@ -30,6 +30,7 @@ public function getBasicData()
         return [
             'code'     => $this->getDataTransfer()->getResponse()->getHttpResponseCode(),
             'message'  => $this->getDataTransfer()->getResponse()->getHttpMessage(),
+            'app_version' => $this->getDataTransfer()->getVersion(),
             'response' => $this->getDataTransfer()->getResponse()->getResponseObject(),
             'env'      => defined(APPLICATION_ENV) ? APPLICATION_ENV : null,
         ];

src/RunnerAbstract.php

@@ -11,6 +11,7 @@
 use G4\Runner\Presenter\HeaderAccept;
 use G4\Runner\Route\Route;
 use G4\Runner\Route\RouteFormatter;
+use G4\Version\Version;
 
 abstract class RunnerAbstract implements RunnerInterface
 {
@@ -65,6 +66,11 @@ abstract class RunnerAbstract implements RunnerInterface
      */
     private $route;
 
+    /**
+     * @var string|null
+     */
+    private $version;
+
     public function __construct($headerAccept = null)
     {
         $this->profiler          = new Profiler();
@@ -105,7 +111,7 @@ public function getApplicationService()
      */
     public function getHttpRequest()
     {
-        if(null === $this->httpRequest) {
+        if (null === $this->httpRequest) {
             $this->httpRequest = new \G4\Http\Request();
         }
         return $this->httpRequest;
@@ -145,6 +151,12 @@ public function getRequestLogger()
         return $this->logger;
     }
 
+    public function setApplicationVersion(Version $version)
+    {
+        $this->version = $version->getVersionNumber();
+        return $this;
+    }
+
     public function registerFormatterBasic(FormatterInterface $formatter)
     {
         $this->responseFormatter->addBasic($formatter);
@@ -158,7 +170,7 @@ public function registerFormatterVerbose(FormatterInterface $formatter)
     }
 
     //TODO: Drasko: refactor this!
-    public final function run()
+    final public function run()
     {
         $this->route();
         $this->parseApplicationMethod();
@@ -169,7 +181,7 @@ public final function run()
 
         $this->application->run();
 
-        if(!$this->headerAccept instanceof HeaderAccept) {
+        if (!$this->headerAccept instanceof HeaderAccept) {
             $allowedMedia = $this->application->getBootstrapFactory()->getBootstrap()->getAllowedMedia();
             $this->headerAccept = new HeaderAccept($allowedMedia);
         }
@@ -198,13 +210,15 @@ private function getDataTransfer()
             $this->getHttpRequest(),
             $this->profiler,
             $this->application->getRequest(),
-            $this->application->getResponse());
+            $this->application->getResponse(),
+            $this->version ?: null
+        );
     }
 
     private function getReqParams()
     {
         $params = $this->getHttpRequest()->getParams();
-        if(isset($this->routerOptions['url_part']) && is_array($params)){
+        if (isset($this->routerOptions['url_part']) && is_array($params)) {
             $params['url_part'] = $this->routerOptions['url_part'];
         }
         return $params;