kitodo / kitodo-presentation

lib/SolrPhpClient/Apache/Solr/Document.php

Indentation +278 added lines, -278 removed lines

@@ -57,311 +57,311 @@
  */
 class Apache_Solr_Document implements IteratorAggregate
 {
-	/**
-	 * SVN Revision meta data for this class
-	 */
-	const SVN_REVISION = '$Revision: 54 $';
+    /**
+     * SVN Revision meta data for this class
+     */
+    const SVN_REVISION = '$Revision: 54 $';
 
-	/**
-	 * SVN ID meta data for this class
-	 */
-	const SVN_ID = '$Id: Document.php 54 2011-02-04 16:29:18Z donovan.jimenez $';
+    /**
+     * SVN ID meta data for this class
+     */
+    const SVN_ID = '$Id: Document.php 54 2011-02-04 16:29:18Z donovan.jimenez $';
 
-	/**
-	 * Document boost value
-	 *
-	 * @var float
-	 */
-	protected $_documentBoost = false;
+    /**
+     * Document boost value
+     *
+     * @var float
+     */
+    protected $_documentBoost = false;
 
-	/**
-	 * Document field values, indexed by name
-	 *
-	 * @var array
-	 */
-	protected $_fields = array();
+    /**
+     * Document field values, indexed by name
+     *
+     * @var array
+     */
+    protected $_fields = array();
 
-	/**
-	 * Document field boost values, indexed by name
-	 *
-	 * @var array array of floats
-	 */
-	protected $_fieldBoosts = array();
+    /**
+     * Document field boost values, indexed by name
+     *
+     * @var array array of floats
+     */
+    protected $_fieldBoosts = array();
 
-	/**
-	 * Clear all boosts and fields from this document
-	 */
-	public function clear()
-	{
-		$this->_documentBoost = false;
+    /**
+     * Clear all boosts and fields from this document
+     */
+    public function clear()
+    {
+        $this->_documentBoost = false;
 
-		$this->_fields = array();
-		$this->_fieldBoosts = array();
-	}
+        $this->_fields = array();
+        $this->_fieldBoosts = array();
+    }
 
-	/**
-	 * Get current document boost
-	 *
-	 * @return mixed will be false for default, or else a float
-	 */
-	public function getBoost()
-	{
-		return $this->_documentBoost;
-	}
+    /**
+     * Get current document boost
+     *
+     * @return mixed will be false for default, or else a float
+     */
+    public function getBoost()
+    {
+        return $this->_documentBoost;
+    }
 
-	/**
-	 * Set document boost factor
-	 *
-	 * @param mixed $boost Use false for default boost, else cast to float that should be > 0 or will be treated as false
-	 */
-	public function setBoost($boost)
-	{
-		$boost = (float) $boost;
+    /**
+     * Set document boost factor
+     *
+     * @param mixed $boost Use false for default boost, else cast to float that should be > 0 or will be treated as false
+     */
+    public function setBoost($boost)
+    {
+        $boost = (float) $boost;
 
-		if ($boost > 0.0)
-		{
-			$this->_documentBoost = $boost;
-		}
-		else
-		{
-			$this->_documentBoost = false;
-		}
-	}
+        if ($boost > 0.0)
+        {
+            $this->_documentBoost = $boost;
+        }
+        else
+        {
+            $this->_documentBoost = false;
+        }
+    }
 
-	/**
-	 * Add a value to a multi-valued field
-	 *
-	 * NOTE: the solr XML format allows you to specify boosts
-	 * PER value even though the underlying Lucene implementation
-	 * only allows a boost per field. To remedy this, the final
-	 * field boost value will be the product of all specified boosts
-	 * on field values - this is similar to SolrJ's functionality.
-	 *
-	 * <code>
-	 * $doc = new Apache_Solr_Document();
-	 *
-	 * $doc->addField('foo', 'bar', 2.0);
-	 * $doc->addField('foo', 'baz', 3.0);
-	 *
-	 * // resultant field boost will be 6!
-	 * echo $doc->getFieldBoost('foo');
-	 * </code>
-	 *
-	 * @param string $key
-	 * @param mixed $value
-	 * @param mixed $boost Use false for default boost, else cast to float that should be > 0 or will be treated as false
-	 */
-	public function addField($key, $value, $boost = false)
-	{
-		if (!isset($this->_fields[$key]))
-		{
-			// create holding array if this is the first value
-			$this->_fields[$key] = array();
-		}
-		else if (!is_array($this->_fields[$key]))
-		{
-			// move existing value into array if it is not already an array
-			$this->_fields[$key] = array($this->_fields[$key]);
-		}
+    /**
+     * Add a value to a multi-valued field
+     *
+     * NOTE: the solr XML format allows you to specify boosts
+     * PER value even though the underlying Lucene implementation
+     * only allows a boost per field. To remedy this, the final
+     * field boost value will be the product of all specified boosts
+     * on field values - this is similar to SolrJ's functionality.
+     *
+     * <code>
+     * $doc = new Apache_Solr_Document();
+     *
+     * $doc->addField('foo', 'bar', 2.0);
+     * $doc->addField('foo', 'baz', 3.0);
+     *
+     * // resultant field boost will be 6!
+     * echo $doc->getFieldBoost('foo');
+     * </code>
+     *
+     * @param string $key
+     * @param mixed $value
+     * @param mixed $boost Use false for default boost, else cast to float that should be > 0 or will be treated as false
+     */
+    public function addField($key, $value, $boost = false)
+    {
+        if (!isset($this->_fields[$key]))
+        {
+            // create holding array if this is the first value
+            $this->_fields[$key] = array();
+        }
+        else if (!is_array($this->_fields[$key]))
+        {
+            // move existing value into array if it is not already an array
+            $this->_fields[$key] = array($this->_fields[$key]);
+        }
 
-		if ($this->getFieldBoost($key) === false)
-		{
-			// boost not already set, set it now
-			$this->setFieldBoost($key, $boost);
-		}
-		else if ((float) $boost > 0.0)
-		{
-			// multiply passed boost with current field boost - similar to SolrJ implementation
-			$this->_fieldBoosts[$key] *= (float) $boost;
-		}
+        if ($this->getFieldBoost($key) === false)
+        {
+            // boost not already set, set it now
+            $this->setFieldBoost($key, $boost);
+        }
+        else if ((float) $boost > 0.0)
+        {
+            // multiply passed boost with current field boost - similar to SolrJ implementation
+            $this->_fieldBoosts[$key] *= (float) $boost;
+        }
 
-		// add value to array
-		$this->_fields[$key][] = $value;
-	}
+        // add value to array
+        $this->_fields[$key][] = $value;
+    }
 
-	/**
-	 * Handle the array manipulation for a multi-valued field
-	 *
-	 * @param string $key
-	 * @param string $value
-	 * @param mixed $boost Use false for default boost, else cast to float that should be > 0 or will be treated as false
-	 *
-	 * @deprecated Use addField(...) instead
-	 */
-	public function setMultiValue($key, $value, $boost = false)
-	{
-		$this->addField($key, $value, $boost);
-	}
+    /**
+     * Handle the array manipulation for a multi-valued field
+     *
+     * @param string $key
+     * @param string $value
+     * @param mixed $boost Use false for default boost, else cast to float that should be > 0 or will be treated as false
+     *
+     * @deprecated Use addField(...) instead
+     */
+    public function setMultiValue($key, $value, $boost = false)
+    {
+        $this->addField($key, $value, $boost);
+    }
 
-	/**
-	 * Get field information
-	 *
-	 * @param string $key
-	 * @return mixed associative array of info if field exists, false otherwise
-	 */
-	public function getField($key)
-	{
-		if (isset($this->_fields[$key]))
-		{
-			return array(
-				'name' => $key,
-				'value' => $this->_fields[$key],
-				'boost' => $this->getFieldBoost($key)
-			);
-		}
+    /**
+     * Get field information
+     *
+     * @param string $key
+     * @return mixed associative array of info if field exists, false otherwise
+     */
+    public function getField($key)
+    {
+        if (isset($this->_fields[$key]))
+        {
+            return array(
+                'name' => $key,
+                'value' => $this->_fields[$key],
+                'boost' => $this->getFieldBoost($key)
+            );
+        }
 
-		return false;
-	}
+        return false;
+    }
 
-	/**
-	 * Set a field value. Multi-valued fields should be set as arrays
-	 * or instead use the addField(...) function which will automatically
-	 * make sure the field is an array.
-	 *
-	 * @param string $key
-	 * @param mixed $value
-	 * @param mixed $boost Use false for default boost, else cast to float that should be > 0 or will be treated as false
-	 */
-	public function setField($key, $value, $boost = false)
-	{
-		$this->_fields[$key] = $value;
-		$this->setFieldBoost($key, $boost);
-	}
+    /**
+     * Set a field value. Multi-valued fields should be set as arrays
+     * or instead use the addField(...) function which will automatically
+     * make sure the field is an array.
+     *
+     * @param string $key
+     * @param mixed $value
+     * @param mixed $boost Use false for default boost, else cast to float that should be > 0 or will be treated as false
+     */
+    public function setField($key, $value, $boost = false)
+    {
+        $this->_fields[$key] = $value;
+        $this->setFieldBoost($key, $boost);
+    }
 
-	/**
-	 * Get the currently set field boost for a document field
-	 *
-	 * @param string $key
-	 * @return float currently set field boost, false if one is not set
-	 */
-	public function getFieldBoost($key)
-	{
-		return isset($this->_fieldBoosts[$key]) ? $this->_fieldBoosts[$key] : false;
-	}
+    /**
+     * Get the currently set field boost for a document field
+     *
+     * @param string $key
+     * @return float currently set field boost, false if one is not set
+     */
+    public function getFieldBoost($key)
+    {
+        return isset($this->_fieldBoosts[$key]) ? $this->_fieldBoosts[$key] : false;
+    }
 
-	/**
-	 * Set the field boost for a document field
-	 *
-	 * @param string $key field name for the boost
-	 * @param mixed $boost Use false for default boost, else cast to float that should be > 0 or will be treated as false
-	 */
-	public function setFieldBoost($key, $boost)
-	{
-		$boost = (float) $boost;
+    /**
+     * Set the field boost for a document field
+     *
+     * @param string $key field name for the boost
+     * @param mixed $boost Use false for default boost, else cast to float that should be > 0 or will be treated as false
+     */
+    public function setFieldBoost($key, $boost)
+    {
+        $boost = (float) $boost;
 
-		if ($boost > 0.0)
-		{
-			$this->_fieldBoosts[$key] = $boost;
-		}
-		else
-		{
-			$this->_fieldBoosts[$key] = false;
-		}
-	}
+        if ($boost > 0.0)
+        {
+            $this->_fieldBoosts[$key] = $boost;
+        }
+        else
+        {
+            $this->_fieldBoosts[$key] = false;
+        }
+    }
 
-	/**
-	 * Return current field boosts, indexed by field name
-	 *
-	 * @return array
-	 */
-	public function getFieldBoosts()
-	{
-		return $this->_fieldBoosts;
-	}
+    /**
+     * Return current field boosts, indexed by field name
+     *
+     * @return array
+     */
+    public function getFieldBoosts()
+    {
+        return $this->_fieldBoosts;
+    }
 
-	/**
-	 * Get the names of all fields in this document
-	 *
-	 * @return array
-	 */
-	public function getFieldNames()
-	{
-		return array_keys($this->_fields);
-	}
+    /**
+     * Get the names of all fields in this document
+     *
+     * @return array
+     */
+    public function getFieldNames()
+    {
+        return array_keys($this->_fields);
+    }
 
-	/**
-	 * Get the values of all fields in this document
-	 *
-	 * @return array
-	 */
-	public function getFieldValues()
-	{
-		return array_values($this->_fields);
-	}
+    /**
+     * Get the values of all fields in this document
+     *
+     * @return array
+     */
+    public function getFieldValues()
+    {
+        return array_values($this->_fields);
+    }
 
-	/**
-	 * IteratorAggregate implementation function. Allows usage:
-	 *
-	 * <code>
-	 * foreach ($document as $key => $value)
-	 * {
-	 * 	...
-	 * }
-	 * </code>
-	 */
-	public function getIterator()
-	{
-		$arrayObject = new ArrayObject($this->_fields);
+    /**
+     * IteratorAggregate implementation function. Allows usage:
+     *
+     * <code>
+     * foreach ($document as $key => $value)
+     * {
+     * 	...
+     * }
+     * </code>
+     */
+    public function getIterator()
+    {
+        $arrayObject = new ArrayObject($this->_fields);
 
-		return $arrayObject->getIterator();
-	}
+        return $arrayObject->getIterator();
+    }
 
-	/**
-	 * Magic get for field values
-	 *
-	 * @param string $key
-	 * @return mixed
-	 */
-	public function __get($key)
-	{
-		if (isset($this->_fields[$key]))
-		{
-			return $this->_fields[$key];
-		}
+    /**
+     * Magic get for field values
+     *
+     * @param string $key
+     * @return mixed
+     */
+    public function __get($key)
+    {
+        if (isset($this->_fields[$key]))
+        {
+            return $this->_fields[$key];
+        }
 		
-		return null;
-	}
+        return null;
+    }
 
-	/**
-	 * Magic set for field values. Multi-valued fields should be set as arrays
-	 * or instead use the addField(...) function which will automatically
-	 * make sure the field is an array.
-	 *
-	 * @param string $key
-	 * @param mixed $value
-	 */
-	public function __set($key, $value)
-	{
-		$this->setField($key, $value);
-	}
+    /**
+     * Magic set for field values. Multi-valued fields should be set as arrays
+     * or instead use the addField(...) function which will automatically
+     * make sure the field is an array.
+     *
+     * @param string $key
+     * @param mixed $value
+     */
+    public function __set($key, $value)
+    {
+        $this->setField($key, $value);
+    }
 
-	/**
-	 * Magic isset for fields values.  Do not call directly. Allows usage:
-	 *
-	 * <code>
-	 * isset($document->some_field);
-	 * </code>
-	 *
-	 * @param string $key
-	 * @return boolean
-	 */
-	public function __isset($key)
-	{
-		return isset($this->_fields[$key]);
-	}
+    /**
+     * Magic isset for fields values.  Do not call directly. Allows usage:
+     *
+     * <code>
+     * isset($document->some_field);
+     * </code>
+     *
+     * @param string $key
+     * @return boolean
+     */
+    public function __isset($key)
+    {
+        return isset($this->_fields[$key]);
+    }
 
-	/**
-	 * Magic unset for field values. Do not call directly. Allows usage:
-	 *
-	 * <code>
-	 * unset($document->some_field);
-	 * </code>
-	 *
-	 * @param string $key
-	 */
-	public function __unset($key)
-	{
-		unset($this->_fields[$key]);
-		unset($this->_fieldBoosts[$key]);
-	}
+    /**
+     * Magic unset for field values. Do not call directly. Allows usage:
+     *
+     * <code>
+     * unset($document->some_field);
+     * </code>
+     *
+     * @param string $key
+     */
+    public function __unset($key)
+    {
+        unset($this->_fields[$key]);
+        unset($this->_fieldBoosts[$key]);
+    }
 }
