kitodo / kitodo-presentation

dlf/lib/SolrPhpClient/Apache/Solr/Document.php

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;
 	}
 
 	/**

dlf/lib/SolrPhpClient/Apache/Solr/Service/Balancer.php

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

@@ -60,19 +60,19 @@ 
 	 */
 	const SVN_ID = '$Id: Balancer.php 54 2011-02-04 16:29:18Z donovan.jimenez $';
 
-	protected $_createDocuments = true;
+	protected $_createDocuments = TRUE;
 
 	protected $_readableServices = array();
 	protected $_writeableServices = array();
 
-	protected $_currentReadService = null;
-	protected $_currentWriteService = null;
+	protected $_currentReadService = NULL;
+	protected $_currentWriteService = NULL;
 
 	protected $_readPingTimeout = 2;
 	protected $_writePingTimeout = 4;
 
 	// Configuration for server selection backoff intervals
-	protected $_useBackoff = false;		// Set to true to use more resillient write server selection
+	protected $_useBackoff = FALSE;		// Set to true to use more resillient write server selection
 	protected $_backoffLimit = 600;		// 10 minute default maximum
 	protected $_backoffEscalation = 2.0; 	// Rate at which to increase backoff period
 	protected $_defaultBackoff = 2.0;		// Default backoff interval
@@ -305,14 +305,14 @@ 
 	 *
 	 * @throws Apache_Solr_NoServiceAvailableException If there are no read services that meet requirements
 	 */
-	protected function _selectReadService($forceSelect = false)
+	protected function _selectReadService($forceSelect = FALSE)
 	{
 		if (!$this->_currentReadService || !isset($this->_readableServices[$this->_currentReadService]) || $forceSelect)
 		{
 			if ($this->_currentReadService && isset($this->_readableServices[$this->_currentReadService]) && $forceSelect)
 			{
 				// we probably had a communication error, ping the current read service, remove it if it times out
-				if ($this->_readableServices[$this->_currentReadService]->ping($this->_readPingTimeout) === false)
+				if ($this->_readableServices[$this->_currentReadService]->ping($this->_readPingTimeout) === FALSE)
 				{
 					$this->removeReadService($this->_currentReadService);
 				}
@@ -353,7 +353,7 @@ 
 	 *
 	 * @throws Apache_Solr_NoServiceAvailableException If there are no write services that meet requirements
 	 */
-	protected function _selectWriteService($forceSelect = false)
+	protected function _selectWriteService($forceSelect = FALSE)
 	{
 		if($this->_useBackoff)
 		{
@@ -365,7 +365,7 @@ 
 			if ($this->_currentWriteService && isset($this->_writeableServices[$this->_currentWriteService]) && $forceSelect)
 			{
 				// we probably had a communication error, ping the current read service, remove it if it times out
-				if ($this->_writeableServices[$this->_currentWriteService]->ping($this->_writePingTimeout) === false)
+				if ($this->_writeableServices[$this->_currentWriteService]->ping($this->_writePingTimeout) === FALSE)
 				{
 					$this->removeWriteService($this->_currentWriteService);
 				}
@@ -409,7 +409,7 @@ 
 	 * @throws Apache_Solr_NoServiceAvailableException If there are no write services that meet requirements
 	 */
 
-	protected function _selectWriteServiceSafe($forceSelect = false)
+	protected function _selectWriteServiceSafe($forceSelect = FALSE)
 	{
 		if (!$this->_currentWriteService || !isset($this->_writeableServices[$this->_currentWriteService]) || $forceSelect)
 		{
@@ -440,7 +440,7 @@ 
 						throw new Apache_Solr_NoServiceAvailableException('No write services were available.  All timeouts exceeded.');
 					}
 
-				} while($this->_writeableServices[$this->_currentWriteService]->ping($backoff) === false);
+				} while($this->_writeableServices[$this->_currentWriteService]->ping($backoff) === FALSE);
 			}
 			else
 			{
@@ -506,10 +506,10 @@ 
 				}
 			}
 
-			$service = $this->_selectWriteService(true);
+			$service = $this->_selectWriteService(TRUE);
 		} while ($service);
 
-		return false;
+		return FALSE;
 	}
 
 	/**
@@ -523,7 +523,7 @@ 
 	 *
 	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
 	 */
-	public function addDocument(Apache_Solr_Document $document, $allowDups = false, $overwritePending = true, $overwriteCommitted = true)
+	public function addDocument(Apache_Solr_Document $document, $allowDups = FALSE, $overwritePending = TRUE, $overwriteCommitted = TRUE)
 	{
 		$service = $this->_selectWriteService();
 
@@ -541,10 +541,10 @@ 
 				}
 			}
 
