Use UTF-8 as default output encoding

Author: smichaelsen

LICENSE

@@ -1,7 +1,7 @@
 Simplified BSD License
 
 Copyright (c) 2011-2014 Knut Ahlers <[email protected]>
-Copyright (c) 2013-2014 Sebastian Michaelsen <[email protected]>
+Copyright (c) 2013-2015 Sebastian Michaelsen <[email protected]>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

classes/Bootstrap.php

@@ -4,6 +4,7 @@
 use AppZap\PHPFramework\Configuration\Configuration;
 use AppZap\PHPFramework\Configuration\DefaultConfiguration;
 use AppZap\PHPFramework\Configuration\Parser\IniParser;
+use AppZap\PHPFramework\Mvc\AbstractController;
 use AppZap\PHPFramework\Mvc\ApplicationPartMissingException;
 use AppZap\PHPFramework\Mvc\Dispatcher;
 use AppZap\PHPFramework\SignalSlot\Dispatcher as SignalSlotDispatcher;
@@ -59,11 +60,12 @@ protected static function loadPlugins() {
    *
    */
   protected static function registerCoreSlots() {
+    SignalSlotDispatcher::registerSlot(AbstractController::SIGNAL_INIT_RESPONSE, ['AppZap\PHPFramework\SignalSlot\CoreSlots', 'contentTypeHeader']);
     SignalSlotDispatcher::registerSlot(Dispatcher::SIGNAL_CONSTRUCT, ['AppZap\PHPFramework\SignalSlot\CoreSlots', 'invokeDatabaseMigrator']);
-    SignalSlotDispatcher::registerSlot(Dispatcher::SIGNAL_START_DISPATCHING, ['AppZap\PHPFramework\SignalSlot\CoreSlots', 'readOutputFromCache']);
     SignalSlotDispatcher::registerSlot(Dispatcher::SIGNAL_OUTPUT_READY, ['AppZap\PHPFramework\SignalSlot\CoreSlots', 'writeOutputToCache']);
     SignalSlotDispatcher::registerSlot(Dispatcher::SIGNAL_OUTPUT_READY, ['AppZap\PHPFramework\SignalSlot\CoreSlots', 'addFrameworkSignatureToOutput']);
     SignalSlotDispatcher::registerSlot(Dispatcher::SIGNAL_OUTPUT_READY, ['AppZap\PHPFramework\SignalSlot\CoreSlots', 'echoOutput']);
+    SignalSlotDispatcher::registerSlot(Dispatcher::SIGNAL_START_DISPATCHING, ['AppZap\PHPFramework\SignalSlot\CoreSlots', 'readOutputFromCache']);
   }
 
   /**

classes/Configuration/DefaultConfiguration.php

@@ -18,8 +18,8 @@ public static function initialize($application) {
       throw new ApplicationPartMissingException('Application folder ' . htmlspecialchars($applicationDirectoryPath) . ' not found', 1410538265);
     }
     $applicationDirectory .= '/';
-    Configuration::set('phpframework', 'project_root', $projectRoot);
     Configuration::set('phpframework', 'db.migrator.directory', $applicationDirectory . '_sql/');
+    Configuration::set('phpframework', 'project_root', $projectRoot);
     Configuration::set('application', 'application', $application);
     Configuration::set('application', 'application_directory', $applicationDirectory);
     Configuration::set('application', 'routes_file', $applicationDirectory . 'routes.php');

classes/SignalSlot/CoreSlots.php

@@ -4,6 +4,7 @@
 use AppZap\PHPFramework\Cache\Cache;
 use AppZap\PHPFramework\Cache\CacheFactory;
 use AppZap\PHPFramework\Configuration\Configuration;
+use AppZap\PHPFramework\Mvc\View\AbstractView;
 use AppZap\PHPFramework\Persistence\DatabaseMigrator;
 
 class CoreSlots {
@@ -61,4 +62,16 @@ public static function echoOutput($output) {
     }
   }
 
+  /**
+   * @param AbstractView $response
+   */
+  public static function contentTypeHeader(AbstractView $response) {
+    $contentType = 'text/html';
+    $charset = Configuration::get('phpframework', 'output_charset', 'utf-8');
+    if ($charset) {
+      $contentType .= '; charset=' . trim($charset);
+    }
+    $response->header('Content-Type', $contentType);
+  }
+
 }