\ No newline at end of file

Spacing +7 added lines, -7 removed lines

@@ -79,14 +79,14 @@ 
 	 *
 	 * @var array
 	 */
-	protected $_fields = array();
+	protected $_fields = array ();
 
 	/**
 	 * Document field boost values, indexed by name
 	 *
 	 * @var array array of floats
 	 */
-	protected $_fieldBoosts = array();
+	protected $_fieldBoosts = array ();
 
 	/**
 	 * Clear all boosts and fields from this document
@@ -95,8 +95,8 @@ 
 	{
 		$this->_documentBoost = false;
 
-		$this->_fields = array();
-		$this->_fieldBoosts = array();
+		$this->_fields = array ();
+		$this->_fieldBoosts = array ();
 	}
 
 	/**
@@ -156,12 +156,12 @@ 
 		if (!isset($this->_fields[$key]))
 		{
 			// create holding array if this is the first value
-			$this->_fields[$key] = array();
+			$this->_fields[$key] = array ();
 		}
 		else if (!is_array($this->_fields[$key]))
 		{
 			// move existing value into array if it is not already an array
-			$this->_fields[$key] = array($this->_fields[$key]);
+			$this->_fields[$key] = array ($this->_fields[$key]);
 		}
 
 		if ($this->getFieldBoost($key) === false)
@@ -203,7 +203,7 @@ 
 	{
 		if (isset($this->_fields[$key]))
 		{
-			return array(
+			return array (
 				'name' => $key,
 				'value' => $this->_fields[$key],
 				'boost' => $this->getFieldBoost($key)

Braces +28 added lines, -60 removed lines

@@ -55,8 +55,7 @@ 
  * }
  * </code>
  */
