diff options
| author | Thomas Steur <thomas.steur@gmail.com> | 2014-10-09 07:18:32 +0400 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@gmail.com> | 2014-10-09 07:18:32 +0400 |
| commit | c89189697b9cd17a5c2df0f3794b12f5cb681655 (patch) | |
| tree | 083f6375b6a2005531effb42e053693d08c04f2f /core/Option.php | |
| parent | afb1cb7b7ec20bf3c0213e2fcd8680a85686c6ff (diff) | |
| parent | cf2f71f36ffa139aec60a219aeb3748af66f477e (diff) | |
Merge branch 'master' into 5940_testRenamingAndCorrectFolders
Conflicts:
tests/PHPUnit/phpunit.xml.dist
Diffstat (limited to 'core/Option.php')
| -rw-r--r-- | core/Option.php | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/core/Option.php b/core/Option.php index d50e5c4235..d79df967ed 100644 --- a/core/Option.php +++ b/core/Option.php @@ -144,6 +144,17 @@ class Option } /** + * Sets the singleton instance. For testing purposes. + * + * @param mixed + * @ignore + */ + public static function setSingletonInstance($instance) + { + self::$instance = $instance; + } + + /** * Private Constructor */ private function __construct() |