1.1 dev (#19)

* Add vagrant development environment * Fix typo * Fix #14 Delegate request content type to response * Update changelog * Fix #16 fix output buffer termination add shutdown event rename `Application::cleanUp` to `Application::collectGarbage` rename `Application::finishRequest` to `Application::shutdown` * Fix code style. Fluent setter update * Fix #17 Add logic for forcing response emitting * Fix #15 Enhance error handling logic * update content delegation * update loggers * log errors on runtime errors * fix typo * fix typo * Fix #3, #4, #5 * Update Application.php * Fix wrong response determined by content type delegation * remove unused tests

Author: mbunge

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Blast Turbine Changelog
 
+## 1.1.7
+
+### Altered
+
+ - Fix wrong response determined by content type delegation
+ 
 ## 1.1.6
 
 ### Added

src/Application.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Turbine Micro Framework. An advanced derivate of The Proton Micro Framework.
+ * The Turbine Micro framework. An advanced Proton Micro Framework Derivate.
  *
  * @author Alex Bilbie <hello@alexbilbie.com>
  * @author Marco Bunge <marco_bunge@web.de>
@@ -118,6 +118,12 @@ public function __construct($configuration = [])
  ) {
  $this->setConfig($configuration);
  }
+ $this->init();
+ }
+
+ protected function init(){
+ // configure request content type
+ $this->setContentType(ServerRequestFactory::getHeader('content-type', ServerRequestFactory::fromGlobals()->getHeaders(), $this->getContentType()));
  }
 
  /*******************************************
@@ -409,7 +415,7 @@ public function getResponse($content = '', $contentType = null)
  if (!$this->getContainer()->has(ResponseInterface::class)) {
  if ($this->isCli()) {
  $class = Response\TextResponse::class;
- } elseif ($this->isAjaxRequest()) {
+ } elseif ($this->isJsonRequest()) {
  $class = Response\JsonResponse::class;
  } else {
  $class = Response\HtmlResponse::class;

tests/ApplicationTest.php

@@ -1,4 +1,13 @@
 <?php
+/**
+ * The Turbine Micro Framework. An advanced derivate of Proton Micro Framework
+ *
+ * @author Marco Bunge <marco_bunge@web.de>
+ * @author Alex Bilbie <hello@alexbilbie.com>
+ * @copyright Marco Bunge <marco_bunge@web.de>
+ *
+ * @license MIT
+ */
 
 namespace TurbineTests;
 
@@ -371,12 +380,13 @@ public function testContentTypeDelegation()
  return $response;
  });
 
+ $_SERVER['CONTENT_TYPE'] = 'application/json';
  $request = ServerRequestFactory::fromGlobals();
- $request = $request->withHeader('content-type', 'application/json');
 
  $response = $app->handle($request);
 
  $this->assertEquals($request->getHeader('content-type'), $response->getHeader('content-type'));
+ $this->assertEquals(['application/json'], $response->getHeader('content-type'));
  }
 
  public function testGetLoggers()