-			$service = $this->_selectWriteService(true);
+			$service = $this->_selectWriteService(TRUE);
 		} while ($service);
 
-		return false;
+		return FALSE;
 	}
 
 	/**
@@ -558,7 +558,7 @@ 
 	 *
 	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
 	 */
-	public function addDocuments($documents, $allowDups = false, $overwritePending = true, $overwriteCommitted = true)
+	public function addDocuments($documents, $allowDups = FALSE, $overwritePending = TRUE, $overwriteCommitted = TRUE)
 	{
 		$service = $this->_selectWriteService();
 
@@ -576,10 +576,10 @@ 
 				}
 			}
 
-			$service = $this->_selectWriteService(true);
+			$service = $this->_selectWriteService(TRUE);
 		} while ($service);
 
-		return false;
+		return FALSE;
 	}
 
 	/**
@@ -592,7 +592,7 @@ 
 	 *
 	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
 	 */
-	public function commit($optimize = true, $waitFlush = true, $waitSearcher = true, $timeout = 3600)
+	public function commit($optimize = TRUE, $waitFlush = TRUE, $waitSearcher = TRUE, $timeout = 3600)
 	{
 		$service = $this->_selectWriteService();
 
@@ -610,10 +610,10 @@ 
 				}
 			}
 
-			$service = $this->_selectWriteService(true);
+			$service = $this->_selectWriteService(TRUE);
 		} while ($service);
 
-		return false;
+		return FALSE;
 	}
 
 	/**
@@ -644,10 +644,10 @@ 
 				}
 			}
 
-			$service = $this->_selectWriteService(true);
+			$service = $this->_selectWriteService(TRUE);
 		} while ($service);
 
-		return false;
+		return FALSE;
 	}
 
 	/**
@@ -661,7 +661,7 @@ 
 	 *
 	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
 	 */
-	public function deleteById($id, $fromPending = true, $fromCommitted = true, $timeout = 3600)
+	public function deleteById($id, $fromPending = TRUE, $fromCommitted = TRUE, $timeout = 3600)
 	{
 		$service = $this->_selectWriteService();
 
@@ -679,10 +679,10 @@ 
 				}
 			}
 
-			$service = $this->_selectWriteService(true);
+			$service = $this->_selectWriteService(TRUE);
 		} while ($service);
 
-		return false;
+		return FALSE;
 	}
 
 	/**
@@ -696,7 +696,7 @@ 
 	 *
 	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
 	 */
-	public function deleteByMultipleIds($ids, $fromPending = true, $fromCommitted = true, $timeout = 3600)
+	public function deleteByMultipleIds($ids, $fromPending = TRUE, $fromCommitted = TRUE, $timeout = 3600)
 	{
 		$service = $this->_selectWriteService();
 
@@ -714,10 +714,10 @@ 
 				}
 			}
 
-			$service = $this->_selectWriteService(true);
+			$service = $this->_selectWriteService(TRUE);
 		} while ($service);
 
-		return false;
+		return FALSE;
 	}
 
 	/**
@@ -731,7 +731,7 @@ 
 	 *
 	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
 	 */
-	public function deleteByQuery($rawQuery, $fromPending = true, $fromCommitted = true, $timeout = 3600)
+	public function deleteByQuery($rawQuery, $fromPending = TRUE, $fromCommitted = TRUE, $timeout = 3600)
 	{
 		$service = $this->_selectWriteService();
 
@@ -749,10 +749,10 @@ 
 				}
 			}
 
