Przeglądaj źródła

Removing require_onces

Paolo Libertini 6 lat temu
rodzic
commit
525be81e19

+ 7 - 7
lib/Mooses/Mongodb/Mongo.php

@@ -1,9 +1,9 @@
 <?php
 
-require_once 'Thinkopen/Mongodb/Mongo/Validate/Array.php';
-require_once 'Thinkopen/Mongodb/Mongo/Validate/Class.php';
-require_once 'Thinkopen/Mongodb/Mongo/Validate/StubTrue.php';
-require_once 'Thinkopen/Mongodb/Mongo/Connection/Group.php';
+//require_once 'Thinkopen/Mongodb/Mongo/Validate/Array.php';
+//require_once 'Thinkopen/Mongodb/Mongo/Validate/Class.php';
+//require_once 'Thinkopen/Mongodb/Mongo/Validate/StubTrue.php';
+//require_once 'Thinkopen/Mongodb/Mongo/Connection/Group.php';
 
 /**
  * @category   Thinkopen
@@ -139,7 +139,7 @@ class Mooses_Mongodb_Mongo {
 
         // Attempt to create requirement
         if (!$requirement = static::createRequirement($name, $options)) {
-            require_once 'Thinkopen/MongodbMongo/Exception.php';
+            //require_once 'Thinkopen/MongodbMongo/Exception.php';
             throw new Mooses_Mongodb_Mongo_Exception("No requirement exists for '{$name}'");
         }
 
@@ -308,7 +308,7 @@ class Mooses_Mongodb_Mongo {
         }
 
         if (!$connection = $connectionGroup->getWriteConnection($connectionGroupName)) {
-            require_once 'Thinkopen/MongodbMongo/Exception.php';
+            //require_once 'Thinkopen/MongodbMongo/Exception.php';
             throw new Mooses_Mongodb_Mongo_Exception("No write connection available for the '{$connectionGroupName}' connection group");
         }
 
@@ -336,7 +336,7 @@ class Mooses_Mongodb_Mongo {
         }
 
         if (!$connection = $connectionGroup->getReadConnection($connectionGroupName)) {
-            require_once 'Thinkopen/MongodbMongo/Exception.php';
+            //require_once 'Thinkopen/MongodbMongo/Exception.php';
             throw new Mooses_Mongodb_Mongo_Exception("No read connection available for the '{$connectionGroupName}' connection group");
         }
 

+ 4 - 4
lib/Mooses/Mongodb/Mongo/Collection.php

@@ -1,9 +1,9 @@
 <?php
 
-require_once 'Thinkopen/Mongodb/Mongo/Document.php';
+//require_once 'Thinkopen/Mongodb/Mongo/Document.php';
 
-require_once 'Thinkopen/Mongodb/Mongo/Exception.php';
-require_once 'Thinkopen/Mongodb/Mongo/Iterator/Cursor.php';
+//require_once 'Thinkopen/Mongodb/Mongo/Exception.php';
+//require_once 'Thinkopen/Mongodb/Mongo/Iterator/Cursor.php';
 
 /**
  * @category   Thinkopen
@@ -265,7 +265,7 @@ abstract class Mooses_Mongodb_Mongo_Collection
 	public static function getMongoDb($writable = true)
 	{
 		if (!static::hasDbName()) {
-			require_once 'Thinkopen/Mongodb/Mongo/Exception.php';
+			//require_once 'Thinkopen/Mongodb/Mongo/Exception.php';
 			throw new Mooses_Mongodb_Mongo_Exception(get_called_class().'::$_db is null');
 		}
 

+ 2 - 2
lib/Mooses/Mongodb/Mongo/Connection/Group.php

@@ -1,7 +1,7 @@
 <?php
 
-require_once 'Thinkopen/Mongodb/Mongo/Connection.php';
-require_once 'Thinkopen/Mongodb/Mongo/Connection/Stack.php';
+//require_once 'Thinkopen/Mongodb/Mongo/Connection.php';
+//require_once 'Thinkopen/Mongodb/Mongo/Connection/Stack.php';
 
 /**
  * @category   Thinkopen

+ 2 - 2
lib/Mooses/Mongodb/Mongo/Connection/Stack.php

@@ -143,7 +143,7 @@ class Mooses_Mongodb_Mongo_Connection_Stack implements SeekableIterator, Countab
 	public function seek($position)
 	{
 		if (!is_numeric($position)) {
-			require_once 'Thinkopen/Mongodb/Mongo/Exception.php';
+			//require_once 'Thinkopen/Mongodb/Mongo/Exception.php';
 			throw new Mooses_Mongodb_Mongo_Exception("Position must be numeric");
 		}
 		
@@ -237,7 +237,7 @@ class Mooses_Mongodb_Mongo_Connection_Stack implements SeekableIterator, Countab
 	public function offsetSet($offset, $connection)
 	{
 		if (!is_numeric($offset)) {
-			require_once 'Thinkopen/Mongodb/Mongo/Exception.php';
+			//require_once 'Thinkopen/Mongodb/Mongo/Exception.php';
 			throw new Mooses_Mongodb_Mongo_Exception("Offset must be numeric");
 		}
 		

+ 12 - 12
lib/Mooses/Mongodb/Mongo/Document.php

@@ -1,7 +1,7 @@
 <?php
-//require_once 'Thinkopen/Mongodb/Mongo/Exception.php';
-//require_once 'Thinkopen/Mongodb/Mongo/Collection.php';
-//require_once 'Thinkopen/Mongodb/Mongo/Iterator/Default.php';
+////require_once 'Thinkopen/Mongodb/Mongo/Exception.php';
+////require_once 'Thinkopen/Mongodb/Mongo/Collection.php';
+////require_once 'Thinkopen/Mongodb/Mongo/Iterator/Default.php';
 
 /**
  * @category   Thinkopen
@@ -685,7 +685,7 @@ class Mooses_Mongodb_Mongo_Document extends Mooses_Mongodb_Mongo_Collection impl
 		
 		// Throw exception if value is not valid
 		if (!is_null($value) && !$validators->isValid($value)) {
-			require_once 'Thinkopen/Mongdb/Mongo/Exception.php';
+			//require_once 'Thinkopen/Mongdb/Mongo/Exception.php';
 			throw new Mooses_Mongodb_Mongo_Exception(implode($validators->getMessages(), "\n"));
 		}
 		
@@ -775,12 +775,12 @@ class Mooses_Mongodb_Mongo_Document extends Mooses_Mongodb_Mongo_Collection impl
 	public function createReference()
 	{
 		if (!$this->isRootDocument()) {
-			require_once 'Thinkopen/Mongdb/Mongo/Exception.php';
+			//require_once 'Thinkopen/Mongdb/Mongo/Exception.php';
 			throw new Mooses_Mongodb_Mongo_Exception('Can not create reference. Document is not a root document');
 		}
 		
 		if (!$this->isConnected()) {
-			require_once 'Thinkopen/Mongdb/Mongo/Exception.php';
+			//require_once 'Thinkopen/Mongdb/Mongo/Exception.php';
 			throw new Mooses_Mongodb_Mongo_Exception('Can not create reference. Document does not connected to a db and collection');
 		}
 		
@@ -856,7 +856,7 @@ class Mooses_Mongodb_Mongo_Document extends Mooses_Mongodb_Mongo_Collection impl
 			$requiredProperties = $this->getPropertiesWithRequirement('Required');
 			foreach ($requiredProperties as $property) {
 				if (!isset($exportData[$property]) || (is_array($exportData[$property]) && empty($exportData[$property]))) {
-					require_once 'Thinkopen/Mongdb/Mongo/Exception.php';
+					//require_once 'Thinkopen/Mongdb/Mongo/Exception.php';
 					throw new Mooses_Mongodb_Mongo_Exception("Property '{$property}' must not be null.");
 				}
 			}
@@ -977,12 +977,12 @@ class Mooses_Mongodb_Mongo_Document extends Mooses_Mongodb_Mongo_Collection impl
 	public function save($entierDocument = false, $safe = true)
 	{
 		if (!$this->isConnected()) {
-			require_once 'Thinkopen/Mongdb/Mongo/Exception.php';
+			//require_once 'Thinkopen/Mongdb/Mongo/Exception.php';
 			throw new Mooses_Mongodb_Mongo_Exception('Can not save documet. Document is not connected to a db and collection');
 		}
 		
 		if ($this->isLocked()) {
-			require_once 'Thinkopen/Mongdb/Mongo/Exception.php';
+			//require_once 'Thinkopen/Mongdb/Mongo/Exception.php';
 			throw new Mooses_Mongodb_Mongo_Exception('Can not save documet. Document is locked.');
 		}
 		
@@ -1090,12 +1090,12 @@ class Mooses_Mongodb_Mongo_Document extends Mooses_Mongodb_Mongo_Collection impl
 	public function delete($safe = true)
 	{
 		if (!$this->isConnected()) {
-			require_once 'Thinkopen/Mongdb/Mongo/Exception.php';
+			//require_once 'Thinkopen/Mongdb/Mongo/Exception.php';
 			throw new Mooses_Mongodb_Mongo_Exception('Can not delete document. Document is not connected to a db and collection');
 		}
 	
 		if ($this->isLocked()) {
-			require_once 'Thinkopen/Mongdb/Mongo/Exception.php';
+			//require_once 'Thinkopen/Mongdb/Mongo/Exception.php';
 			throw new Mooses_Mongodb_Mongo_Exception('Can not save documet. Document is locked.');
 		}
 		
@@ -1272,7 +1272,7 @@ class Mooses_Mongodb_Mongo_Document extends Mooses_Mongodb_Mongo_Collection impl
 	{
 		// Make sure the operation is valid
 		if (!Mooses_Mongodb_Mongo::isValidOperation($operation)) {
-			require_once 'Thinkopen/Mongdb/Mongo/Exception.php';
+			//require_once 'Thinkopen/Mongdb/Mongo/Exception.php';
 			throw new Mooses_Mongodb_Mongo_Exception("'{$operation}' is not valid operation");
 		}
 		

+ 4 - 4
lib/Mooses/Mongodb/Mongo/DocumentSet.php

@@ -42,7 +42,7 @@ class Mooses_Mongodb_Mongo_DocumentSet extends Mooses_Mongodb_Mongo_Document
 		
 		// Make sure we are not trying to create a document that is supposed to be saved as a reference
 		if ($new && $this->hasRequirement(static::DYNAMIC_INDEX, 'AsReference')) {
-			require_once 'Thinkopen/Mongodb/Mongo/Exception.php';
+			//require_once 'Thinkopen/Mongodb/Mongo/Exception.php';
 			throw new Mooses_Mongodb_Mongo_Exception("Can not create a new document from documentset where document must be saved as a reference");
 		}
 
@@ -121,7 +121,7 @@ class Mooses_Mongodb_Mongo_DocumentSet extends Mooses_Mongodb_Mongo_Document
 		
 		// Make sure index is numeric
 		if (!$new && !is_numeric($index)) {
-			require_once 'Thinkopen/Mongodb/Mongo/Exception.php';
+			//require_once 'Thinkopen/Mongodb/Mongo/Exception.php';
 			throw new Mooses_Mongodb_Mongo_Exception("Index must be numeric '{$index}' given");
 		}
 		
@@ -140,7 +140,7 @@ class Mooses_Mongodb_Mongo_DocumentSet extends Mooses_Mongodb_Mongo_Document
 		$validators = $this->getValidators(self::DYNAMIC_INDEX);
 		
 		if (!$validators->isValid($document)) {
-			require_once 'Thinkopen/Mongodb/Mongo/Exception.php';
+			//require_once 'Thinkopen/Mongodb/Mongo/Exception.php';
 			throw new Mooses_Mongodb_Mongo_Exception(implode($validators->getMessages(), "\n"));
 		}
 		
@@ -253,7 +253,7 @@ class Mooses_Mongodb_Mongo_DocumentSet extends Mooses_Mongodb_Mongo_Document
 				return $this->getProperty();
 		}
 		
-		require_once 'Thinkopen/Mongodb/Mongo/Exception.php';
+		//require_once 'Thinkopen/Mongodb/Mongo/Exception.php';
 		throw new Mooses_Mongodb_Mongo_Exception("Captured in __call. Method $name does not exist.");
 	}
 }

+ 1 - 1
lib/Mooses/Mongodb/Mongo/Validate/Array.php

@@ -1,6 +1,6 @@
 <?php
 
-require_once 'Zend/Validate/Abstract.php';
+//require_once 'Zend/Validate/Abstract.php';
 
 class Mooses_Mongodb_Mongo_Validate_Array extends Zend_Validate_Abstract
 {

+ 1 - 1
lib/Mooses/Mongodb/Mongo/Validate/Class.php

@@ -1,6 +1,6 @@
 <?php
 
-require_once 'Zend/Validate/Abstract.php';
+//require_once 'Zend/Validate/Abstract.php';
 
 class Mooses_Mongodb_Mongo_Validate_Class extends Zend_Validate_Abstract
 {

+ 1 - 1
lib/Mooses/Mongodb/Paginator/Adapter/Mongo.php

@@ -3,7 +3,7 @@
 /**
  * @see Zend_Paginator_Adapter_Interface
  */
