From 380982a5ec0680066d58720544ec161d3d382468 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Mon, 29 Jun 2015 05:33:48 +0200 Subject: [PATCH] Use more the factory. Signed-off-by: Roland Haeder --- .../city/main/factories/states/city/class_CityStateFactory.php | 2 +- .../init/class_CityDaemonBootstrapInitDaemonFilter.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/application/city/main/factories/states/city/class_CityStateFactory.php b/application/city/main/factories/states/city/class_CityStateFactory.php index 6a7794a..64c42d8 100644 --- a/application/city/main/factories/states/city/class_CityStateFactory.php +++ b/application/city/main/factories/states/city/class_CityStateFactory.php @@ -47,7 +47,7 @@ class CityStateFactory extends ObjectFactory { $stateInstance = self::createObjectByConfiguredName($className); // Get city instance - $cityInstance = Registry::getRegistry()->getInstance('city'); + $cityInstance = CityDaemonObjectFactory::createCityDaemonInstance(); // Debug message self::createDebugInstance(__CLASS__)->debugOutput('CITY-STATE-FACTORY[' . __METHOD__ . ':' . __LINE__ . ']: City state has changed from ' . $cityInstance->getPrintableState() . ' to ' . $stateInstance->getStateName() . '.'); diff --git a/application/city/main/filter/bootstrap/init/class_CityDaemonBootstrapInitDaemonFilter.php b/application/city/main/filter/bootstrap/init/class_CityDaemonBootstrapInitDaemonFilter.php index 842f620..69c20ca 100644 --- a/application/city/main/filter/bootstrap/init/class_CityDaemonBootstrapInitDaemonFilter.php +++ b/application/city/main/filter/bootstrap/init/class_CityDaemonBootstrapInitDaemonFilter.php @@ -56,7 +56,7 @@ class CityDaemonBootstrapInitDaemonFilter extends BaseCityFilter implements Filt */ public function execute (Requestable $requestInstance, Responseable $responseInstance) { // Get city instance - $cityInstance = Registry::getRegistry()->getInstance('city'); + $cityInstance = CityDaemonObjectFactory::createCityDaemonInstance(); // Now bootstrap the daemon $cityInstance->bootstrapInitCityDaemon(); -- 2.39.5