-			$service = $this->_selectWriteService(true);
+			$service = $this->_selectWriteService(TRUE);
 		} while ($service);
 
-		return false;
+		return FALSE;
 	}
 	
 	/**
@@ -773,7 +773,7 @@ 
 	 *
 	 * @throws Apache_Solr_InvalidArgumentException if $file, $params, or $document are invalid.
 	 */
-	public function extract($file, $params = array(), $document = null, $mimetype = 'application/octet-stream')
+	public function extract($file, $params = array(), $document = NULL, $mimetype = 'application/octet-stream')
 	{
 		$service = $this->_selectWriteService();
 
@@ -791,10 +791,10 @@ 
 				}
 			}
 
-			$service = $this->_selectWriteService(true);
+			$service = $this->_selectWriteService(TRUE);
 		} while ($service);
 
-		return false;
+		return FALSE;
 	}
 	
 	/**
@@ -817,7 +817,7 @@ 
 	 *
 	 * @todo Should be using multipart/form-data to post parameter values, but I could not get my implementation to work. Needs revisisted.
 	 */
-	public function extractFromString($data, $params = array(), $document = null, $mimetype = 'application/octet-stream')
+	public function extractFromString($data, $params = array(), $document = NULL, $mimetype = 'application/octet-stream')
 	{
 		$service = $this->_selectWriteService();
 
@@ -835,10 +835,10 @@ 
 				}
 			}
 
-			$service = $this->_selectWriteService(true);
+			$service = $this->_selectWriteService(TRUE);
 		} while ($service);
 
-		return false;
+		return FALSE;
 	}
 	
 	/**
@@ -852,7 +852,7 @@ 
 	 *
 	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
 	 */
-	public function optimize($waitFlush = true, $waitSearcher = true, $timeout = 3600)
+	public function optimize($waitFlush = TRUE, $waitSearcher = TRUE, $timeout = 3600)
 	{
 		$service = $this->_selectWriteService();
 
@@ -870,10 +870,10 @@ 
 				}
 			}
 
-			$service = $this->_selectWriteService(true);
+			$service = $this->_selectWriteService(TRUE);
 		} while ($service);
 
-		return false;
+		return FALSE;
 	}
 
 	/**
@@ -906,9 +906,9 @@ 
 				}
 			}
 
-			$service = $this->_selectReadService(true);
+			$service = $this->_selectReadService(TRUE);
 		} while ($service);
 
-		return false;
+		return FALSE;
 	}
 }

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

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

@@ -69,7 +69,7 @@ 
 	 *
 	 * @var boolean
 	 */
-	protected $_isParsed = false;
+	protected $_isParsed = FALSE;
 
 	/**
 	 * Parsed representation of the data
@@ -84,8 +84,8 @@ 
 	 *
 	 * @var boolean
 	 */
-	protected $_createDocuments = true,
-			$_collapseSingleValueArrays = true;
+	protected $_createDocuments = TRUE,
+			$_collapseSingleValueArrays = TRUE;
 
 	/**
 	 * Constructor. Takes the raw HTTP response body and the exploded HTTP headers
@@ -94,7 +94,7 @@ 
 	 * @param boolean $createDocuments Whether to convert the documents json_decoded as stdClass instances to Apache_Solr_Document instances
 	 * @param boolean $collapseSingleValueArrays Whether to make multivalued fields appear as single values
 	 */
-	public function __construct(Apache_Solr_HttpTransport_Response $response, $createDocuments = true, $collapseSingleValueArrays = true)
+	public function __construct(Apache_Solr_HttpTransport_Response $response, $createDocuments = TRUE, $collapseSingleValueArrays = TRUE)
 	{
 		$this->_response = $response;
 		$this->_createDocuments = (bool) $createDocuments;
@@ -162,7 +162,7 @@ 
 		if (!$this->_isParsed)
 		{
 			$this->_parseData();
-			$this->_isParsed = true;
+			$this->_isParsed = TRUE;
 		}
 
 		if (isset($this->_parsedData->$key))
@@ -170,7 +170,7 @@ 
 			return $this->_parsedData->$key;
 		}
 
