Merge branch 'release/2.4.0' into develop

msabramo · Feb 14, 2012 · 72ffa05 · 72ffa05
2 parents 67f5cb9 + 9deb64d
commit 72ffa05
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 18 deletions.
diff --git a/composer.json b/composer.json
@@ -2,18 +2,14 @@
     "name": "solarium/solarium",
     "type": "library",
     "description": "PHP Solr client",
-    "keywords": ["solr", "search"],
+    "keywords": ["solr", "search", "php"],
     "homepage": "http://www.solarium-project.org",
-    "version": "2.3.0",
+    "version": "2.4.0",
     "license": "NewBSD",
     "authors": [
         {
-            "name": "Bas de Nooijer",
-            "email": "github@raspberry.nl"
-        },
-        {
-            "name": "Gasol Wu",
-            "email": "gasol.wu@gmail.com"
+            "name": "See GitHub contributors",
+            "homepage": "https://github.com/basdenooijer/solarium/contributors"
         }
     ],
     "require": {

diff --git a/library/Solarium/Client/ResponseParser/Analysis/Field.php b/library/Solarium/Client/ResponseParser/Analysis/Field.php
@@ -112,14 +112,16 @@ protected function _parseTypes($typeData)
 
                     if (is_string($analysis)) {
 
-                        $item = new Solarium_Result_Analysis_Item(array(
-                            'text' => $analysis,
-                            'start' => null,
-                            'end' => null,
-                            'position' => null,
-                            'positionHistory' => null,
-                            'type' => null,
-                        ));
+                        $item = new Solarium_Result_Analysis_Item(
+                            array(
+                                'text' => $analysis,
+                                'start' => null,
+                                'end' => null,
+                                'position' => null,
+                                'positionHistory' => null,
+                                'type' => null,
+                            )
+                        );
 
                         $classes[] = new Solarium_Result_Analysis_List($class, array($item));
 

diff --git a/library/Solarium/Plugin/ParallelExecution.php b/library/Solarium/Plugin/ParallelExecution.php
@@ -102,7 +102,8 @@ public function getQueries()
      *
      * @return self Provides fluent interface
      */
-    public function clearQueries() {
+    public function clearQueries()
+    {
         $this->_queries = array();
         return $this;
     }
@@ -121,7 +122,7 @@ public function clearQueries() {
     public function execute($queries = null)
     {
         // this is for backwards compatibility
-        if(is_array($queries)) {
+        if (is_array($queries)) {
             foreach ($queries as $key => $query) {
                 $this->addQuery($key, $query);
             }