Commit 9959cad4 authored by Bas de Nooijer's avatar Bas de Nooijer

- code style fixes

parent 4008b6b6
...@@ -77,7 +77,12 @@ class Solarium_Autoloader ...@@ -77,7 +77,12 @@ class Solarium_Autoloader
{ {
if (substr($class,0,8) == 'Solarium') { if (substr($class,0,8) == 'Solarium') {
$class = str_replace(array('Solarium','_'), array('','/'), $class); $class = str_replace(
array('Solarium', '_'),
array('', '/'),
$class
);
$file = dirname(__FILE__) . '/' . $class . '.php'; $file = dirname(__FILE__) . '/' . $class . '.php';
require($file); require($file);
......
...@@ -86,7 +86,8 @@ class Solarium_Client_Adapter_ZendHttp extends Solarium_Client_Adapter_Http ...@@ -86,7 +86,8 @@ class Solarium_Client_Adapter_ZendHttp extends Solarium_Client_Adapter_Http
); );
// forward adapter options if available // forward adapter options if available
if( isset($this->_options['adapteroptions'])) { if( isset($this->_options['adapteroptions']))
{
$this->_zendHttp->setConfig($this->_options['adapteroptions']); $this->_zendHttp->setConfig($this->_options['adapteroptions']);
} }
} }
......
...@@ -137,7 +137,8 @@ class Solarium_Document_ReadOnly ...@@ -137,7 +137,8 @@ class Solarium_Document_ReadOnly
* @param mixed $value * @param mixed $value
* @return void * @return void
*/ */
public function offsetSet($offset, $value) { public function offsetSet($offset, $value)
{
$this->__set($offset, $value); $this->__set($offset, $value);
} }
...@@ -147,7 +148,8 @@ class Solarium_Document_ReadOnly ...@@ -147,7 +148,8 @@ class Solarium_Document_ReadOnly
* @param mixed $offset * @param mixed $offset
* @return bool * @return bool
*/ */
public function offsetExists($offset) { public function offsetExists($offset)
{
return isset($this->_fields[$offset]); return isset($this->_fields[$offset]);
} }
...@@ -157,7 +159,8 @@ class Solarium_Document_ReadOnly ...@@ -157,7 +159,8 @@ class Solarium_Document_ReadOnly
* @param mixed $offset * @param mixed $offset
* @return void * @return void
*/ */
public function offsetUnset($offset) { public function offsetUnset($offset)
{
$this->__set($offset, null); $this->__set($offset, null);
} }
...@@ -167,7 +170,8 @@ class Solarium_Document_ReadOnly ...@@ -167,7 +170,8 @@ class Solarium_Document_ReadOnly
* @param mixed $offset * @param mixed $offset
* @return mixed|null * @return mixed|null
*/ */
public function offsetGet($offset) { public function offsetGet($offset)
{
return isset($this->_fields[$offset]) ? $this->_fields[$offset] : null; return isset($this->_fields[$offset]) ? $this->_fields[$offset] : null;
} }
......
...@@ -65,7 +65,7 @@ class Solarium_Escape ...@@ -65,7 +65,7 @@ class Solarium_Escape
*/ */
static public function term($input) static public function term($input)
{ {
$pattern = '/(\+|-|&&|\|\||!|\(|\)|\{|}|\[|]|\^|"|~|\*|\?|:|\\\)/'; $pattern = '/(\+|-|&&|\|\||!|\(|\)|\{|}|\[|]|\^|"|~|\*|\?|:|\\\)/';
return preg_replace($pattern, '\\\$1', $input); return preg_replace($pattern, '\\\$1', $input);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment