Permalink
Browse files

Merge pull request #477 from nyeholt/injector_bugfixes

A few bug fixes and changes to make the injector play better with existing code.
  • Loading branch information...
2 parents 3ed9c5f + 5eaca34 commit 627def6be3a33a5f908276b5a31aea133f109b8c @halkyon halkyon committed May 22, 2012
Showing with 4 additions and 5 deletions.
  1. +1 −1 core/Config.php
  2. +1 −1 core/Core.php
  3. +1 −2 core/Object.php
  4. +1 −1 model/Versioned.php
View
@@ -118,7 +118,7 @@ static protected function type_mismatch() {
* @return Config
*/
static public function inst() {
- if (!self::$instance) self::$instance = singleton('Config');
+ if (!self::$instance) self::$instance = new Config();
return self::$instance;
}
View
@@ -367,7 +367,7 @@ function singleton($className) {
if(!is_string($className)) user_error("singleton() passed bad class_name: " . var_export($className,true), E_USER_ERROR);
if(!isset($_SINGLETONS[$className])) {
if(!class_exists($className)) user_error("Bad class to singleton() - $className", E_USER_ERROR);
- $_SINGLETONS[$className] = Object::strong_create($className,null, true);
+ $_SINGLETONS[$className] = Injector::inst()->get($className);
if(!$_SINGLETONS[$className]) user_error("singleton() Unknown class '$className'", E_USER_ERROR);
}
return $_SINGLETONS[$className];
View
@@ -235,8 +235,7 @@ public static function strong_create() {
$class = self::$strong_classes[$class];
}
- $reflector = new ReflectionClass($class);
- return $reflector->newInstanceArgs($args);
+ return Injector::inst()->createWithArgs($class, $args);
}
/**
View
@@ -92,7 +92,7 @@ static function reset() {
* The first stage is consiedered the 'default' stage, the last stage is
* considered the 'live' stage.
*/
- function __construct($stages) {
+ function __construct($stages=array('Stage','Live')) {
parent::__construct();
if(!is_array($stages)) {

0 comments on commit 627def6

Please sign in to comment.