projects
/
core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Static method getInstance() conflicts with getInstance() in class BaseRegistry,
[core.git]
/
inc
/
classes
/
middleware
/
io
/
class_FileIoHandler.php
diff --git
a/inc/classes/middleware/io/class_FileIoHandler.php
b/inc/classes/middleware/io/class_FileIoHandler.php
index b6a46857d75f2559cf9f1e566d6f88ca64ce615c..70afeefe664bb7dc5590b4a5becee5bc32350528 100644
(file)
--- a/
inc/classes/middleware/io/class_FileIoHandler.php
+++ b/
inc/classes/middleware/io/class_FileIoHandler.php
@@
-5,7
+5,7
@@
*
* @author Roland Haeder <webmaster@ship-simu.org>
* @version 0.0.0
*
* @author Roland Haeder <webmaster@ship-simu.org>
* @version 0.0.0
- * @copyright Copyright (c) 2007
- 2009 Roland Haeder, this is free software
+ * @copyright Copyright (c) 2007
, 2008 Roland Haeder, 2009 - 2011 Core Developer Team
* @license GNU GPL 3.0 or any newer version
* @link http://www.ship-simu.org
*
* @license GNU GPL 3.0 or any newer version
* @link http://www.ship-simu.org
*
@@
-26,17
+26,17
@@
class FileIoHandler extends BaseMiddleware {
/**
* The *real* file input class we shall use for reading data
*/
/**
* The *real* file input class we shall use for reading data
*/
- private $inputStream =
null
;
+ private $inputStream =
NULL
;
/**
* The *real* file output class we shall use for reading data
*/
/**
* The *real* file output class we shall use for reading data
*/
- private $outputStream =
null
;
+ private $outputStream =
NULL
;
/**
* An instance of this class
*/
/**
* An instance of this class
*/
- private static $thisInstance =
null
;
+ private static $thisInstance =
NULL
;
/**
* Protected constructor
/**
* Protected constructor
@@
-57,7
+57,7
@@
class FileIoHandler extends BaseMiddleware {
*
* @return $ioInstance A prepared instance of FilIOHandler
*/
*
* @return $ioInstance A prepared instance of FilIOHandler
*/
- public
final static
function createFileIoHandler () {
+ public
static final
function createFileIoHandler () {
// Get instance
$ioHandler = new FileIoHandler();
// Get instance
$ioHandler = new FileIoHandler();
@@
-74,7
+74,7
@@
class FileIoHandler extends BaseMiddleware {
*
* @return $thisInstance An instance of this class
*/
*
* @return $thisInstance An instance of this class
*/
- public
final static function get
Instance () {
+ public
static final function getSelf
Instance () {
return self::$thisInstance;
}
return self::$thisInstance;
}