Used more DatabaseWrapperFactory as one instance of each is fine.

[core.git] / inc / classes / main / discovery / payment / class_LocalPaymentDiscovery.php

diff --git a/inc/classes/main/discovery/payment/class_LocalPaymentDiscovery.php b/inc/classes/main/discovery/payment/class_LocalPaymentDiscovery.php
index e46b348628b7d92225bf9b003b1073b4936dd248..9785bef4e5eb9b99d79e78c447e3713f42872e4c 100644 (file)
--- a/inc/classes/main/discovery/payment/class_LocalPaymentDiscovery.php
+++ b/inc/classes/main/discovery/payment/class_LocalPaymentDiscovery.php
@@ -4,11 +4,11 @@
  * registered payment types and like all the others it at least returns the
  * money bank transfer type.
  *
- * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2011 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
+ * @link               http://www.shipsimu.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -65,11 +65,14 @@ class LocalPaymentDiscovery extends BaseDiscovery implements Discoverable, Regis
                $criteriaInstance->setLimit(1);
 
                // Get a wrapper instance
-               $wrapperInstance = ObjectFactory::createObjectByConfiguredName('payment_db_wrapper_class');
+               $wrapperInstance = DatabaseWrapperFactory::createWrapperByConfiguredName('payment_db_wrapper_class');
 
                // Get result back
                $resultInstance = $wrapperInstance->doSelectByCriteria($criteriaInstance);
 
+               // Advanced to next entry and assert on it as it should always be there
+               assert($resultInstance->valid());
+
                // Set the result instance
                $this->setResultInstance($resultInstance);
        }