-class Apache_Solr_Document implements IteratorAggregate
-{
+class Apache_Solr_Document implements IteratorAggregate {
 	/**
 	 * SVN Revision meta data for this class
 	 */
@@ -91,8 +90,7 @@ 
 	/**
 	 * Clear all boosts and fields from this document
 	 */
-	public function clear()
-	{
+	public function clear() {
 		$this->_documentBoost = false;
 
 		$this->_fields = array();
@@ -104,8 +102,7 @@ 
 	 *
 	 * @return mixed will be false for default, or else a float
 	 */
-	public function getBoost()
-	{
+	public function getBoost() {
 		return $this->_documentBoost;
 	}
 
@@ -114,16 +111,12 @@ 
 	 *
 	 * @param mixed $boost Use false for default boost, else cast to float that should be > 0 or will be treated as false
 	 */
-	public function setBoost($boost)
-	{
+	public function setBoost($boost) {
 		$boost = (float) $boost;
 
-		if ($boost > 0.0)
-		{
+		if ($boost > 0.0) {
 			$this->_documentBoost = $boost;
-		}
-		else
-		{
+		} else {
 			$this->_documentBoost = false;
 		}
 	}
@@ -151,26 +144,19 @@ 
 	 * @param mixed $value
 	 * @param mixed $boost Use false for default boost, else cast to float that should be > 0 or will be treated as false
 	 */
-	public function addField($key, $value, $boost = false)
-	{
-		if (!isset($this->_fields[$key]))
-		{
+	public function addField($key, $value, $boost = false) {
+		if (!isset($this->_fields[$key])) {
 			// create holding array if this is the first value
 			$this->_fields[$key] = array();
-		}
-		else if (!is_array($this->_fields[$key]))
-		{
+		} else if (!is_array($this->_fields[$key])) {
 			// move existing value into array if it is not already an array
 			$this->_fields[$key] = array($this->_fields[$key]);
 		}
 
-		if ($this->getFieldBoost($key) === false)
-		{
+		if ($this->getFieldBoost($key) === false) {
 			// boost not already set, set it now
 			$this->setFieldBoost($key, $boost);
-		}
-		else if ((float) $boost > 0.0)
-		{
+		} else if ((float) $boost > 0.0) {
 			// multiply passed boost with current field boost - similar to SolrJ implementation
 			$this->_fieldBoosts[$key] *= (float) $boost;
 		}
@@ -188,8 +174,7 @@ 
 	 *
 	 * @deprecated Use addField(...) instead
 	 */
-	public function setMultiValue($key, $value, $boost = false)
-	{
+	public function setMultiValue($key, $value, $boost = false) {
 		$this->addField($key, $value, $boost);
 	}
 
@@ -199,10 +184,8 @@ 
 	 * @param string $key
 	 * @return mixed associative array of info if field exists, false otherwise
 	 */
-	public function getField($key)
-	{
-		if (isset($this->_fields[$key]))
-		{
+	public function getField($key) {
+		if (isset($this->_fields[$key])) {
 			return array(
 				'name' => $key,
 				'value' => $this->_fields[$key],
@@ -222,8 +205,7 @@ 
 	 * @param mixed $value
 	 * @param mixed $boost Use false for default boost, else cast to float that should be > 0 or will be treated as false
 	 */
-	public function setField($key, $value, $boost = false)
-	{
+	public function setField($key, $value, $boost = false) {
 		$this->_fields[$key] = $value;
 		$this->setFieldBoost($key, $boost);
 	}
@@ -234,8 +216,7 @@ 
 	 * @param string $key
 	 * @return float currently set field boost, false if one is not set
 	 */
-	public function getFieldBoost($key)
-	{
+	public function getFieldBoost($key) {
 		return isset($this->_fieldBoosts[$key]) ? $this->_fieldBoosts[$key] : false;
 	}
 
@@ -245,16 +226,12 @@ 
 	 * @param string $key field name for the boost
 	 * @param mixed $boost Use false for default boost, else cast to float that should be > 0 or will be treated as false
 	 */
-	public function setFieldBoost($key, $boost)
-	{
+	public function setFieldBoost($key, $boost) {
 		$boost = (float) $boost;
 
-		if ($boost > 0.0)
-		{
+		if ($boost > 0.0) {
 			$this->_fieldBoosts[$key] = $boost;
-		}
-		else
-		{
+		} else {
 			$this->_fieldBoosts[$key] = false;
 		}
 	}
@@ -264,8 +241,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function getFieldBoosts()
-	{
+	public function getFieldBoosts() {
 		return $this->_fieldBoosts;
 	}
 
@@ -274,8 +250,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function getFieldNames()
-	{
+	public function getFieldNames() {
 		return array_keys($this->_fields);
 	}
 
@@ -284,8 +259,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function getFieldValues()
-	{
+	public function getFieldValues() {
 		return array_values($this->_fields);
 	}
 
@@ -299,8 +273,7 @@ 
 	 * }
 	 * </code>
 	 */
-	public function getIterator()
-	{
+	public function getIterator() {
 		$arrayObject = new ArrayObject($this->_fields);
 
 		return $arrayObject->getIterator();
@@ -312,10 +285,8 @@ 
 	 * @param string $key
 	 * @return mixed
 	 */
-	public function __get($key)
-	{
-		if (isset($this->_fields[$key]))
-		{
+	public function __get($key) {
+		if (isset($this->_fields[$key])) {
 			return $this->_fields[$key];
 		}
 		
@@ -330,8 +301,7 @@ 
 	 * @param string $key
 	 * @param mixed $value
 	 */
-	public function __set($key, $value)
-	{
+	public function __set($key, $value) {
 		$this->setField($key, $value);
 	}
 
@@ -345,8 +315,7 @@ 
 	 * @param string $key
 	 * @return boolean
 	 */
-	public function __isset($key)
-	{
+	public function __isset($key) {
 		return isset($this->_fields[$key]);
 	}
 
@@ -359,8 +328,7 @@ 
 	 *
 	 * @param string $key
 	 */
-	public function __unset($key)
-	{
+	public function __unset($key) {
 		unset($this->_fields[$key]);
 		unset($this->_fieldBoosts[$key]);
 	}

Upper-Lower-Casing +11 added lines, -11 removed lines

@@ -72,7 +72,7 @@ 
 	 *
 	 * @var float
 	 */
-	protected $_documentBoost = false;
+	protected $_documentBoost = FALSE;
 
 	/**
 	 * Document field values, indexed by name
@@ -93,7 +93,7 @@ 
 	 */
 	public function clear()
 	{
-		$this->_documentBoost = false;
+		$this->_documentBoost = FALSE;
 
 		$this->_fields = array();
 		$this->_fieldBoosts = array();
@@ -124,7 +124,7 @@ 
 		}
 		else
 		{
-			$this->_documentBoost = false;
+			$this->_documentBoost = FALSE;
 		}
 	}
 
@@ -151,7 +151,7 @@ 
 	 * @param mixed $value
 	 * @param mixed $boost Use false for default boost, else cast to float that should be > 0 or will be treated as false
 	 */
-	public function addField($key, $value, $boost = false)
+	public function addField($key, $value, $boost = FALSE)
 	{
 		if (!isset($this->_fields[$key]))
 		{
@@ -164,7 +164,7 @@ 
 			$this->_fields[$key] = array($this->_fields[$key]);
 		}
 
-		if ($this->getFieldBoost($key) === false)
+		if ($this->getFieldBoost($key) === FALSE)
 		{
 			// boost not already set, set it now
 			$this->setFieldBoost($key, $boost);
@@ -188,7 +188,7 @@ 
 	 *
 	 * @deprecated Use addField(...) instead
 	 */
-	public function setMultiValue($key, $value, $boost = false)
+	public function setMultiValue($key, $value, $boost = FALSE)
 	{
 		$this->addField($key, $value, $boost);
 	}
@@ -210,7 +210,7 @@ 
 			);
 		}
 
-		return false;
+		return FALSE;
 	}
 
 	/**
@@ -222,7 +222,7 @@ 
 	 * @param mixed $value
 	 * @param mixed $boost Use false for default boost, else cast to float that should be > 0 or will be treated as false
 	 */
-	public function setField($key, $value, $boost = false)
+	public function setField($key, $value, $boost = FALSE)
 	{
 		$this->_fields[$key] = $value;
 		$this->setFieldBoost($key, $boost);
@@ -236,7 +236,7 @@ 
 	 */
 	public function getFieldBoost($key)
 	{
-		return isset($this->_fieldBoosts[$key]) ? $this->_fieldBoosts[$key] : false;
+		return isset($this->_fieldBoosts[$key]) ? $this->_fieldBoosts[$key] : FALSE;
 	}
 
 	/**
@@ -255,7 +255,7 @@ 
 		}
 		else
 		{
-			$this->_fieldBoosts[$key] = false;
+			$this->_fieldBoosts[$key] = FALSE;
 		}
 	}
 
@@ -319,7 +319,7 @@ 
 			return $this->_fields[$key];
 		}
 		
-		return null;
+		return NULL;
 	}
 
 	/**

lib/SolrPhpClient/Apache/Solr/InvalidArgumentException.php

Indentation +8 added lines, -8 removed lines

@@ -38,13 +38,13 @@
 
 class Apache_Solr_InvalidArgumentException extends Apache_Solr_Exception
 {
-	/**
-	 * SVN Revision meta data for this class
-	 */
-	const SVN_REVISION = '$Revision: 54 $';
+    /**
+     * SVN Revision meta data for this class
+     */
+    const SVN_REVISION = '$Revision: 54 $';
 
-	/**
-	 * SVN ID meta data for this class
-	 */
-	const SVN_ID = '$Id: InvalidArgumentException.php 54 2011-02-04 16:29:18Z donovan.jimenez $';
+    /**
+     * SVN ID meta data for this class
+     */
+    const SVN_ID = '$Id: InvalidArgumentException.php 54 2011-02-04 16:29:18Z donovan.jimenez $';
 }
\ No newline at end of file

Braces +1 added lines, -2 removed lines

@@ -36,8 +36,7 @@
  * @author Donovan Jimenez <djimenez@conduit-it.com>
  */
 
-class Apache_Solr_InvalidArgumentException extends Apache_Solr_Exception
-{
+class Apache_Solr_InvalidArgumentException extends Apache_Solr_Exception {
 	/**
 	 * SVN Revision meta data for this class
 	 */

lib/SolrPhpClient/Apache/Solr/HttpTransport/FileGetContents.php

Indentation +160 added lines, -160 removed lines

@@ -44,173 +44,173 @@
  */
 class Apache_Solr_HttpTransport_FileGetContents extends Apache_Solr_HttpTransport_Abstract
 {
-	/**
-	 * SVN Revision meta data for this class
-	 */
-	const SVN_REVISION = '$Revision:  $';
-
-	/**
-	 * SVN ID meta data for this class
-	 */
-	const SVN_ID = '$Id:  $';
+    /**
+     * SVN Revision meta data for this class
+     */
+    const SVN_REVISION = '$Revision:  $';
+
+    /**
+     * SVN ID meta data for this class
+     */
+    const SVN_ID = '$Id:  $';
 		
-	/**
-	 * Reusable stream context resources for GET and POST operations
-	 *
-	 * @var resource
-	 */
-	private $_getContext, $_headContext, $_postContext;
+    /**
+     * Reusable stream context resources for GET and POST operations
+     *
+     * @var resource
+     */
+    private $_getContext, $_headContext, $_postContext;
 	
-	/**
-	 * Initializes our reuseable get and post stream contexts
-	 */
-	public function __construct()
-	{
-		$this->_getContext = stream_context_create();
-		$this->_headContext = stream_context_create();
-		$this->_postContext = stream_context_create();
-	}
-
-	public function performGetRequest($url, $timeout = false)
-	{
-		// set the timeout if specified
-		if ($timeout !== FALSE && $timeout > 0.0)
-		{
-			// timeouts with file_get_contents seem to need
-			// to be halved to work as expected
-			$timeout = (float) $timeout / 2;
-
-			stream_context_set_option($this->_getContext, 'http', 'timeout', $timeout);
-		}
-		else
-		{
-			// use the default timeout pulled from default_socket_timeout otherwise
-			stream_context_set_option($this->_getContext, 'http', 'timeout', $this->getDefaultTimeout());
-		}
-
-		// $http_response_headers will be updated by the call to file_get_contents later
-		// see http://us.php.net/manual/en/wrappers.http.php for documentation
-		// Unfortunately, it will still create a notice in analyzers if we don't set it here
-		$http_response_header = null;
-		$responseBody = @file_get_contents($url, false, $this->_getContext);
+    /**
+     * Initializes our reuseable get and post stream contexts
+     */
+    public function __construct()
+    {
+        $this->_getContext = stream_context_create();
+        $this->_headContext = stream_context_create();
+        $this->_postContext = stream_context_create();
+    }
+
+    public function performGetRequest($url, $timeout = false)
+    {
+        // set the timeout if specified
+        if ($timeout !== FALSE && $timeout > 0.0)
+        {
+            // timeouts with file_get_contents seem to need
+            // to be halved to work as expected
+            $timeout = (float) $timeout / 2;
+
+            stream_context_set_option($this->_getContext, 'http', 'timeout', $timeout);
+        }
+        else
+        {
+            // use the default timeout pulled from default_socket_timeout otherwise
+            stream_context_set_option($this->_getContext, 'http', 'timeout', $this->getDefaultTimeout());
+        }
+
+        // $http_response_headers will be updated by the call to file_get_contents later
+        // see http://us.php.net/manual/en/wrappers.http.php for documentation
+        // Unfortunately, it will still create a notice in analyzers if we don't set it here
+        $http_response_header = null;
+        $responseBody = @file_get_contents($url, false, $this->_getContext);
 		
-		return $this->_getResponseFromParts($responseBody, $http_response_header);
-	}
-
-	public function performHeadRequest($url, $timeout = false)
-	{
-		stream_context_set_option($this->_headContext, array(
-				'http' => array(
-					// set HTTP method
-					'method' => 'HEAD',
-
-					// default timeout
-					'timeout' => $this->getDefaultTimeout()
-				)
-			)
-		);
-
-		// set the timeout if specified
-		if ($timeout !== FALSE && $timeout > 0.0)
-		{
-			// timeouts with file_get_contents seem to need
-			// to be halved to work as expected
-			$timeout = (float) $timeout / 2;
-
-			stream_context_set_option($this->_headContext, 'http', 'timeout', $timeout);
-		}
+        return $this->_getResponseFromParts($responseBody, $http_response_header);
+    }
+
+    public function performHeadRequest($url, $timeout = false)
+    {
+        stream_context_set_option($this->_headContext, array(
+                'http' => array(
+                    // set HTTP method
+                    'method' => 'HEAD',
+
+                    // default timeout
+                    'timeout' => $this->getDefaultTimeout()
+                )
+            )
+        );
+
+        // set the timeout if specified
+        if ($timeout !== FALSE && $timeout > 0.0)
+        {
+            // timeouts with file_get_contents seem to need
+            // to be halved to work as expected
+            $timeout = (float) $timeout / 2;
+
+            stream_context_set_option($this->_headContext, 'http', 'timeout', $timeout);
+        }
 		
-		// $http_response_headers will be updated by the call to file_get_contents later
-		// see http://us.php.net/manual/en/wrappers.http.php for documentation
-		// Unfortunately, it will still create a notice in analyzers if we don't set it here
-		$http_response_header = null;
-		$responseBody = @file_get_contents($url, false, $this->_headContext);
-
-		return $this->_getResponseFromParts($responseBody, $http_response_header);
-	}
+        // $http_response_headers will be updated by the call to file_get_contents later
+        // see http://us.php.net/manual/en/wrappers.http.php for documentation
+        // Unfortunately, it will still create a notice in analyzers if we don't set it here
+        $http_response_header = null;
+        $responseBody = @file_get_contents($url, false, $this->_headContext);
+
+        return $this->_getResponseFromParts($responseBody, $http_response_header);
+    }
 	
-	public function performPostRequest($url, $rawPost, $contentType, $timeout = false)
-	{
-		stream_context_set_option($this->_postContext, array(
-				'http' => array(
-					// set HTTP method
-					'method' => 'POST',
-
-					// Add our posted content type
-					'header' => "Content-Type: $contentType",
-
-					// the posted content
-					'content' => $rawPost,
-
-					// default timeout
-					'timeout' => $this->getDefaultTimeout()
-				)
-			)
-		);
-
-		// set the timeout if specified
-		if ($timeout !== FALSE && $timeout > 0.0)
-		{
-			// timeouts with file_get_contents seem to need
-			// to be halved to work as expected
-			$timeout = (float) $timeout / 2;
-
-			stream_context_set_option($this->_postContext, 'http', 'timeout', $timeout);
-		}
-
-		// $http_response_header will be updated by the call to file_get_contents later
-		// see http://us.php.net/manual/en/wrappers.http.php for documentation
-		// Unfortunately, it will still create a notice in analyzers if we don't set it here
-		$http_response_header = null;
-		$responseBody = @file_get_contents($url, false, $this->_postContext);
+    public function performPostRequest($url, $rawPost, $contentType, $timeout = false)
+    {
+        stream_context_set_option($this->_postContext, array(
+                'http' => array(
+                    // set HTTP method
+                    'method' => 'POST',
+
+                    // Add our posted content type
+                    'header' => "Content-Type: $contentType",
+
+                    // the posted content
+                    'content' => $rawPost,
+
+                    // default timeout
+                    'timeout' => $this->getDefaultTimeout()
+                )
+            )
+        );
+
+        // set the timeout if specified
+        if ($timeout !== FALSE && $timeout > 0.0)
+        {
+            // timeouts with file_get_contents seem to need
+            // to be halved to work as expected
+            $timeout = (float) $timeout / 2;
+
+            stream_context_set_option($this->_postContext, 'http', 'timeout', $timeout);
+        }
+
+        // $http_response_header will be updated by the call to file_get_contents later
+        // see http://us.php.net/manual/en/wrappers.http.php for documentation
+        // Unfortunately, it will still create a notice in analyzers if we don't set it here
+        $http_response_header = null;
+        $responseBody = @file_get_contents($url, false, $this->_postContext);
 		
-		// reset content of post context to reclaim memory
-		stream_context_set_option($this->_postContext, 'http', 'content', '');
+        // reset content of post context to reclaim memory
+        stream_context_set_option($this->_postContext, 'http', 'content', '');
 		
-		return $this->_getResponseFromParts($responseBody, $http_response_header);
-	}
+        return $this->_getResponseFromParts($responseBody, $http_response_header);
+    }
 	
-	private function _getResponseFromParts($rawResponse, $httpHeaders)
-	{
-		//Assume 0, false as defaults
-		$status = 0;
-		$contentType = false;
-
-		//iterate through headers for real status, type, and encoding
-		if (is_array($httpHeaders) && count($httpHeaders) > 0)
-		{
-			//look at the first headers for the HTTP status code
-			//and message (errors are usually returned this way)
-			//
-			//HTTP 100 Continue response can also be returned before
-			//the REAL status header, so we need look until we find
-			//the last header starting with HTTP
-			//
-			//the spec: http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.1
-			//
-			//Thanks to Daniel Andersson for pointing out this oversight
-			while (isset($httpHeaders[0]) && substr($httpHeaders[0], 0, 4) == 'HTTP')
-			{
-				// we can do a intval on status line without the "HTTP/1.X " to get the code
-				$status = intval(substr($httpHeaders[0], 9));
-
-				// remove this from the headers so we can check for more
-				array_shift($httpHeaders);
-			}
-
-			//Look for the Content-Type response header and determine type
-			//and encoding from it (if possible - such as 'Content-Type: text/plain; charset=UTF-8')
-			foreach ($httpHeaders as $header)
-			{
-				// look for the header that starts appropriately
-				if (strncasecmp($header, 'Content-Type:', 13) == 0)
-				{
-					$contentType = substr($header, 13);
-					break;
-				}
-			}
-		}
+    private function _getResponseFromParts($rawResponse, $httpHeaders)
+    {
+        //Assume 0, false as defaults
+        $status = 0;
+        $contentType = false;
+
+        //iterate through headers for real status, type, and encoding
+        if (is_array($httpHeaders) && count($httpHeaders) > 0)
+        {
+            //look at the first headers for the HTTP status code
+            //and message (errors are usually returned this way)
+            //
+            //HTTP 100 Continue response can also be returned before
+            //the REAL status header, so we need look until we find
+            //the last header starting with HTTP
+            //
+            //the spec: http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.1
+            //
+            //Thanks to Daniel Andersson for pointing out this oversight
+            while (isset($httpHeaders[0]) && substr($httpHeaders[0], 0, 4) == 'HTTP')
+            {
+                // we can do a intval on status line without the "HTTP/1.X " to get the code
+                $status = intval(substr($httpHeaders[0], 9));
+
+                // remove this from the headers so we can check for more
+                array_shift($httpHeaders);
+            }
+
+            //Look for the Content-Type response header and determine type
+            //and encoding from it (if possible - such as 'Content-Type: text/plain; charset=UTF-8')
+            foreach ($httpHeaders as $header)
+            {
+                // look for the header that starts appropriately
+                if (strncasecmp($header, 'Content-Type:', 13) == 0)
+                {
+                    $contentType = substr($header, 13);
+                    break;
+                }
+            }
+        }
 		
-		return new Apache_Solr_HttpTransport_Response($status, $contentType, $rawResponse);
-	}
+        return new Apache_Solr_HttpTransport_Response($status, $contentType, $rawResponse);
+    }
 }
\ No newline at end of file

Spacing +5 added lines, -5 removed lines

@@ -37,7 +37,7 @@ 
  */
 
 // Require Apache_Solr_HttpTransport_Abstract
-require_once(dirname(__FILE__) . '/Abstract.php');
+require_once(dirname(__FILE__).'/Abstract.php');
 
 /**
  * HTTP Transport implemenation that uses the builtin http URL wrappers and file_get_contents
@@ -99,8 +99,8 @@ 
 
 	public function performHeadRequest($url, $timeout = false)
 	{
-		stream_context_set_option($this->_headContext, array(
-				'http' => array(
+		stream_context_set_option($this->_headContext, array (
+				'http' => array (
 					// set HTTP method
 					'method' => 'HEAD',
 
@@ -131,8 +131,8 @@ 
 	
 	public function performPostRequest($url, $rawPost, $contentType, $timeout = false)
 	{
-		stream_context_set_option($this->_postContext, array(
-				'http' => array(
+		stream_context_set_option($this->_postContext, array (
+				'http' => array (
 					// set HTTP method
 					'method' => 'POST',
 

Braces +14 added lines, -29 removed lines

@@ -42,8 +42,7 @@ 
 /**
  * HTTP Transport implemenation that uses the builtin http URL wrappers and file_get_contents
  */
-class Apache_Solr_HttpTransport_FileGetContents extends Apache_Solr_HttpTransport_Abstract
-{
+class Apache_Solr_HttpTransport_FileGetContents extends Apache_Solr_HttpTransport_Abstract {
 	/**
 	 * SVN Revision meta data for this class
 	 */
@@ -64,26 +63,21 @@ 
 	/**
 	 * Initializes our reuseable get and post stream contexts
 	 */
-	public function __construct()
-	{
+	public function __construct() {
 		$this->_getContext = stream_context_create();
 		$this->_headContext = stream_context_create();
 		$this->_postContext = stream_context_create();
 	}
 
-	public function performGetRequest($url, $timeout = false)
-	{
+	public function performGetRequest($url, $timeout = false) {
 		// set the timeout if specified
-		if ($timeout !== FALSE && $timeout > 0.0)
-		{
+		if ($timeout !== FALSE && $timeout > 0.0) {
 			// timeouts with file_get_contents seem to need
 			// to be halved to work as expected
 			$timeout = (float) $timeout / 2;
 
 			stream_context_set_option($this->_getContext, 'http', 'timeout', $timeout);
-		}
-		else
-		{
+		} else {
 			// use the default timeout pulled from default_socket_timeout otherwise
 			stream_context_set_option($this->_getContext, 'http', 'timeout', $this->getDefaultTimeout());
 		}
@@ -97,8 +91,7 @@ 
 		return $this->_getResponseFromParts($responseBody, $http_response_header);
 	}
 
-	public function performHeadRequest($url, $timeout = false)
-	{
+	public function performHeadRequest($url, $timeout = false) {
 		stream_context_set_option($this->_headContext, array(
 				'http' => array(
 					// set HTTP method
@@ -111,8 +104,7 @@ 
 		);
 
 		// set the timeout if specified
-		if ($timeout !== FALSE && $timeout > 0.0)
-		{
+		if ($timeout !== FALSE && $timeout > 0.0) {
 			// timeouts with file_get_contents seem to need
 			// to be halved to work as expected
 			$timeout = (float) $timeout / 2;
@@ -129,8 +121,7 @@ 
 		return $this->_getResponseFromParts($responseBody, $http_response_header);
 	}
 	
-	public function performPostRequest($url, $rawPost, $contentType, $timeout = false)
-	{
+	public function performPostRequest($url, $rawPost, $contentType, $timeout = false) {
 		stream_context_set_option($this->_postContext, array(
 				'http' => array(
 					// set HTTP method
@@ -149,8 +140,7 @@ 
 		);
 
 		// set the timeout if specified
-		if ($timeout !== FALSE && $timeout > 0.0)
-		{
+		if ($timeout !== FALSE && $timeout > 0.0) {
 			// timeouts with file_get_contents seem to need
 			// to be halved to work as expected
 			$timeout = (float) $timeout / 2;
@@ -170,15 +160,13 @@ 
 		return $this->_getResponseFromParts($responseBody, $http_response_header);
 	}
 	
-	private function _getResponseFromParts($rawResponse, $httpHeaders)
-	{
+	private function _getResponseFromParts($rawResponse, $httpHeaders) {
 		//Assume 0, false as defaults
 		$status = 0;
 		$contentType = false;
 
 		//iterate through headers for real status, type, and encoding
-		if (is_array($httpHeaders) && count($httpHeaders) > 0)
-		{
+		if (is_array($httpHeaders) && count($httpHeaders) > 0) {
 			//look at the first headers for the HTTP status code
 			//and message (errors are usually returned this way)
 			//
@@ -189,8 +177,7 @@ 
 			//the spec: http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.1
 			//
 			//Thanks to Daniel Andersson for pointing out this oversight
-			while (isset($httpHeaders[0]) && substr($httpHeaders[0], 0, 4) == 'HTTP')
-			{
+			while (isset($httpHeaders[0]) && substr($httpHeaders[0], 0, 4) == 'HTTP') {
 				// we can do a intval on status line without the "HTTP/1.X " to get the code
 				$status = intval(substr($httpHeaders[0], 9));
 
@@ -200,11 +187,9 @@ 
 
 			//Look for the Content-Type response header and determine type
 			//and encoding from it (if possible - such as 'Content-Type: text/plain; charset=UTF-8')
-			foreach ($httpHeaders as $header)
-			{
+			foreach ($httpHeaders as $header) {
 				// look for the header that starts appropriately
-				if (strncasecmp($header, 'Content-Type:', 13) == 0)
-				{
+				if (strncasecmp($header, 'Content-Type:', 13) == 0) {
 					$contentType = substr($header, 13);
 					break;
 				}

Upper-Lower-Casing +10 added lines, -10 removed lines

@@ -71,7 +71,7 @@ 
 		$this->_postContext = stream_context_create();
 	}
 
-	public function performGetRequest($url, $timeout = false)
+	public function performGetRequest($url, $timeout = FALSE)
 	{
 		// set the timeout if specified
 		if ($timeout !== FALSE && $timeout > 0.0)
@@ -91,13 +91,13 @@ 
 		// $http_response_headers will be updated by the call to file_get_contents later
 		// see http://us.php.net/manual/en/wrappers.http.php for documentation
 		// Unfortunately, it will still create a notice in analyzers if we don't set it here
-		$http_response_header = null;
-		$responseBody = @file_get_contents($url, false, $this->_getContext);
+		$http_response_header = NULL;
+		$responseBody = @file_get_contents($url, FALSE, $this->_getContext);
 		
 		return $this->_getResponseFromParts($responseBody, $http_response_header);
 	}
 
-	public function performHeadRequest($url, $timeout = false)
+	public function performHeadRequest($url, $timeout = FALSE)
 	{
 		stream_context_set_option($this->_headContext, array(
 				'http' => array(
@@ -123,13 +123,13 @@ 
 		// $http_response_headers will be updated by the call to file_get_contents later
 		// see http://us.php.net/manual/en/wrappers.http.php for documentation
 		// Unfortunately, it will still create a notice in analyzers if we don't set it here
-		$http_response_header = null;
-		$responseBody = @file_get_contents($url, false, $this->_headContext);
+		$http_response_header = NULL;
+		$responseBody = @file_get_contents($url, FALSE, $this->_headContext);
 
 		return $this->_getResponseFromParts($responseBody, $http_response_header);
 	}
 	
-	public function performPostRequest($url, $rawPost, $contentType, $timeout = false)
+	public function performPostRequest($url, $rawPost, $contentType, $timeout = FALSE)
 	{
 		stream_context_set_option($this->_postContext, array(
 				'http' => array(
@@ -161,8 +161,8 @@ 
 		// $http_response_header will be updated by the call to file_get_contents later
 		// see http://us.php.net/manual/en/wrappers.http.php for documentation
 		// Unfortunately, it will still create a notice in analyzers if we don't set it here
-		$http_response_header = null;
-		$responseBody = @file_get_contents($url, false, $this->_postContext);
+		$http_response_header = NULL;
+		$responseBody = @file_get_contents($url, FALSE, $this->_postContext);
 		
 		// reset content of post context to reclaim memory
 		stream_context_set_option($this->_postContext, 'http', 'content', '');
@@ -174,7 +174,7 @@ 
 	{
 		//Assume 0, false as defaults
 		$status = 0;
-		$contentType = false;
+		$contentType = FALSE;
 
 		//iterate through headers for real status, type, and encoding
 		if (is_array($httpHeaders) && count($httpHeaders) > 0)

lib/SolrPhpClient/Apache/Solr/HttpTransport/Curl.php

Indentation +151 added lines, -151 removed lines

@@ -44,155 +44,155 @@
  */
 class Apache_Solr_HttpTransport_Curl extends Apache_Solr_HttpTransport_Abstract
 {
-	/**
-	 * SVN Revision meta data for this class
-	 */
-	const SVN_REVISION = '$Revision:$';
-
-	/**
-	 * SVN ID meta data for this class
-	 */
-	const SVN_ID = '$Id:$';
-
-	/**
-	 * Curl Session Handle
-	 *
-	 * @var resource
-	 */
-	private $_curl;
-
-	/**
-	 * Initializes a curl session
-	 */
-	public function __construct()
-	{
-		// initialize a CURL session
-		$this->_curl = curl_init();
-
-		// set common options that will not be changed during the session
-		curl_setopt_array($this->_curl, array(
-			// return the response body from curl_exec
-			CURLOPT_RETURNTRANSFER => true,
-
-			// get the output as binary data
-			CURLOPT_BINARYTRANSFER => true,
-
-			// we do not need the headers in the output, we get everything we need from curl_getinfo
-			CURLOPT_HEADER => false
-		));
-	}
-
-	/**
-	 * Closes a curl session
-	 */
-	function __destruct()
-	{
-		// close our curl session
-		curl_close($this->_curl);
-	}
-
-	public function performGetRequest($url, $timeout = false)
-	{
-		// check the timeout value
-		if ($timeout === false || $timeout <= 0.0)
-		{
-			// use the default timeout
-			$timeout = $this->getDefaultTimeout();
-		}
-
-		// set curl GET options
-		curl_setopt_array($this->_curl, array(
-			// make sure we're returning the body
-			CURLOPT_NOBODY => false,
-
-			// make sure we're GET
-			CURLOPT_HTTPGET => true,
-
-			// set the URL
-			CURLOPT_URL => $url,
-
-			// set the timeout
-			CURLOPT_TIMEOUT => $timeout
-		));
-
-		// make the request
-		$responseBody = curl_exec($this->_curl);
-
-		// get info from the transfer
-		$statusCode = curl_getinfo($this->_curl, CURLINFO_HTTP_CODE);
-		$contentType = curl_getinfo($this->_curl, CURLINFO_CONTENT_TYPE);
-
-		return new Apache_Solr_HttpTransport_Response($statusCode, $contentType, $responseBody);
-	}
-
-	public function performHeadRequest($url, $timeout = false)
-	{
-		// check the timeout value
-		if ($timeout === false || $timeout <= 0.0)
-		{
-			// use the default timeout
-			$timeout = $this->getDefaultTimeout();
-		}
-
-		// set curl HEAD options
-		curl_setopt_array($this->_curl, array(
-			// this both sets the method to HEAD and says not to return a body
-			CURLOPT_NOBODY => true,
-
-			// set the URL
-			CURLOPT_URL => $url,
-
-			// set the timeout
-			CURLOPT_TIMEOUT => $timeout
-		));
-
-		// make the request
-		$responseBody = curl_exec($this->_curl);
-
-		// get info from the transfer
-		$statusCode = curl_getinfo($this->_curl, CURLINFO_HTTP_CODE);
-		$contentType = curl_getinfo($this->_curl, CURLINFO_CONTENT_TYPE);
-
-		return new Apache_Solr_HttpTransport_Response($statusCode, $contentType, $responseBody);
-	}
-
-	public function performPostRequest($url, $postData, $contentType, $timeout = false)
-	{
-		// check the timeout value
-		if ($timeout === false || $timeout <= 0.0)
-		{
-			// use the default timeout
-			$timeout = $this->getDefaultTimeout();
-		}
-
-		// set curl POST options
-		curl_setopt_array($this->_curl, array(
-			// make sure we're returning the body
-			CURLOPT_NOBODY => false,
-
-			// make sure we're POST
-			CURLOPT_POST => true,
-
-			// set the URL
-			CURLOPT_URL => $url,
-
-			// set the post data
-			CURLOPT_POSTFIELDS => $postData,
-
-			// set the content type
-			CURLOPT_HTTPHEADER => array("Content-Type: {$contentType}"),
-
-			// set the timeout
-			CURLOPT_TIMEOUT => $timeout
-		));
-
-		// make the request
-		$responseBody = curl_exec($this->_curl);
-
-		// get info from the transfer
-		$statusCode = curl_getinfo($this->_curl, CURLINFO_HTTP_CODE);
-		$contentType = curl_getinfo($this->_curl, CURLINFO_CONTENT_TYPE);
-
-		return new Apache_Solr_HttpTransport_Response($statusCode, $contentType, $responseBody);
-	}
+    /**
+     * SVN Revision meta data for this class
+     */
+    const SVN_REVISION = '$Revision:$';
+
+    /**
+     * SVN ID meta data for this class
+     */
+    const SVN_ID = '$Id:$';
+
+    /**
+     * Curl Session Handle
+     *
+     * @var resource
+     */
+    private $_curl;
+
+    /**
+     * Initializes a curl session
+     */
+    public function __construct()
+    {
+        // initialize a CURL session
+        $this->_curl = curl_init();
+
+        // set common options that will not be changed during the session
+        curl_setopt_array($this->_curl, array(
+            // return the response body from curl_exec
+            CURLOPT_RETURNTRANSFER => true,
+
+            // get the output as binary data
+            CURLOPT_BINARYTRANSFER => true,
+
+            // we do not need the headers in the output, we get everything we need from curl_getinfo
+            CURLOPT_HEADER => false
+        ));
+    }
+
+    /**
+     * Closes a curl session
+     */
+    function __destruct()
+    {
+        // close our curl session
+        curl_close($this->_curl);
+    }
+
+    public function performGetRequest($url, $timeout = false)
+    {
+        // check the timeout value
+        if ($timeout === false || $timeout <= 0.0)
+        {
+            // use the default timeout
+            $timeout = $this->getDefaultTimeout();
+        }
+
+        // set curl GET options
+        curl_setopt_array($this->_curl, array(
+            // make sure we're returning the body
+            CURLOPT_NOBODY => false,
+
+            // make sure we're GET
+            CURLOPT_HTTPGET => true,
+
+            // set the URL
+            CURLOPT_URL => $url,
+
+            // set the timeout
+            CURLOPT_TIMEOUT => $timeout
+        ));
+
+        // make the request
+        $responseBody = curl_exec($this->_curl);
+
+        // get info from the transfer
+        $statusCode = curl_getinfo($this->_curl, CURLINFO_HTTP_CODE);
+        $contentType = curl_getinfo($this->_curl, CURLINFO_CONTENT_TYPE);
+
+        return new Apache_Solr_HttpTransport_Response($statusCode, $contentType, $responseBody);
+    }
+
+    public function performHeadRequest($url, $timeout = false)
+    {
+        // check the timeout value
+        if ($timeout === false || $timeout <= 0.0)
+        {
+            // use the default timeout
+            $timeout = $this->getDefaultTimeout();
+        }
+
+        // set curl HEAD options
+        curl_setopt_array($this->_curl, array(
+            // this both sets the method to HEAD and says not to return a body
+            CURLOPT_NOBODY => true,
+
+            // set the URL
+            CURLOPT_URL => $url,
+
+            // set the timeout
+            CURLOPT_TIMEOUT => $timeout
+        ));
+
+        // make the request
+        $responseBody = curl_exec($this->_curl);
+
+        // get info from the transfer
+        $statusCode = curl_getinfo($this->_curl, CURLINFO_HTTP_CODE);
+        $contentType = curl_getinfo($this->_curl, CURLINFO_CONTENT_TYPE);
+
+        return new Apache_Solr_HttpTransport_Response($statusCode, $contentType, $responseBody);
+    }
+
+    public function performPostRequest($url, $postData, $contentType, $timeout = false)
+    {
+        // check the timeout value
+        if ($timeout === false || $timeout <= 0.0)
+        {
+            // use the default timeout
+            $timeout = $this->getDefaultTimeout();
+        }
+
+        // set curl POST options
+        curl_setopt_array($this->_curl, array(
+            // make sure we're returning the body
+            CURLOPT_NOBODY => false,
+
+            // make sure we're POST
+            CURLOPT_POST => true,
+
+            // set the URL
+            CURLOPT_URL => $url,
+
+            // set the post data
+            CURLOPT_POSTFIELDS => $postData,
+
+            // set the content type
+            CURLOPT_HTTPHEADER => array("Content-Type: {$contentType}"),
+
+            // set the timeout
+            CURLOPT_TIMEOUT => $timeout
+        ));
+
+        // make the request
+        $responseBody = curl_exec($this->_curl);
+
+        // get info from the transfer
+        $statusCode = curl_getinfo($this->_curl, CURLINFO_HTTP_CODE);
+        $contentType = curl_getinfo($this->_curl, CURLINFO_CONTENT_TYPE);
+
+        return new Apache_Solr_HttpTransport_Response($statusCode, $contentType, $responseBody);
+    }
 }
\ No newline at end of file

Spacing +6 added lines, -6 removed lines

@@ -37,7 +37,7 @@ 
  */
 
 // Require Apache_Solr_HttpTransport_Abstract
-require_once(dirname(__FILE__) . '/Abstract.php');
+require_once(dirname(__FILE__).'/Abstract.php');
 
 /**
  * A Curl based HTTP transport. Uses a single curl session for all requests.
@@ -70,7 +70,7 @@ 
 		$this->_curl = curl_init();
 
 		// set common options that will not be changed during the session
-		curl_setopt_array($this->_curl, array(
+		curl_setopt_array($this->_curl, array (
 			// return the response body from curl_exec
 			CURLOPT_RETURNTRANSFER => true,
 
@@ -101,7 +101,7 @@ 
 		}
 
 		// set curl GET options
-		curl_setopt_array($this->_curl, array(
+		curl_setopt_array($this->_curl, array (
 			// make sure we're returning the body
 			CURLOPT_NOBODY => false,
 
@@ -135,7 +135,7 @@ 
 		}
 
 		// set curl HEAD options
-		curl_setopt_array($this->_curl, array(
+		curl_setopt_array($this->_curl, array (
 			// this both sets the method to HEAD and says not to return a body
 			CURLOPT_NOBODY => true,
 
@@ -166,7 +166,7 @@ 
 		}
 
 		// set curl POST options
-		curl_setopt_array($this->_curl, array(
+		curl_setopt_array($this->_curl, array (
 			// make sure we're returning the body
 			CURLOPT_NOBODY => false,
 
@@ -180,7 +180,7 @@ 
 			CURLOPT_POSTFIELDS => $postData,
 
 			// set the content type
-			CURLOPT_HTTPHEADER => array("Content-Type: {$contentType}"),
+			CURLOPT_HTTPHEADER => array ("Content-Type: {$contentType}"),
 
 			// set the timeout
 			CURLOPT_TIMEOUT => $timeout

Braces +9 added lines, -18 removed lines

@@ -42,8 +42,7 @@ 
 /**
  * A Curl based HTTP transport. Uses a single curl session for all requests.
  */
-class Apache_Solr_HttpTransport_Curl extends Apache_Solr_HttpTransport_Abstract
-{
+class Apache_Solr_HttpTransport_Curl extends Apache_Solr_HttpTransport_Abstract {
 	/**
 	 * SVN Revision meta data for this class
 	 */
@@ -64,8 +63,7 @@ 
 	/**
 	 * Initializes a curl session
 	 */
-	public function __construct()
-	{
+	public function __construct() {
 		// initialize a CURL session
 		$this->_curl = curl_init();
 
@@ -85,17 +83,14 @@ 
 	/**
 	 * Closes a curl session
 	 */
-	function __destruct()
-	{
+	function __destruct() {
 		// close our curl session
 		curl_close($this->_curl);
 	}
 
-	public function performGetRequest($url, $timeout = false)
-	{
+	public function performGetRequest($url, $timeout = false) {
 		// check the timeout value
-		if ($timeout === false || $timeout <= 0.0)
-		{
+		if ($timeout === false || $timeout <= 0.0) {
 			// use the default timeout
 			$timeout = $this->getDefaultTimeout();
 		}
@@ -125,11 +120,9 @@ 
 		return new Apache_Solr_HttpTransport_Response($statusCode, $contentType, $responseBody);
 	}
 
-	public function performHeadRequest($url, $timeout = false)
-	{
+	public function performHeadRequest($url, $timeout = false) {
 		// check the timeout value
-		if ($timeout === false || $timeout <= 0.0)
-		{
+		if ($timeout === false || $timeout <= 0.0) {
 			// use the default timeout
 			$timeout = $this->getDefaultTimeout();
 		}
@@ -156,11 +149,9 @@ 
 		return new Apache_Solr_HttpTransport_Response($statusCode, $contentType, $responseBody);
 	}
 
-	public function performPostRequest($url, $postData, $contentType, $timeout = false)
-	{
+	public function performPostRequest($url, $postData, $contentType, $timeout = false) {
 		// check the timeout value
-		if ($timeout === false || $timeout <= 0.0)
-		{
+		if ($timeout === false || $timeout <= 0.0) {
 			// use the default timeout
 			$timeout = $this->getDefaultTimeout();
 		}

Upper-Lower-Casing +14 added lines, -14 removed lines

@@ -72,13 +72,13 @@ 
 		// set common options that will not be changed during the session
 		curl_setopt_array($this->_curl, array(
 			// return the response body from curl_exec
-			CURLOPT_RETURNTRANSFER => true,
+			CURLOPT_RETURNTRANSFER => TRUE,
 
 			// get the output as binary data
-			CURLOPT_BINARYTRANSFER => true,
+			CURLOPT_BINARYTRANSFER => TRUE,
 
 			// we do not need the headers in the output, we get everything we need from curl_getinfo
-			CURLOPT_HEADER => false
+			CURLOPT_HEADER => FALSE
 		));
 	}
 
@@ -91,10 +91,10 @@ 
 		curl_close($this->_curl);
 	}
 
-	public function performGetRequest($url, $timeout = false)
+	public function performGetRequest($url, $timeout = FALSE)
 	{
 		// check the timeout value
-		if ($timeout === false || $timeout <= 0.0)
+		if ($timeout === FALSE || $timeout <= 0.0)
 		{
 			// use the default timeout
 			$timeout = $this->getDefaultTimeout();
@@ -103,10 +103,10 @@ 
 		// set curl GET options
 		curl_setopt_array($this->_curl, array(
 			// make sure we're returning the body
-			CURLOPT_NOBODY => false,
+			CURLOPT_NOBODY => FALSE,
 
 			// make sure we're GET
-			CURLOPT_HTTPGET => true,
+			CURLOPT_HTTPGET => TRUE,
 
 			// set the URL
 			CURLOPT_URL => $url,
@@ -125,10 +125,10 @@ 
 		return new Apache_Solr_HttpTransport_Response($statusCode, $contentType, $responseBody);
 	}
 
-	public function performHeadRequest($url, $timeout = false)
+	public function performHeadRequest($url, $timeout = FALSE)
 	{
 		// check the timeout value
-		if ($timeout === false || $timeout <= 0.0)
+		if ($timeout === FALSE || $timeout <= 0.0)
 		{
 			// use the default timeout
 			$timeout = $this->getDefaultTimeout();
@@ -137,7 +137,7 @@ 
 		// set curl HEAD options
 		curl_setopt_array($this->_curl, array(
 			// this both sets the method to HEAD and says not to return a body
-			CURLOPT_NOBODY => true,
+			CURLOPT_NOBODY => TRUE,
 
 			// set the URL
 			CURLOPT_URL => $url,
@@ -156,10 +156,10 @@ 
 		return new Apache_Solr_HttpTransport_Response($statusCode, $contentType, $responseBody);
 	}
 
-	public function performPostRequest($url, $postData, $contentType, $timeout = false)
+	public function performPostRequest($url, $postData, $contentType, $timeout = FALSE)
 	{
 		// check the timeout value
-		if ($timeout === false || $timeout <= 0.0)
+		if ($timeout === FALSE || $timeout <= 0.0)
 		{
 			// use the default timeout
 			$timeout = $this->getDefaultTimeout();
@@ -168,10 +168,10 @@ 
 		// set curl POST options
 		curl_setopt_array($this->_curl, array(
 			// make sure we're returning the body
-			CURLOPT_NOBODY => false,
+			CURLOPT_NOBODY => FALSE,
 
 			// make sure we're POST
-			CURLOPT_POST => true,
+			CURLOPT_POST => TRUE,
 
 			// set the URL
 			CURLOPT_URL => $url,

lib/SolrPhpClient/Apache/Solr/HttpTransport/Response.php

Indentation +183 added lines, -183 removed lines

@@ -43,213 +43,213 @@
  */
 class Apache_Solr_HttpTransport_Response
 {
-	/**
-	 * Status Messages indexed by Status Code
-	 * Obtained from: http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
-	 *
-	 * @var array
-	 */
-	static private $_defaultStatusMessages = array(
-		// Specific to PHP Solr Client
-		0 => "Communication Error",
+    /**
+     * Status Messages indexed by Status Code
+     * Obtained from: http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
+     *
+     * @var array
+     */
+    static private $_defaultStatusMessages = array(
+        // Specific to PHP Solr Client
+        0 => "Communication Error",
 		
-		// Informational 1XX
-		100 => "Continue",
-		101 => "Switching Protocols",
+        // Informational 1XX
+        100 => "Continue",
+        101 => "Switching Protocols",
 		
-		// Successful 2XX
-		200 => "OK",
-		201 => "Created",
-		202 => "Accepted",
-		203 => "Non-Authoritative Information",
-		204 => "No Content",
-		205 => "Reset Content",
-		206 => "Partial Content",
+        // Successful 2XX
+        200 => "OK",
+        201 => "Created",
+        202 => "Accepted",
+        203 => "Non-Authoritative Information",
+        204 => "No Content",
+        205 => "Reset Content",
+        206 => "Partial Content",
 		
-		// Redirection 3XX
-		300 => "Multiple Choices",
-		301 => "Moved Permanently",
-		302 => "Found",
-		303 => "See Other",
-		304 => "Not Modified",
-		305 => "Use Proxy",
-		307 => "Temporary Redirect",
+        // Redirection 3XX
+        300 => "Multiple Choices",
+        301 => "Moved Permanently",
+        302 => "Found",
+        303 => "See Other",
+        304 => "Not Modified",
+        305 => "Use Proxy",
+        307 => "Temporary Redirect",
 		
-		// Client Error 4XX
-		400 => "Bad Request",
-		401 => "Unauthorized",
-		402 => "Payment Required",
-		403 => "Forbidden",
-		404 => "Not Found",
-		405 => "Method Not Allowed",
-		406 => "Not Acceptable",
-		407 => "Proxy Authentication Required",
-		408 => "Request Timeout",
-		409 => "Conflict",
-		410 => "Gone",
-		411 => "Length Required",
-		412 => "Precondition Failed",
-		413 => "Request Entity Too Large",
-		414 => "Request-URI Too Long",
-		415 => "Unsupported Media Type",
-		416 => "Request Range Not Satisfiable",
-		417 => "Expectation Failed",
+        // Client Error 4XX
+        400 => "Bad Request",
+        401 => "Unauthorized",
+        402 => "Payment Required",
+        403 => "Forbidden",
+        404 => "Not Found",
+        405 => "Method Not Allowed",
+        406 => "Not Acceptable",
+        407 => "Proxy Authentication Required",
+        408 => "Request Timeout",
+        409 => "Conflict",
+        410 => "Gone",
+        411 => "Length Required",
+        412 => "Precondition Failed",
+        413 => "Request Entity Too Large",
+        414 => "Request-URI Too Long",
+        415 => "Unsupported Media Type",
+        416 => "Request Range Not Satisfiable",
+        417 => "Expectation Failed",
 		
-		// Server Error 5XX
-		500 => "Internal Server Error",
-		501 => "Not Implemented",
-		502 => "Bad Gateway",
-		503 => "Service Unavailable",
-		504 => "Gateway Timeout",
-		505 => "HTTP Version Not Supported"
-	);
+        // Server Error 5XX
+        500 => "Internal Server Error",
+        501 => "Not Implemented",
+        502 => "Bad Gateway",
+        503 => "Service Unavailable",
+        504 => "Gateway Timeout",
+        505 => "HTTP Version Not Supported"
+    );
 	
-	/**
-	 * Get the HTTP status message based on status code
-	 *
-	 * @return string
-	 */
-	public static function getDefaultStatusMessage($statusCode)
-	{
-		$statusCode = (int) $statusCode;
+    /**
+     * Get the HTTP status message based on status code
+     *
+     * @return string
+     */
+    public static function getDefaultStatusMessage($statusCode)
+    {
+        $statusCode = (int) $statusCode;
 		
-		if (isset(self::$_defaultStatusMessages[$statusCode]))
-		{
-			return self::$_defaultStatusMessages[$statusCode];
-		}
+        if (isset(self::$_defaultStatusMessages[$statusCode]))
+        {
+            return self::$_defaultStatusMessages[$statusCode];
+        }
 		
-		return "Unknown Status";
-	}
+        return "Unknown Status";
+    }
 	
-	/**
-	 * The response's HTTP status code
-	 *
-	 * @var integer
-	 */
-	private $_statusCode;
+    /**
+     * The response's HTTP status code
+     *
+     * @var integer
+     */
+    private $_statusCode;
 	
-	/**
-	 * The response's HTTP status message
-	 *
-	 * @var string
-	 */
-	private $_statusMessage;
+    /**
+     * The response's HTTP status message
+     *
+     * @var string
+     */
+    private $_statusMessage;
 	
-	/**
-	 * The response's mime type
-	 *
-	 * @var string
-	 */
-	private $_mimeType;
+    /**
+     * The response's mime type
+     *
+     * @var string
+     */
+    private $_mimeType;
 	
-	/**
-	 * The response's character encoding
-	 *
-	 * @var string
-	 */
-	private $_encoding;
+    /**
+     * The response's character encoding
+     *
+     * @var string
+     */
+    private $_encoding;
 	
-	/**
-	 * The response's data
-	 *
-	 * @var string
-	 */
-	private $_responseBody;
+    /**
+     * The response's data
+     *
+     * @var string
+     */
+    private $_responseBody;
 	
-	/**
-	 * Construct a HTTP transport response
-	 * 
-	 * @param integer $statusCode The HTTP status code
-	 * @param string $contentType The VALUE of the Content-Type HTTP header
-	 * @param string $responseBody The body of the HTTP response
-	 */
-	public function __construct($statusCode, $contentType, $responseBody)
-	{
-		// set the status code, make sure its an integer
-		$this->_statusCode = (int) $statusCode;
+    /**
+     * Construct a HTTP transport response
+     * 
+     * @param integer $statusCode The HTTP status code
+     * @param string $contentType The VALUE of the Content-Type HTTP header
+     * @param string $responseBody The body of the HTTP response
+     */
+    public function __construct($statusCode, $contentType, $responseBody)
+    {
+        // set the status code, make sure its an integer
+        $this->_statusCode = (int) $statusCode;
 		
-		// lookup up status message based on code
-		$this->_statusMessage = self::getDefaultStatusMessage($this->_statusCode);
+        // lookup up status message based on code
+        $this->_statusMessage = self::getDefaultStatusMessage($this->_statusCode);
 		
-		// set the response body, it should always be a string
-		$this->_responseBody = (string) $responseBody;
+        // set the response body, it should always be a string
+        $this->_responseBody = (string) $responseBody;
 		
-		// parse the content type header value for mimetype and encoding
-		// first set default values that will remain if we can't find
-		// what we're looking for in the content type
-		$this->_mimeType = "text/plain";
-		$this->_encoding = "UTF-8";
+        // parse the content type header value for mimetype and encoding
+        // first set default values that will remain if we can't find
+        // what we're looking for in the content type
+        $this->_mimeType = "text/plain";
+        $this->_encoding = "UTF-8";
 		
-		if ($contentType)
-		{
-			// now break apart the header to see if there's character encoding
-			$contentTypeParts = explode(';', $contentType, 2);
+        if ($contentType)
+        {
+            // now break apart the header to see if there's character encoding
+            $contentTypeParts = explode(';', $contentType, 2);
 
-			if (isset($contentTypeParts[0]))
-			{
-				$this->_mimeType = trim($contentTypeParts[0]);
-			}
+            if (isset($contentTypeParts[0]))
+            {
+                $this->_mimeType = trim($contentTypeParts[0]);
+            }
 
-			if (isset($contentTypeParts[1]))
-			{
-				// we have a second part, split it further
-				$contentTypeParts = explode('=', $contentTypeParts[1]);
+            if (isset($contentTypeParts[1]))
+            {
+                // we have a second part, split it further
+                $contentTypeParts = explode('=', $contentTypeParts[1]);
 
-				if (isset($contentTypeParts[1]))
-				{
-					$this->_encoding = trim($contentTypeParts[1]);
-				}
-			}
-		}
-	}
+                if (isset($contentTypeParts[1]))
+                {
+                    $this->_encoding = trim($contentTypeParts[1]);
+                }
+            }
+        }
+    }
 	
-	/**
-	 * Get the status code of the response
-	 *
-	 * @return integer
-	 */
-	public function getStatusCode()
-	{
-		return $this->_statusCode;
-	}
+    /**
+     * Get the status code of the response
+     *
+     * @return integer
+     */
+    public function getStatusCode()
+    {
+        return $this->_statusCode;
+    }
 	
-	/**
-	 * Get the status message of the response
-	 *
-	 * @return string
-	 */
-	public function getStatusMessage()
-	{
-		return $this->_statusMessage;
-	}
+    /**
+     * Get the status message of the response
+     *
+     * @return string
+     */
+    public function getStatusMessage()
+    {
+        return $this->_statusMessage;
+    }
 	
-	/**
-	 * Get the mimetype of the response body
-	 *
-	 * @return string
-	 */
-	public function getMimeType()
-	{
-		return $this->_mimeType;
-	}
+    /**
+     * Get the mimetype of the response body
+     *
+     * @return string
+     */
+    public function getMimeType()
+    {
+        return $this->_mimeType;
+    }
 	
-	/**
-	 * Get the charset encoding of the response body.
-	 *
-	 * @return string
-	 */
-	public function getEncoding()
-	{
-		return $this->_encoding;
-	}
+    /**
+     * Get the charset encoding of the response body.
+     *
+     * @return string
+     */
+    public function getEncoding()
+    {
+        return $this->_encoding;
+    }
 	
-	/**
-	 * Get the raw response body
-	 *
-	 * @return string
-	 */
-	public function getBody()
-	{
-		return $this->_responseBody;
-	}
+    /**
+     * Get the raw response body
+     *
+     * @return string
+     */
+    public function getBody()
+    {
+        return $this->_responseBody;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
 	 *
 	 * @var array
 	 */
-	static private $_defaultStatusMessages = array(
+	static private $_defaultStatusMessages = array (
 		// Specific to PHP Solr Client
 		0 => "Communication Error",
 		

Braces +13 added lines, -26 removed lines

@@ -41,8 +41,7 @@ 
  * implementations and then consumed by the Apache_Solr_Response class which provides
  * decoding
  */
-class Apache_Solr_HttpTransport_Response
-{
+class Apache_Solr_HttpTransport_Response {
 	/**
 	 * Status Messages indexed by Status Code
 	 * Obtained from: http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
@@ -109,12 +108,10 @@ 
 	 *
 	 * @return string
 	 */
-	public static function getDefaultStatusMessage($statusCode)
-	{
+	public static function getDefaultStatusMessage($statusCode) {
 		$statusCode = (int) $statusCode;
 		
-		if (isset(self::$_defaultStatusMessages[$statusCode]))
-		{
+		if (isset(self::$_defaultStatusMessages[$statusCode])) {
 			return self::$_defaultStatusMessages[$statusCode];
 		}
 		
@@ -163,8 +160,7 @@ 
 	 * @param string $contentType The VALUE of the Content-Type HTTP header
 	 * @param string $responseBody The body of the HTTP response
 	 */
-	public function __construct($statusCode, $contentType, $responseBody)
-	{
+	public function __construct($statusCode, $contentType, $responseBody) {
 		// set the status code, make sure its an integer
 		$this->_statusCode = (int) $statusCode;
 		
@@ -180,23 +176,19 @@ 
 		$this->_mimeType = "text/plain";
 		$this->_encoding = "UTF-8";
 		
-		if ($contentType)
-		{
+		if ($contentType) {
 			// now break apart the header to see if there's character encoding
 			$contentTypeParts = explode(';', $contentType, 2);
 
-			if (isset($contentTypeParts[0]))
-			{
+			if (isset($contentTypeParts[0])) {
 				$this->_mimeType = trim($contentTypeParts[0]);
 			}
 
-			if (isset($contentTypeParts[1]))
-			{
+			if (isset($contentTypeParts[1])) {
 				// we have a second part, split it further
 				$contentTypeParts = explode('=', $contentTypeParts[1]);
 
-				if (isset($contentTypeParts[1]))
-				{
+				if (isset($contentTypeParts[1])) {
 					$this->_encoding = trim($contentTypeParts[1]);
 				}
 			}
@@ -208,8 +200,7 @@ 
 	 *
 	 * @return integer
 	 */
-	public function getStatusCode()
-	{
+	public function getStatusCode() {
 		return $this->_statusCode;
 	}
 	
@@ -218,8 +209,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function getStatusMessage()
-	{
+	public function getStatusMessage() {
 		return $this->_statusMessage;
 	}
 	
@@ -228,8 +218,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function getMimeType()
-	{
+	public function getMimeType() {
 		return $this->_mimeType;
 	}
 	
@@ -238,8 +227,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function getEncoding()
-	{
+	public function getEncoding() {
 		return $this->_encoding;
 	}
 	
@@ -248,8 +236,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function getBody()
-	{
+	public function getBody() {
 		return $this->_responseBody;
 	}
 }

lib/SolrPhpClient/Apache/Solr/HttpTransport/CurlNoReuse.php

Indentation +116 added lines, -116 removed lines

@@ -46,151 +46,151 @@
  */
 class Apache_Solr_HttpTransport_CurlNoReuse extends Apache_Solr_HttpTransport_Abstract
 {
-	/**
-	 * SVN Revision meta data for this class
-	 */
-	const SVN_REVISION = '$Revision:$';
-
-	/**
-	 * SVN ID meta data for this class
-	 */
-	const SVN_ID = '$Id:$';
-
-	public function performGetRequest($url, $timeout = false)
-	{
-		// check the timeout value
-		if ($timeout === false || $timeout <= 0.0)
-		{
-			// use the default timeout
-			$timeout = $this->getDefaultTimeout();
-		}
+    /**
+     * SVN Revision meta data for this class
+     */
+    const SVN_REVISION = '$Revision:$';
+
+    /**
+     * SVN ID meta data for this class
+     */
+    const SVN_ID = '$Id:$';
+
+    public function performGetRequest($url, $timeout = false)
+    {
+        // check the timeout value
+        if ($timeout === false || $timeout <= 0.0)
+        {
+            // use the default timeout
+            $timeout = $this->getDefaultTimeout();
+        }
 		
-		$curl = curl_init();
+        $curl = curl_init();
 
-		// set curl GET options
-		curl_setopt_array($curl, array(
-			// return the response body from curl_exec
-			CURLOPT_RETURNTRANSFER => true,
+        // set curl GET options
+        curl_setopt_array($curl, array(
+            // return the response body from curl_exec
+            CURLOPT_RETURNTRANSFER => true,
 
-			// get the output as binary data
-			CURLOPT_BINARYTRANSFER => true,
+            // get the output as binary data
+            CURLOPT_BINARYTRANSFER => true,
 
-			// we do not need the headers in the output, we get everything we need from curl_getinfo
-			CURLOPT_HEADER => false,
+            // we do not need the headers in the output, we get everything we need from curl_getinfo
+            CURLOPT_HEADER => false,
 			
-			// set the URL
-			CURLOPT_URL => $url,
+            // set the URL
+            CURLOPT_URL => $url,
 
-			// set the timeout
-			CURLOPT_TIMEOUT => $timeout
-		));
+            // set the timeout
+            CURLOPT_TIMEOUT => $timeout
+        ));
 
-		// make the request
-		$responseBody = curl_exec($curl);
+        // make the request
+        $responseBody = curl_exec($curl);
 
-		// get info from the transfer
-		$statusCode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
-		$contentType = curl_getinfo($curl, CURLINFO_CONTENT_TYPE);
+        // get info from the transfer
+        $statusCode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+        $contentType = curl_getinfo($curl, CURLINFO_CONTENT_TYPE);
 		
-		// close our curl session - we're done with it
-		curl_close($curl);
-
-		return new Apache_Solr_HttpTransport_Response($statusCode, $contentType, $responseBody);
-	}
-
-	public function performHeadRequest($url, $timeout = false)
-	{
-		// check the timeout value
-		if ($timeout === false || $timeout <= 0.0)
-		{
-			// use the default timeout
-			$timeout = $this->getDefaultTimeout();
-		}
+        // close our curl session - we're done with it
+        curl_close($curl);
+
+        return new Apache_Solr_HttpTransport_Response($statusCode, $contentType, $responseBody);
+    }
+
+    public function performHeadRequest($url, $timeout = false)
+    {
+        // check the timeout value
+        if ($timeout === false || $timeout <= 0.0)
+        {
+            // use the default timeout
+            $timeout = $this->getDefaultTimeout();
+        }
 		
-		$curl = curl_init();
+        $curl = curl_init();
 
-		// set curl HEAD options
-		curl_setopt_array($curl, array(
-			// return the response body from curl_exec
-			CURLOPT_RETURNTRANSFER => true,
+        // set curl HEAD options
+        curl_setopt_array($curl, array(
+            // return the response body from curl_exec
+            CURLOPT_RETURNTRANSFER => true,
 
-			// get the output as binary data
-			CURLOPT_BINARYTRANSFER => true,
+            // get the output as binary data
+            CURLOPT_BINARYTRANSFER => true,
 
-			// we do not need the headers in the output, we get everything we need from curl_getinfo
-			CURLOPT_HEADER => false,
+            // we do not need the headers in the output, we get everything we need from curl_getinfo
+            CURLOPT_HEADER => false,
 			
-			// this both sets the method to HEAD and says not to return a body
-			CURLOPT_NOBODY => true,
+            // this both sets the method to HEAD and says not to return a body
+            CURLOPT_NOBODY => true,
 
-			// set the URL
-			CURLOPT_URL => $url,
+            // set the URL
+            CURLOPT_URL => $url,
 
-			// set the timeout
-			CURLOPT_TIMEOUT => $timeout
-		));
+            // set the timeout
+            CURLOPT_TIMEOUT => $timeout
+        ));
 
-		// make the request
-		$responseBody = curl_exec($curl);
+        // make the request
+        $responseBody = curl_exec($curl);
 
-		// get info from the transfer
-		$statusCode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
-		$contentType = curl_getinfo($curl, CURLINFO_CONTENT_TYPE);
+        // get info from the transfer
+        $statusCode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+        $contentType = curl_getinfo($curl, CURLINFO_CONTENT_TYPE);
 		
-		// close our curl session - we're done with it
-		curl_close($curl);
-
-		return new Apache_Solr_HttpTransport_Response($statusCode, $contentType, $responseBody);
-	}
-
-	public function performPostRequest($url, $postData, $contentType, $timeout = false)
-	{
-		// check the timeout value
-		if ($timeout === false || $timeout <= 0.0)
-		{
-			// use the default timeout
-			$timeout = $this->getDefaultTimeout();
-		}
-
-		$curl = curl_init();
+        // close our curl session - we're done with it
+        curl_close($curl);
+
+        return new Apache_Solr_HttpTransport_Response($statusCode, $contentType, $responseBody);
+    }
+
+    public function performPostRequest($url, $postData, $contentType, $timeout = false)
+    {
+        // check the timeout value
+        if ($timeout === false || $timeout <= 0.0)
+        {
+            // use the default timeout
+            $timeout = $this->getDefaultTimeout();
+        }
+
+        $curl = curl_init();
 		
-		// set curl POST options
-		curl_setopt_array($curl, array(
-			// return the response body from curl_exec
-			CURLOPT_RETURNTRANSFER => true,
+        // set curl POST options
+        curl_setopt_array($curl, array(
+            // return the response body from curl_exec
+            CURLOPT_RETURNTRANSFER => true,
 
-			// get the output as binary data
-			CURLOPT_BINARYTRANSFER => true,
+            // get the output as binary data
+            CURLOPT_BINARYTRANSFER => true,
 
-			// we do not need the headers in the output, we get everything we need from curl_getinfo
-			CURLOPT_HEADER => false,
+            // we do not need the headers in the output, we get everything we need from curl_getinfo
+            CURLOPT_HEADER => false,
 			
-			// make sure we're POST
-			CURLOPT_POST => true,
+            // make sure we're POST
+            CURLOPT_POST => true,
 
-			// set the URL
-			CURLOPT_URL => $url,
+            // set the URL
+            CURLOPT_URL => $url,
 
-			// set the post data
-			CURLOPT_POSTFIELDS => $postData,
+            // set the post data
+            CURLOPT_POSTFIELDS => $postData,
 
-			// set the content type
-			CURLOPT_HTTPHEADER => array("Content-Type: {$contentType}"),
+            // set the content type
+            CURLOPT_HTTPHEADER => array("Content-Type: {$contentType}"),
 
-			// set the timeout
-			CURLOPT_TIMEOUT => $timeout
-		));
+            // set the timeout
+            CURLOPT_TIMEOUT => $timeout
+        ));
 
-		// make the request
-		$responseBody = curl_exec($curl);
+        // make the request
+        $responseBody = curl_exec($curl);
 
-		// get info from the transfer
-		$statusCode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
-		$contentType = curl_getinfo($curl, CURLINFO_CONTENT_TYPE);
+        // get info from the transfer
+        $statusCode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+        $contentType = curl_getinfo($curl, CURLINFO_CONTENT_TYPE);
 
-		// close our curl session - we're done with it
-		curl_close($curl);
+        // close our curl session - we're done with it
+        curl_close($curl);
 
-		return new Apache_Solr_HttpTransport_Response($statusCode, $contentType, $responseBody);
-	}
+        return new Apache_Solr_HttpTransport_Response($statusCode, $contentType, $responseBody);
+    }
 }
\ No newline at end of file

Spacing +5 added lines, -5 removed lines

@@ -37,7 +37,7 @@ 
  */
 
 // Require Apache_Solr_HttpTransport_Abstract
-require_once(dirname(__FILE__) . '/Abstract.php');
+require_once(dirname(__FILE__).'/Abstract.php');
 
 /**
  * An alternative Curl HTTP transport that opens and closes a curl session for
@@ -68,7 +68,7 @@ 
 		$curl = curl_init();
 
 		// set curl GET options
-		curl_setopt_array($curl, array(
+		curl_setopt_array($curl, array (
 			// return the response body from curl_exec
 			CURLOPT_RETURNTRANSFER => true,
 
@@ -110,7 +110,7 @@ 
 		$curl = curl_init();
 
 		// set curl HEAD options
-		curl_setopt_array($curl, array(
+		curl_setopt_array($curl, array (
 			// return the response body from curl_exec
 			CURLOPT_RETURNTRANSFER => true,
 
@@ -155,7 +155,7 @@ 
 		$curl = curl_init();
 		
 		// set curl POST options
-		curl_setopt_array($curl, array(
+		curl_setopt_array($curl, array (
 			// return the response body from curl_exec
 			CURLOPT_RETURNTRANSFER => true,
 
@@ -175,7 +175,7 @@ 
 			CURLOPT_POSTFIELDS => $postData,
 
 			// set the content type
-			CURLOPT_HTTPHEADER => array("Content-Type: {$contentType}"),
+			CURLOPT_HTTPHEADER => array ("Content-Type: {$contentType}"),
 
 			// set the timeout
 			CURLOPT_TIMEOUT => $timeout

Braces +7 added lines, -14 removed lines

@@ -44,8 +44,7 @@ 
  * every request. This isn't the recommended way to use curl, but some version of
  * PHP have memory issues.
  */
-class Apache_Solr_HttpTransport_CurlNoReuse extends Apache_Solr_HttpTransport_Abstract
-{
+class Apache_Solr_HttpTransport_CurlNoReuse extends Apache_Solr_HttpTransport_Abstract {
 	/**
 	 * SVN Revision meta data for this class
 	 */
@@ -56,11 +55,9 @@ 
 	 */
 	const SVN_ID = '$Id:$';
 
-	public function performGetRequest($url, $timeout = false)
-	{
+	public function performGetRequest($url, $timeout = false) {
 		// check the timeout value
-		if ($timeout === false || $timeout <= 0.0)
-		{
+		if ($timeout === false || $timeout <= 0.0) {
 			// use the default timeout
 			$timeout = $this->getDefaultTimeout();
 		}
@@ -98,11 +95,9 @@ 
 		return new Apache_Solr_HttpTransport_Response($statusCode, $contentType, $responseBody);
 	}
 
-	public function performHeadRequest($url, $timeout = false)
-	{
+	public function performHeadRequest($url, $timeout = false) {
 		// check the timeout value
-		if ($timeout === false || $timeout <= 0.0)
-		{
+		if ($timeout === false || $timeout <= 0.0) {
 			// use the default timeout
 			$timeout = $this->getDefaultTimeout();
 		}
@@ -143,11 +138,9 @@ 
 		return new Apache_Solr_HttpTransport_Response($statusCode, $contentType, $responseBody);
 	}
 
-	public function performPostRequest($url, $postData, $contentType, $timeout = false)
-	{
+	public function performPostRequest($url, $postData, $contentType, $timeout = false) {
 		// check the timeout value
-		if ($timeout === false || $timeout <= 0.0)
-		{
+		if ($timeout === false || $timeout <= 0.0) {
 			// use the default timeout
 			$timeout = $this->getDefaultTimeout();
 		}

Upper-Lower-Casing +17 added lines, -17 removed lines

@@ -56,10 +56,10 @@ 
 	 */
 	const SVN_ID = '$Id:$';
 
-	public function performGetRequest($url, $timeout = false)
+	public function performGetRequest($url, $timeout = FALSE)
 	{
 		// check the timeout value
-		if ($timeout === false || $timeout <= 0.0)
+		if ($timeout === FALSE || $timeout <= 0.0)
 		{
 			// use the default timeout
 			$timeout = $this->getDefaultTimeout();
@@ -70,13 +70,13 @@ 
 		// set curl GET options
 		curl_setopt_array($curl, array(
 			// return the response body from curl_exec
-			CURLOPT_RETURNTRANSFER => true,
+			CURLOPT_RETURNTRANSFER => TRUE,
 
 			// get the output as binary data
-			CURLOPT_BINARYTRANSFER => true,
+			CURLOPT_BINARYTRANSFER => TRUE,
 
 			// we do not need the headers in the output, we get everything we need from curl_getinfo
-			CURLOPT_HEADER => false,
+			CURLOPT_HEADER => FALSE,
 			
 			// set the URL
 			CURLOPT_URL => $url,
@@ -98,10 +98,10 @@ 
 		return new Apache_Solr_HttpTransport_Response($statusCode, $contentType, $responseBody);
 	}
 
-	public function performHeadRequest($url, $timeout = false)
+	public function performHeadRequest($url, $timeout = FALSE)
 	{
 		// check the timeout value
-		if ($timeout === false || $timeout <= 0.0)
+		if ($timeout === FALSE || $timeout <= 0.0)
 		{
 			// use the default timeout
 			$timeout = $this->getDefaultTimeout();
@@ -112,16 +112,16 @@ 
 		// set curl HEAD options
 		curl_setopt_array($curl, array(
 			// return the response body from curl_exec
-			CURLOPT_RETURNTRANSFER => true,
+			CURLOPT_RETURNTRANSFER => TRUE,
 
 			// get the output as binary data
-			CURLOPT_BINARYTRANSFER => true,
+			CURLOPT_BINARYTRANSFER => TRUE,
 
 			// we do not need the headers in the output, we get everything we need from curl_getinfo
-			CURLOPT_HEADER => false,
+			CURLOPT_HEADER => FALSE,
 			
 			// this both sets the method to HEAD and says not to return a body
-			CURLOPT_NOBODY => true,
+			CURLOPT_NOBODY => TRUE,
 
 			// set the URL
 			CURLOPT_URL => $url,
@@ -143,10 +143,10 @@ 
 		return new Apache_Solr_HttpTransport_Response($statusCode, $contentType, $responseBody);
 	}
 
-	public function performPostRequest($url, $postData, $contentType, $timeout = false)
+	public function performPostRequest($url, $postData, $contentType, $timeout = FALSE)
 	{
 		// check the timeout value
-		if ($timeout === false || $timeout <= 0.0)
+		if ($timeout === FALSE || $timeout <= 0.0)
 		{
 			// use the default timeout
 			$timeout = $this->getDefaultTimeout();
@@ -157,16 +157,16 @@ 
 		// set curl POST options
 		curl_setopt_array($curl, array(
 			// return the response body from curl_exec
-			CURLOPT_RETURNTRANSFER => true,
+			CURLOPT_RETURNTRANSFER => TRUE,
 
 			// get the output as binary data
-			CURLOPT_BINARYTRANSFER => true,
+			CURLOPT_BINARYTRANSFER => TRUE,
 
 			// we do not need the headers in the output, we get everything we need from curl_getinfo
-			CURLOPT_HEADER => false,
+			CURLOPT_HEADER => FALSE,
 			
 			// make sure we're POST
-			CURLOPT_POST => true,
+			CURLOPT_POST => TRUE,
 
 			// set the URL
 			CURLOPT_URL => $url,

lib/SolrPhpClient/Apache/Solr/HttpTransport/Abstract.php

Indentation +39 added lines, -39 removed lines

@@ -42,48 +42,48 @@
  */
 abstract class Apache_Solr_HttpTransport_Abstract implements Apache_Solr_HttpTransport_Interface
 {	
-	/**
-	 * Our default timeout value for requests that don't specify a timeout
-	 *
-	 * @var float
-	 */
-	private $_defaultTimeout = false;
+    /**
+     * Our default timeout value for requests that don't specify a timeout
+     *
+     * @var float
+     */
+    private $_defaultTimeout = false;
 		
-	/**
-	 * Get the current default timeout setting (initially the default_socket_timeout ini setting)
-	 * in seconds
-	 *
-	 * @return float
-	 */
-	public function getDefaultTimeout()
-	{
-		// lazy load the default timeout from the ini settings
-		if ($this->_defaultTimeout === false)
-		{
-			$this->_defaultTimeout = (int) ini_get('default_socket_timeout');
+    /**
+     * Get the current default timeout setting (initially the default_socket_timeout ini setting)
+     * in seconds
+     *
+     * @return float
+     */
+    public function getDefaultTimeout()
+    {
+        // lazy load the default timeout from the ini settings
+        if ($this->_defaultTimeout === false)
+        {
+            $this->_defaultTimeout = (int) ini_get('default_socket_timeout');
 
-			// double check we didn't get 0 for a timeout
-			if ($this->_defaultTimeout <= 0)
-			{
-				$this->_defaultTimeout = 60;
-			}
-		}
+            // double check we didn't get 0 for a timeout
+            if ($this->_defaultTimeout <= 0)
+            {
+                $this->_defaultTimeout = 60;
+            }
+        }
 		
-		return $this->_defaultTimeout;
-	}
+        return $this->_defaultTimeout;
+    }
 	
-	/**
-	 * Set the current default timeout for all HTTP requests
-	 *
-	 * @param float $timeout
-	 */
-	public function setDefaultTimeout($timeout)
-	{
-		$timeout = (float) $timeout;
+    /**
+     * Set the current default timeout for all HTTP requests
+     *
+     * @param float $timeout
+     */
+    public function setDefaultTimeout($timeout)
+    {
+        $timeout = (float) $timeout;
 		
-		if ($timeout >= 0)
-		{
-			$this->_defaultTimeout = $timeout;
-		}
-	}	
+        if ($timeout >= 0)
+        {
+            $this->_defaultTimeout = $timeout;
+        }
+    }	
 }
\ No newline at end of file

Braces +6 added lines, -12 removed lines

@@ -40,8 +40,7 @@ 
  * Convenience class that implements the transport implementation. Can be extended by
  * real implementations to do some of the common book keeping
  */
-abstract class Apache_Solr_HttpTransport_Abstract implements Apache_Solr_HttpTransport_Interface
-{	
+abstract class Apache_Solr_HttpTransport_Abstract implements Apache_Solr_HttpTransport_Interface {
 	/**
 	 * Our default timeout value for requests that don't specify a timeout
 	 *
@@ -55,16 +54,13 @@ 
 	 *
 	 * @return float
 	 */
-	public function getDefaultTimeout()
-	{
+	public function getDefaultTimeout() {
 		// lazy load the default timeout from the ini settings
-		if ($this->_defaultTimeout === false)
-		{
+		if ($this->_defaultTimeout === false) {
 			$this->_defaultTimeout = (int) ini_get('default_socket_timeout');
 
 			// double check we didn't get 0 for a timeout
-			if ($this->_defaultTimeout <= 0)
-			{
+			if ($this->_defaultTimeout <= 0) {
 				$this->_defaultTimeout = 60;
 			}
 		}
@@ -77,12 +73,10 @@ 
 	 *
 	 * @param float $timeout
 	 */
-	public function setDefaultTimeout($timeout)
-	{
+	public function setDefaultTimeout($timeout) {
 		$timeout = (float) $timeout;
 		
-		if ($timeout >= 0)
-		{
+		if ($timeout >= 0) {
 			$this->_defaultTimeout = $timeout;
 		}
 	}	

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -47,7 +47,7 @@ 
 	 *
 	 * @var float
 	 */
-	private $_defaultTimeout = false;
+	private $_defaultTimeout = FALSE;
 		
 	/**
 	 * Get the current default timeout setting (initially the default_socket_timeout ini setting)
@@ -58,7 +58,7 @@ 
 	public function getDefaultTimeout()
 	{
 		// lazy load the default timeout from the ini settings
-		if ($this->_defaultTimeout === false)
+		if ($this->_defaultTimeout === FALSE)
 		{
 			$this->_defaultTimeout = (int) ini_get('default_socket_timeout');
 

lib/SolrPhpClient/Apache/Solr/HttpTransport/Interface.php

Indentation +41 added lines, -41 removed lines

@@ -46,49 +46,49 @@
  */
 interface Apache_Solr_HttpTransport_Interface
 {
-	/**
-	 * Get the current default timeout for all HTTP requests
-	 *
-	 * @return float
-	 */
-	public function getDefaultTimeout();
+    /**
+     * Get the current default timeout for all HTTP requests
+     *
+     * @return float
+     */
+    public function getDefaultTimeout();
 	
-	/**
-	 * Set the current default timeout for all HTTP requests
-	 *
-	 * @param float $timeout
-	 */
-	public function setDefaultTimeout($timeout);
+    /**
+     * Set the current default timeout for all HTTP requests
+     *
+     * @param float $timeout
+     */
+    public function setDefaultTimeout($timeout);
 		
-	/**
-	 * Perform a GET HTTP operation with an optional timeout and return the response
-	 * contents, use getLastResponseHeaders to retrieve HTTP headers
-	 *
-	 * @param string $url
-	 * @param float $timeout
-	 * @return Apache_Solr_HttpTransport_Response HTTP response
-	 */
-	public function performGetRequest($url, $timeout = false);
+    /**
+     * Perform a GET HTTP operation with an optional timeout and return the response
+     * contents, use getLastResponseHeaders to retrieve HTTP headers
+     *
+     * @param string $url
+     * @param float $timeout
+     * @return Apache_Solr_HttpTransport_Response HTTP response
+     */
+    public function performGetRequest($url, $timeout = false);
 	
-	/**
-	 * Perform a HEAD HTTP operation with an optional timeout and return the response
-	 * headers - NOTE: head requests have no response body
-	 *
-	 * @param string $url
-	 * @param float $timeout
-	 * @return Apache_Solr_HttpTransport_Response HTTP response
-	 */
-	public function performHeadRequest($url, $timeout = false);
+    /**
+     * Perform a HEAD HTTP operation with an optional timeout and return the response
+     * headers - NOTE: head requests have no response body
+     *
+     * @param string $url
+     * @param float $timeout
+     * @return Apache_Solr_HttpTransport_Response HTTP response
+     */
+    public function performHeadRequest($url, $timeout = false);
 	
-	/**
-	 * Perform a POST HTTP operation with an optional timeout and return the response
-	 * contents, use getLastResponseHeaders to retrieve HTTP headers
-	 *
-	 * @param string $url
-	 * @param string $rawPost
-	 * @param string $contentType
-	 * @param float $timeout
-	 * @return Apache_Solr_HttpTransport_Response HTTP response
-	 */
-	public function performPostRequest($url, $rawPost, $contentType, $timeout = false);
+    /**
+     * Perform a POST HTTP operation with an optional timeout and return the response
+     * contents, use getLastResponseHeaders to retrieve HTTP headers
+     *
+     * @param string $url
+     * @param string $rawPost
+     * @param string $contentType
+     * @param float $timeout
+     * @return Apache_Solr_HttpTransport_Response HTTP response
+     */
+    public function performPostRequest($url, $rawPost, $contentType, $timeout = false);
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
  */
 
 // require Apache_Solr_HttpTransport_Response
-require_once(dirname(__FILE__) . '/Response.php');
+require_once(dirname(__FILE__).'/Response.php');
 
 /**
  * Interface that all Transport (HTTP Requester) implementations must implement. These

Braces +1 added lines, -2 removed lines

@@ -44,8 +44,7 @@
  * Implementations can then be plugged into the Service instance in order to user their
  * the desired method for making HTTP requests
  */
-interface Apache_Solr_HttpTransport_Interface
-{
+interface Apache_Solr_HttpTransport_Interface {
 	/**
 	 * Get the current default timeout for all HTTP requests
 	 *

Upper-Lower-Casing +3 added lines, -3 removed lines

@@ -68,7 +68,7 @@ 
 	 * @param float $timeout
 	 * @return Apache_Solr_HttpTransport_Response HTTP response
 	 */
-	public function performGetRequest($url, $timeout = false);
+	public function performGetRequest($url, $timeout = FALSE);
 	
 	/**
 	 * Perform a HEAD HTTP operation with an optional timeout and return the response
@@ -78,7 +78,7 @@ 
 	 * @param float $timeout
 	 * @return Apache_Solr_HttpTransport_Response HTTP response
 	 */
-	public function performHeadRequest($url, $timeout = false);
+	public function performHeadRequest($url, $timeout = FALSE);
 	
 	/**
 	 * Perform a POST HTTP operation with an optional timeout and return the response
@@ -90,5 +90,5 @@ 
 	 * @param float $timeout
 	 * @return Apache_Solr_HttpTransport_Response HTTP response
 	 */
-	public function performPostRequest($url, $rawPost, $contentType, $timeout = false);
+	public function performPostRequest($url, $rawPost, $contentType, $timeout = FALSE);
 }
\ No newline at end of file

lib/SolrPhpClient/Apache/Solr/HttpTransportException.php

Indentation +33 added lines, -33 removed lines

@@ -38,42 +38,42 @@
 
 class Apache_Solr_HttpTransportException extends Apache_Solr_Exception
 {
-	/**
-	 * SVN Revision meta data for this class
-	 */
-	const SVN_REVISION = '$Revision: 54 $';
+    /**
+     * SVN Revision meta data for this class
+     */
+    const SVN_REVISION = '$Revision: 54 $';
 
-	/**
-	 * SVN ID meta data for this class
-	 */
-	const SVN_ID = '$Id: HttpTransportException.php 54 2011-02-04 16:29:18Z donovan.jimenez $';
+    /**
+     * SVN ID meta data for this class
+     */
+    const SVN_ID = '$Id: HttpTransportException.php 54 2011-02-04 16:29:18Z donovan.jimenez $';
 
-	/**
-	 * Response for which exception was generated
-	 *
-	 * @var Apache_Solr_Response
-	 */
-	private $_response;
+    /**
+     * Response for which exception was generated
+     *
+     * @var Apache_Solr_Response
+     */
+    private $_response;
 
-	/**
-	 * HttpTransportException Constructor
-	 *
-	 * @param Apache_Solr_Response $response
-	 */
-	public function __construct(Apache_Solr_Response $response)
-	{
-		parent::__construct("'{$response->getHttpStatus()}' Status: {$response->getHttpStatusMessage()}", $response->getHttpStatus());
+    /**
+     * HttpTransportException Constructor
+     *
+     * @param Apache_Solr_Response $response
+     */
+    public function __construct(Apache_Solr_Response $response)
+    {
+        parent::__construct("'{$response->getHttpStatus()}' Status: {$response->getHttpStatusMessage()}", $response->getHttpStatus());
 
-		$this->_response = $response;
-	}
+        $this->_response = $response;
+    }
 
-	/**
-	 * Get the response for which this exception was generated
-	 *
-	 * @return Apache_Solr_Response
-	 */
-	public function getResponse()
-	{
-		return $this->_response;
-	}
+    /**
+     * Get the response for which this exception was generated
+     *
+     * @return Apache_Solr_Response
+     */
+    public function getResponse()
+    {
+        return $this->_response;
+    }
 }
\ No newline at end of file

Braces +3 added lines, -6 removed lines

@@ -36,8 +36,7 @@ 
  * @author Donovan Jimenez <djimenez@conduit-it.com>
  */
 
-class Apache_Solr_HttpTransportException extends Apache_Solr_Exception
-{
+class Apache_Solr_HttpTransportException extends Apache_Solr_Exception {
 	/**
 	 * SVN Revision meta data for this class
 	 */
@@ -60,8 +59,7 @@ 
 	 *
 	 * @param Apache_Solr_Response $response
 	 */
-	public function __construct(Apache_Solr_Response $response)
-	{
+	public function __construct(Apache_Solr_Response $response) {
 		parent::__construct("'{$response->getHttpStatus()}' Status: {$response->getHttpStatusMessage()}", $response->getHttpStatus());
 
 		$this->_response = $response;
@@ -72,8 +70,7 @@ 
 	 *
 	 * @return Apache_Solr_Response
 	 */
-	public function getResponse()
-	{
+	public function getResponse() {
 		return $this->_response;
 	}
 }
\ No newline at end of file