projects
/
core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Renamed Registry -> GenericRegistry to make it clear that this registry does
[core.git]
/
framework
/
main
/
classes
/
response
/
class_BaseResponse.php
diff --git
a/framework/main/classes/response/class_BaseResponse.php
b/framework/main/classes/response/class_BaseResponse.php
index 4092a010c2772f54ab27542629616233f9b968fc..0c2c8a17e669f0d6028a69b7efcd46e104d3ee84 100644
(file)
--- a/
framework/main/classes/response/class_BaseResponse.php
+++ b/
framework/main/classes/response/class_BaseResponse.php
@@
-4,18
+4,14
@@
namespace Org\Mxchange\CoreFramework\Response;
// Import framework stuff
use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
// Import framework stuff
use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\
Generic
Registry;
/**
* A generic request class
*
* @author Roland Haeder <webmaster@shipsimu.org>
* @version 0.0.0
/**
* A generic request class
*
* @author Roland Haeder <webmaster@shipsimu.org>
* @version 0.0.0
-<<<<<<< HEAD:framework/main/classes/response/class_BaseResponse.php
* @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
* @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
-=======
- * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
->>>>>>> Some updates::inc/main/classes/response/class_BaseResponse.php
* @license GNU GPL 3.0 or any newer version
* @link http://www.shipsimu.org
*
* @license GNU GPL 3.0 or any newer version
* @link http://www.shipsimu.org
*
@@
-156,7
+152,7
@@
abstract class BaseResponse extends BaseFrameworkSystem {
*/
public final function addFatalMessage ($messageId) {
// Get application instance
*/
public final function addFatalMessage ($messageId) {
// Get application instance
- $applicationInstance = Registry::getRegistry()->getInstance('app');
+ $applicationInstance =
Generic
Registry::getRegistry()->getInstance('app');
// Adds the resolved message id to the fatal message list
$this->addFatalMessagePlain($applicationInstance()->getLanguageInstance()->getMessage($messageId));
// Adds the resolved message id to the fatal message list
$this->addFatalMessagePlain($applicationInstance()->getLanguageInstance()->getMessage($messageId));
@@
-184,7
+180,7
@@
abstract class BaseResponse extends BaseFrameworkSystem {
*/
public function flushBuffer ($force = false) {
// Get application instance
*/
public function flushBuffer ($force = false) {
// Get application instance
- $applicationInstance = Registry::getRegistry()->getInstance('app');
+ $applicationInstance =
Generic
Registry::getRegistry()->getInstance('app');
// Headers already sent?
if ((headers_sent()) && ($force === false)) {
// Headers already sent?
if ((headers_sent()) && ($force === false)) {
@@
-247,7
+243,7
@@
abstract class BaseResponse extends BaseFrameworkSystem {
*/
public function determineDefaultCommand () {
// Get application instance
*/
public function determineDefaultCommand () {
// Get application instance
- $applicationInstance = Registry::getRegistry()->getInstance('app');
+ $applicationInstance =
Generic
Registry::getRegistry()->getInstance('app');
// Generate config key
$configKey = sprintf('default_%s_%s_command',
// Generate config key
$configKey = sprintf('default_%s_%s_command',