-require_once 'Zend/Paginator/Adapter/Interface.php';
+//require_once 'Zend/Paginator/Adapter/Interface.php';
 
 /**
  * @category   Thinkopen

+ 4 - 4
lib/Mooses/Mongodb/Queue/Mongoadapter.php

@@ -1,5 +1,5 @@
 <?php
-require_once 'Zend/Queue/Adapter/AdapterAbstract.php';
+//require_once 'Zend/Queue/Adapter/AdapterAbstract.php';
 
 /**
  * Class for using a standard PHP array as a queue
@@ -152,7 +152,7 @@ class Mooses_Mongodb_Queue_Mongoadapter extends Zend_Queue_Adapter_AdapterAbstra
             /**
              * @see Zend_Queue_Exception
              */
-//            require_once 'Zend/Queue/Exception.php';
+//            //require_once 'Zend/Queue/Exception.php';
             throw new Zend_Queue_Exception('Queue does not exist');
         }
         $_messages = $queue->count();
@@ -203,7 +203,7 @@ class Mooses_Mongodb_Queue_Mongoadapter extends Zend_Queue_Adapter_AdapterAbstra
 
         $classname = "Mooses_Mongodb_Queue_Abstractadapter";
         if (!class_exists($classname)) {
-            require_once 'Zend/Loader.php';
+            //require_once 'Zend/Loader.php';
             Zend_Loader::loadClass($classname);
         }
         return new $classname($options);
@@ -269,7 +269,7 @@ class Mooses_Mongodb_Queue_Mongoadapter extends Zend_Queue_Adapter_AdapterAbstra
         );
         $classname = $queue->getMessageSetClass();
         if (!class_exists($classname)) {
-            require_once 'Zend/Loader.php';
+            //require_once 'Zend/Loader.php';
             Zend_Loader::loadClass($classname);
         }
         return new $classname($options);