Use more the factory.

Signed-off-by: Roland Haeder <roland@mxchange.org>

diff --git a/application/city/main/factories/states/city/class_CityStateFactory.php b/application/city/main/factories/states/city/class_CityStateFactory.php
index 6a7794a7e75b56f24ad3cda77ce9c9c05806a35c..64c42d85a5280956a2e04faf85b88e5a5060ee0f 100644 (file)
--- 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 842f620b69fdbae9a49f0b5b6485142b75519136..69c20ca07a09bf7a0ee5a160d3b4e4cb3da873d6 100644 (file)
--- 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();