-		return null;
+		return NULL;
 	}
 
 	/**
@@ -184,7 +184,7 @@ 
 		if (!$this->_isParsed)
 		{
 			$this->_parseData();
-			$this->_isParsed = true;
+			$this->_isParsed = TRUE;
 		}
 
 		return isset($this->_parsedData->$key);
@@ -201,7 +201,7 @@ 
 		$data = json_decode($this->_response->getBody());
 
 		// check that we receive a valid JSON response - we should never receive a null
-		if ($data === null)
+		if ($data === NULL)
 		{
 			throw new Apache_Solr_ParserException('Solr response does not appear to be valid JSON, please examine the raw response with getRawResponse() method');
 		}

dlf/lib/SolrPhpClient/Apache/Solr/Service.php

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

@@ -134,7 +134,7 @@ 
 	 *
 	 * @var boolean
 	 */
-	protected $_createDocuments = true;
+	protected $_createDocuments = TRUE;
 
 	/**
 	 * Whether {@link Apache_Solr_Response} objects should have multivalue fields with only a single value
@@ -142,7 +142,7 @@ 
 	 *
 	 * @var boolean
 	 */
-	protected $_collapseSingleValueArrays = true;
+	protected $_collapseSingleValueArrays = TRUE;
 
 	/**
 	 * How NamedLists should be formatted in the output.  This specifically effects facet counts. Valid values
@@ -158,7 +158,7 @@ 
 	 *
 	 * @var string
 	 */
-	protected $_queryDelimiter = '?', $_queryStringDelimiter = '&', $_queryBracketsEscaped = true;
+	protected $_queryDelimiter = '?', $_queryStringDelimiter = '&', $_queryBracketsEscaped = TRUE;
 
 	/**
 	 * Constructed servlet full path URLs
@@ -172,14 +172,14 @@ 
 	 *
 	 * @var boolean
 	 */
-	protected $_urlsInited = false;
+	protected $_urlsInited = FALSE;
 
 	/**
 	 * HTTP Transport implementation (pluggable)
 	 *
 	 * @var Apache_Solr_HttpTransport_Interface
 	 */
-	protected $_httpTransport = false;
+	protected $_httpTransport = FALSE;
 
 	/**
 	 * Escape a value for special query characters such as ':', '(', ')', '*', '?', etc.
@@ -232,7 +232,7 @@ 
 	 * @param string $path
 	 * @param Apache_Solr_HttpTransport_Interface $httpTransport
 	 */
-	public function __construct($host = 'localhost', $port = 8180, $path = '/solr/', $httpTransport = false)
+	public function __construct($host = 'localhost', $port = 8180, $path = '/solr/', $httpTransport = FALSE)
 	{
 		$this->setHost($host);
 		$this->setPort($port);
@@ -289,7 +289,7 @@ 
 		$this->_threadsUrl = $this->_constructUrl(self::THREADS_SERVLET, array('wt' => self::SOLR_WRITER ));
 		$this->_updateUrl = $this->_constructUrl(self::UPDATE_SERVLET, array('wt' => self::SOLR_WRITER ));
 
-		$this->_urlsInited = true;
+		$this->_urlsInited = TRUE;
 	}
 
 	protected function _generateQueryString($params)
@@ -307,7 +307,7 @@ 
 		// 5.1.2 the arg_separator parameter was not available, so don't use it
 		if ($this->_queryBracketsEscaped)
 		{
-			$queryString = http_build_query($params, null, $this->_queryStringDelimiter);
+			$queryString = http_build_query($params, NULL, $this->_queryStringDelimiter);
 			return preg_replace('/%5B(?:[0-9]|[1-9][0-9]+)%5D=/', '=', $queryString);
 		}
 		else
