diff --git a/README.markdown b/README.markdown
index 9ed77e43a8..fa58c005b1 100644
--- a/README.markdown
+++ b/README.markdown
@@ -31,7 +31,7 @@ File indexing
-------------
File upload is supported but the mapper attachement plugin has to be installed
- ./bin/plugin install mapper-attachments
+ ./bin/plugin install mapper-attachments
Contributing
------------
diff --git a/build.xml b/build.xml
index 29de8dba79..ed68390f9a 100644
--- a/build.xml
+++ b/build.xml
@@ -1,232 +1,232 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/lib/Elastica/Client.php b/lib/Elastica/Client.php
index 670c9857c0..905aee5351 100644
--- a/lib/Elastica/Client.php
+++ b/lib/Elastica/Client.php
@@ -34,7 +34,7 @@ class Client
'transport' => null,
'persistent' => true,
'timeout' => null,
- 'connections' => array(), // host, port, path, timeout, transport, persistent, timeout, config -> (curl, headers, url)
+ 'connections' => array(), // host, port, path, timeout, transport, persistent, timeout, config -> (curl, headers, url)
'roundRobin' => false,
'log' => false,
'retryOnConflict' => 0,
@@ -85,9 +85,9 @@ protected function _initConnections()
}
if (isset($this->_config['servers'])) {
- foreach ($this->getConfig('servers') as $server) {
- $this->_connections[] = Connection::create($server);
- }
+ foreach ($this->getConfig('servers') as $server) {
+ $this->_connections[] = Connection::create($server);
+ }
}
// If no connections set, create default connection
diff --git a/lib/Elastica/SearchableInterface.php b/lib/Elastica/SearchableInterface.php
index a23b82460c..372bcb1132 100644
--- a/lib/Elastica/SearchableInterface.php
+++ b/lib/Elastica/SearchableInterface.php
@@ -16,16 +16,16 @@ interface SearchableInterface
*
* TODO: Improve sample code
* {
- * "from" : 0,
- * "size" : 10,
- * "sort" : {
- * "postDate" : {"reverse" : true},
- * "user" : { },
- * "_score" : { }
- * },
- * "query" : {
- * "term" : { "user" : "kimchy" }
- * }
+ * "from" : 0,
+ * "size" : 10,
+ * "sort" : {
+ * "postDate" : {"reverse" : true},
+ * "user" : { },
+ * "_score" : { }
+ * },
+ * "query" : {
+ * "term" : { "user" : "kimchy" }
+ * }
* }
*
* @param string|array|\Elastica\Query $query Array with all query data inside or a Elastica\Query object
diff --git a/lib/Elastica/Type/AbstractType.php b/lib/Elastica/Type/AbstractType.php
index 28ef112cf4..ba2e0430d2 100644
--- a/lib/Elastica/Type/AbstractType.php
+++ b/lib/Elastica/Type/AbstractType.php
@@ -16,12 +16,12 @@
* with some easy config entries that are overloaded.
*
* The following variables have to be set:
- * - $_indexName
- * - $_typeName
+ * - $_indexName
+ * - $_typeName
*
* The following variables can be set for additional configuration
- * - $_mapping: Value type mapping for the given type
- * - $_indexParams: Parameters for the index
+ * - $_mapping: Value type mapping for the given type
+ * - $_indexParams: Parameters for the index
*
* @todo Add some settings examples to code
* @category Xodoa
diff --git a/phpdoc.dist.xml b/phpdoc.dist.xml
index 73d161fe76..585a468700 100644
--- a/phpdoc.dist.xml
+++ b/phpdoc.dist.xml
@@ -1,13 +1,13 @@
- Elastica
-
- ./build/api
-
-
- ./build/api
-
-
- ./lib
-
+ Elastica
+
+ ./build/api
+
+
+ ./build/api
+
+
+ ./lib
+
diff --git a/test/lib/Elastica/Test/Index/SettingsTest.php b/test/lib/Elastica/Test/Index/SettingsTest.php
index 0aa610f76f..39d98c6594 100644
--- a/test/lib/Elastica/Test/Index/SettingsTest.php
+++ b/test/lib/Elastica/Test/Index/SettingsTest.php
@@ -243,7 +243,7 @@ public function testGetSetBlocksMetadata()
$settings->setBlocksMetadata();
$this->assertTrue($settings->getBlocksMetadata());
- $settings->setBlocksMetadata(false); // Cannot delete index otherwise
+ $settings->setBlocksMetadata(false); // Cannot delete index otherwise
$index->delete();
}
}
diff --git a/test/lib/Elastica/Test/IndexTest.php b/test/lib/Elastica/Test/IndexTest.php
index 89732d6fe3..eb46fa2cea 100644
--- a/test/lib/Elastica/Test/IndexTest.php
+++ b/test/lib/Elastica/Test/IndexTest.php
@@ -420,7 +420,7 @@ public function testIndexGetMapping()
'username' => array('type' => 'string', 'store' => 'no'), 'test' => array('type' => 'integer', 'store' => 'no'),);
$type->setMapping($mapping);
- $index->refresh();
+ $index->refresh();
$indexMappings = $index->getMapping();
$this->assertEquals($indexMappings['elastica_test']['test']['properties']['id']['type'], 'integer');