@@ -474,7 +474,7 @@ 
 	public function getHttpTransport()
 	{
 		// lazy load a default if one has not be set
-		if ($this->_httpTransport === false)
+		if ($this->_httpTransport === FALSE)
 		{
 			require_once(dirname(__FILE__) . '/HttpTransport/FileGetContents.php');
 
@@ -625,7 +625,7 @@ 
 	 */
 	public function ping($timeout = 2)
 	{
-		$start = microtime(true);
+		$start = microtime(TRUE);
 		
 		$httpTransport = $this->getHttpTransport();
 
@@ -634,11 +634,11 @@ 
 
 		if ($solrResponse->getHttpStatus() == 200)
 		{
-			return microtime(true) - $start;
+			return microtime(TRUE) - $start;
 		}
 		else
 		{
-			return false;
+			return FALSE;
 		}
 	}
 
@@ -681,7 +681,7 @@ 
 	 *
 	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
 	 */
-	public function addDocument(Apache_Solr_Document $document, $allowDups = false, $overwritePending = true, $overwriteCommitted = true, $commitWithin = 0)
+	public function addDocument(Apache_Solr_Document $document, $allowDups = FALSE, $overwritePending = TRUE, $overwriteCommitted = TRUE, $commitWithin = 0)
 	{
 		$dupValue = $allowDups ? 'true' : 'false';
 		$pendingValue = $overwritePending ? 'true' : 'false';
@@ -709,7 +709,7 @@ 
 	 *
 	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
 	 */
-	public function addDocuments($documents, $allowDups = false, $overwritePending = true, $overwriteCommitted = true, $commitWithin = 0)
+	public function addDocuments($documents, $allowDups = FALSE, $overwritePending = TRUE, $overwriteCommitted = TRUE, $commitWithin = 0)
 	{
 		$dupValue = $allowDups ? 'true' : 'false';
 		$pendingValue = $overwritePending ? 'true' : 'false';
@@ -742,7 +742,7 @@ 
 	{
 		$xml = '<doc';
 
-		if ($document->getBoost() !== false)
+		if ($document->getBoost() !== FALSE)
 		{
 			$xml .= ' boost="' . $document->getBoost() . '"';
 		}
@@ -760,12 +760,12 @@ 
 				{
 					$xml .= '<field name="' . $key . '"';
 
-					if ($fieldBoost !== false)
+					if ($fieldBoost !== FALSE)
 					{
 						$xml .= ' boost="' . $fieldBoost . '"';
 
 						// only set the boost for the first field in the set
-						$fieldBoost = false;
+						$fieldBoost = FALSE;
 					}
 
 					$multivalue = htmlspecialchars($multivalue, ENT_NOQUOTES, 'UTF-8');
@@ -777,7 +777,7 @@ 
 			{
 				$xml .= '<field name="' . $key . '"';
 
-				if ($fieldBoost !== false)
+				if ($fieldBoost !== FALSE)
 				{
 					$xml .= ' boost="' . $fieldBoost . '"';
 				}
@@ -818,7 +818,7 @@ 
 	 *
 	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
 	 */
-	public function commit($expungeDeletes = false, $waitFlush = true, $waitSearcher = true, $timeout = 3600)
+	public function commit($expungeDeletes = FALSE, $waitFlush = TRUE, $waitSearcher = TRUE, $timeout = 3600)
 	{
 		$expungeValue = $expungeDeletes ? 'true' : 'false';
 		$flushValue = $waitFlush ? 'true' : 'false';
@@ -855,7 +855,7 @@ 
 	 *
 	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
 	 */
-	public function deleteById($id, $fromPending = true, $fromCommitted = true, $timeout = 3600)
+	public function deleteById($id, $fromPending = TRUE, $fromCommitted = TRUE, $timeout = 3600)
 	{
 		$pendingValue = $fromPending ? 'true' : 'false';
 		$committedValue = $fromCommitted ? 'true' : 'false';
@@ -879,7 +879,7 @@ 
 	 *
 	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
 	 */
-	public function deleteByMultipleIds($ids, $fromPending = true, $fromCommitted = true, $timeout = 3600)
+	public function deleteByMultipleIds($ids, $fromPending = TRUE, $fromCommitted = TRUE, $timeout = 3600)
 	{
 		$pendingValue = $fromPending ? 'true' : 'false';
 		$committedValue = $fromCommitted ? 'true' : 'false';
@@ -910,7 +910,7 @@ 
 	 *
 	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
 	 */
-	public function deleteByQuery($rawQuery, $fromPending = true, $fromCommitted = true, $timeout = 3600)
+	public function deleteByQuery($rawQuery, $fromPending = TRUE, $fromCommitted = TRUE, $timeout = 3600)
 	{
 		$pendingValue = $fromPending ? 'true' : 'false';
 		$committedValue = $fromCommitted ? 'true' : 'false';
@@ -941,7 +941,7 @@ 
 	 *
 	 * @throws Apache_Solr_InvalidArgumentException if $file, $params, or $document are invalid.
 	 */
-	public function extract($file, $params = array(), $document = null, $mimetype = 'application/octet-stream')
+	public function extract($file, $params = array(), $document = NULL, $mimetype = 'application/octet-stream')
 	{
 		// check if $params is an array (allow null for default empty array)
 		if (!is_null($params))
@@ -965,7 +965,7 @@ 
 		// read the contents of the file
 		$contents = @file_get_contents($file);
 
-		if ($contents !== false)
+		if ($contents !== FALSE)
 		{
 			// add the resource.name parameter if not specified
 			if (!isset($params['resource.name']))
@@ -1002,7 +1002,7 @@ 
 	 *
 	 * @todo Should be using multipart/form-data to post parameter values, but I could not get my implementation to work. Needs revisisted.
 	 */
-	public function extractFromString($data, $params = array(), $document = null, $mimetype = 'application/octet-stream')
+	public function extractFromString($data, $params = array(), $document = NULL, $mimetype = 'application/octet-stream')
 	{
 		// check if $params is an array (allow null for default empty array)
 		if (!is_null($params))
@@ -1030,7 +1030,7 @@ 
 				// check if we need to add a boost.* parameters
 				$fieldBoost = $document->getFieldBoost($field);
 
-				if ($fieldBoost !== false)
+				if ($fieldBoost !== FALSE)
 				{
 					$params["boost.{$field}"] = $fieldBoost;
 				}
@@ -1044,7 +1044,7 @@ 
 		$queryString = $this->_generateQueryString($params);
 
 		// the file contents will be sent to SOLR as the POST BODY - we use application/octect-stream as default mimetype
-		return $this->_sendRawPost($this->_extractUrl . $this->_queryDelimiter . $queryString, $data, false, $mimetype);
+		return $this->_sendRawPost($this->_extractUrl . $this->_queryDelimiter . $queryString, $data, FALSE, $mimetype);
 	}
 	
 	/**
@@ -1065,7 +1065,7 @@ 
 	 *
 	 * @throws Apache_Solr_InvalidArgumentException if $url, $params, or $document are invalid.
 	 */
-	public function extractFromUrl($url, $params = array(), $document = null, $mimetype = 'application/octet-stream')
+	public function extractFromUrl($url, $params = array(), $document = NULL, $mimetype = 'application/octet-stream')
 	{
 		// check if $params is an array (allow null for default empty array)
 		if (!is_null($params))
@@ -1114,7 +1114,7 @@ 
 	 *
 	 * @throws Apache_Solr_HttpTransportException If an error occurs during the service call
 	 */
-	public function optimize($waitFlush = true, $waitSearcher = true, $timeout = 3600)
+	public function optimize($waitFlush = TRUE, $waitSearcher = TRUE, $timeout = 3600)
 	{
 		$flushValue = $waitFlush ? 'true' : 'false';
 		$searcherValue = $waitSearcher ? 'true' : 'false';

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

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

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

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,

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

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,

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

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');
 

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

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)