Merge branch 'develop' into feature/nextgen

Conflicts:
	library/Solarium/Client/Client.php
	library/Solarium/Client/RequestBuilder/Select/Component/Highlighting.php
	library/Solarium/Client/ResponseParser/Analysis/Field.php
	library/Solarium/Plugin/AbstractPlugin.php
	library/Solarium/Query/Helper.php
	library/Solarium/Result/Result.php
	library/Solarium/Result/Select/Debug/Debug.php
	tests/Solarium/Tests/Client/RequestBuilder/Select/Component/FacetSetTest.php

examples/7.5-plugin-bufferedadd.php

+<?php
+require('init.php');
+
+// this very simple plugin is used to show some events
+class simpleDebug extends \Solarium\Plugin\AbstractPlugin
+{
+    protected $_output = array();
+
+    public function display()
+    {
+        echo implode('<br/>', $this->_output);
+    }
+
+    public function eventBufferedAddFlushStart($buffer) {
+        $this->_output[] = 'Flushing buffer (' . count($buffer) . 'docs)';
+    }
+}
+
+htmlHeader();
+
+// create a client instance and autoload the buffered add plugin
+$client = new Solarium\Client\Client($config);
+$buffer = $client->getPlugin('bufferedadd');
+$buffer->setBufferSize(10); // this is quite low, in most cases you can use a much higher value
+
+// also register a plugin for outputting events
+$debug = new simpleDebug();
+$client->registerPlugin('debugger', $debug);
+
+// let's insert 25 docs
+for ($i=1; $i<=25; $i++) {
+
+    // create a new document with dummy data and add it to the buffer
+    $data = array(
+        'id' => 'test_'.$i,
+        'name' => 'test for buffered add',
+        'price' => $i,
+    );
+    $buffer->createDocument($data);
+
+    // alternatively you could create document instances yourself and use the addDocument(s) method
+}
+
+// At this point two flushes will already have been done by the buffer automatically (at the 10th and 20th doc), now
+// manually flush the remainder. Alternatively you can use the commit method if you want to include a commit command.
+$buffer->flush();
+
+// In total 3 flushes (requests) have been sent to Solr. This should be visible in this output:
+$debug->display();
+
+htmlFooter();
\ No newline at end of file

examples/7.6-plugin-prefetchiterator.php

+<?php
+require('init.php');
+
+htmlHeader();
+
+// create a client instance
+$client = new Solarium\Client\Client($config);
+
+// get a select query instance
+$query = $client->createSelect();
+$query->setFields(array('id'));
+
+// get a plugin instance and apply settings
+$prefetch = $client->getPlugin('prefetchiterator');
+$prefetch->setPrefetch(2); //fetch 5 rows per query (for real world use this can be way higher)
+$prefetch->setQuery($query);
+
+// display the total number of documents found by solr
+echo 'NumFound: ' . count($prefetch);
+
+// show document IDs using the resultset iterator
+foreach ($prefetch as $document) {
+    echo '<hr/>ID: '. $document->id;
+}
+
+htmlFooter();
\ No newline at end of file

examples/index.html

@@ -124,6 +124,8 @@
                 <li><a href="7.2-plugin-postbigrequest.php">7.2 Post Big Requests</a></li>
                 <li><a href="7.3-plugin-customizerequest.php">7.3 Customize Requests</a></li>
                 <li><a href="7.4-plugin-parallelexecution.php">7.4 Parallel Execution</a></li>
+                <li><a href="7.5-plugin-bufferedadd.php">7.5 Buffered Add for documents</a></li>
+                <li><a href="7.6-plugin-prefetchiterator.php">7.6 Prefetch iterator for select queries</a></li>
             </ul>
 
         </ul>

library/Solarium/Client/Adapter/Curl.php

@@ -96,6 +96,13 @@ class Curl extends Adapter
         // @codeCoverageIgnoreEnd
     }
 
+    /**
+     * Get the response for a curl handle
+     *
+     * @param resource $handle
+     * @param string $httpResponse
+     * @return Solarium_Client_Response
+     */
     public function getResponse($handle, $httpResponse)
     {
         // @codeCoverageIgnoreStart

library/Solarium/Client/Client.php

@@ -170,6 +170,8 @@ class Client extends Solarium\Configurable
         'postbigrequest' => 'Solarium\Plugin\PostBigRequest',
         'customizerequest' => 'Solarium\Plugin\CustomizeRequest\CustomizeRequest',
         'parallelexecution' => 'Solarium\Plugin\ParallelExecution',
+        'bufferedadd' => 'Solarium\Plugin\BufferedAdd',
+        'prefetchiterator' => 'Solarium\Plugin\PrefetchIterator',
     );
 
     /**
@@ -396,7 +398,7 @@ class Client extends Solarium\Configurable
     }
 
     /**
-     * Get all registered querytypes
+     * Get all registered plugins
      *
      * @return array
      */

library/Solarium/Client/ResponseParser/Analysis/Field.php

@@ -116,12 +116,29 @@ class Field extends \Solarium\Client\ResponseParser\ResponseParser
                     $class = $typeData[$counter];
                     $analysis = $typeData[$counter+1];
 
+                    if (is_string($analysis)) {
+
+                        $item = new Analysis\Item(array(
+                            'text' => $analysis,
+                            'start' => null,
+                            'end' => null,
+                            'position' => null,
+                            'positionHistory' => null,
+                            'type' => null,
+                        ));
+
+                        $classes[] = new Analysis\ResultList($class, array($item));
+
+                    } else {
+
                         $items = array();
-                    foreach ($analysis AS $itemData) {
+                        foreach ($analysis as $itemData) {
                             $items[] = new Analysis\Item($itemData);
                         }
 
                         $classes[] = new Analysis\ResultList($class, $items);
+                    }
+
                     $counter += 2;
                 }
 

library/Solarium/Plugin/AbstractPlugin.php

@@ -75,7 +75,7 @@ abstract class AbstractPlugin extends \Solarium\Configurable
     /**
      * Plugin init function
      *
-     * This is an extension point for plugin implemenations.
+     * This is an extension point for plugin implementations.
      * Will be called as soon as $this->_client and options have been set.
      *
      * @return void

library/Solarium/Plugin/BufferedAdd.php

+<?php
+/**
+ * Copyright 2011 Bas de Nooijer. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this listof conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation are
+ * those of the authors and should not be interpreted as representing official
+ * policies, either expressed or implied, of the copyright holder.
+ *
+ * @copyright Copyright 2011 Bas de Nooijer <solarium@raspberry.nl>
+ * @license http://github.com/basdenooijer/solarium/raw/master/COPYING
+ * @link http://www.solarium-project.org/
+ *
+ * @package Solarium
+ */
+
+/**
+ * @namespace
+ */
+namespace Solarium\Plugin;
+use Solarium\Client;
+
+/**
+ * Buffered add plugin
+ *
+ * If you need to add (or update) a big number of documents to Solr it's much more efficient to do so in batches.
+ * This plugin makes this as easy as possible.
+ *
+ * @package Solarium
+ * @subpackage Plugin
+ */
+class BufferedAdd extends AbstractPlugin
+{
+
+    /**
+     * Default options
+     *
+     * @var array
+     */
+    protected $_options = array(
+        'buffersize' => 100,
+    );
+
+    /**
+     * Update query instance
+     *
+     * @var Solarium_Query_Update
+     */
+    protected $_updateQuery;
+
+    /**
+     * Buffered documents
+     *
+     * @var array
+     */
+    protected $_buffer = array();
+
+    /**
+     * Plugin init function
+     *
+     * This is an extension point for plugin implementations.
+     * Will be called as soon as $this->_client and options have been set.
+     *
+     * @return void
+     */
+    protected function _initPlugin()
+    {
+        $this->_updateQuery = $this->_client->createUpdate();
+    }
+
+    /**
+     * Set buffer size option
+     *
+     * @param int $size
+     * @return Solarium_Configurable
+     */
+    public function setBufferSize($size)
+    {
+        return $this->_setOption('buffersize', $size);
+    }
+
+    /**
+     * Get buffer size option value
+     *
+     * @return int
+     */
+    public function getBufferSize()
+    {
+        return $this->getOption('buffersize');
+    }
+
+    /**
+     * Create a document object instance and add it to the buffer
+     *
+     * @param array $fields
+     * @param array $boosts
+     * @return self Provides fluent interface
+     */
+    public function createDocument($fields, $boosts = array())
+    {
+        $doc = $this->_updateQuery->createDocument($fields, $boosts);
+        $this->addDocument($doc);
+
+        return $this;
+    }
+
+    /**
+     * Add a document
+     *
+     * @param Solarium\Document\ReadOnly $document
+     * @return self Provides fluent interface
+     */
+    public function addDocument($document)
+    {
+        $this->_buffer[] = $document;
+        if (count($this->_buffer) == $this->_options['buffersize']) {
+            $this->flush();
+        }
+
+        return $this;
+    }
+
+    /**
+     * Add multiple documents
+     *
+     * @param array
+     * @return self Provides fluent interface
+     */
+    public function addDocuments($documents)
+    {
+        foreach ($documents as $document) {
+            $this->addDocument($document);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get all documents currently in the buffer
+     *
+     * Any previously flushed documents will not be included!
+     *
+     * @return array
+     */
+    public function getDocuments()
+    {
+        return $this->_buffer;
+    }
+
+    /**
+     * Clear any buffered documents
+     *
+     * @return self Provides fluent interface
+     */
+    public function clear()
+    {
+        $this->_updateQuery = $this->_client->createUpdate();
+        $this->_buffer = array();
+        return $this;
+    }
+
+    /**
+     * Flush any buffered documents to Solr
+     *
+     * @param boolean $overwrite
+     * @param int $commitWithin
+     * @return boolean|Solarium\Result\Update
+     */
+    public function flush($overwrite = null, $commitWithin = null)
+    {
+        if (count($this->_buffer) == 0) {
+            // nothing to do
+            return false;
+        }
+
+        $this->_client->triggerEvent('BufferedAddFlushStart', array($this->_buffer));
+
+        $this->_updateQuery->addDocuments($this->_buffer, $overwrite, $commitWithin);
+        $result = $this->_client->update($this->_updateQuery);
+        $this->clear();
+
+        $this->_client->triggerEvent('BufferedAddFlushEnd', array($result));
+
+        return $result;
+    }
+
+    /**
+     * Commit changes
+     *
+     * Any remaining documents in the buffer will also be flushed
+     *
+     * @param boolean $overwrite
+     * @param boolean $waitFlush
+     * @param boolean $waitSearcher
+     * @param boolean $expungeDeletes
+     * @return Solarium\Result\Update
+     */
+    public function commit($overwrite = null, $waitFlush = null, $waitSearcher = null, $expungeDeletes = null)
+    {
+        $this->_client->triggerEvent('BufferedAddCommitStart', array($this->_buffer));
+
+        $this->_updateQuery->addDocuments($this->_buffer, $overwrite);
+        $this->_updateQuery->addCommit($waitFlush, $waitSearcher, $expungeDeletes);
+        $result = $this->_client->update($this->_updateQuery);
+        $this->clear();
+
+        $this->_client->triggerEvent('BufferedAddCommitEnd', array($result));
+
+        return $result;
+    }
+
+}
\ No newline at end of file

library/Solarium/Plugin/CustomizeRequest/Customization.php

@@ -50,9 +50,13 @@ class Customization extends \Solarium\Configurable
 {
 
     /**
-     * Type definitions
+     * Type definition for params
      */
     const TYPE_PARAM = 'param';
+
+    /**
+     * Type definition for headers
+     */
     const TYPE_HEADER = 'header';
 
     /**

library/Solarium/Plugin/ParallelExecution.php

@@ -74,7 +74,7 @@ class ParallelExecution extends AbstractPlugin
         // create handles and add all handles to the multihandle
         $multiHandle = curl_multi_init();
         $handles = array();
-        foreach($queries as $key => $query) {
+        foreach ($queries as $key => $query) {
             $request = $this->_client->createRequest($query);
             $handle = $adapter->createHandle($request);
             curl_multi_add_handle($multiHandle, $handle);

library/Solarium/Plugin/PrefetchIterator.php

+<?php
+/**
+ * Copyright 2011 Bas de Nooijer. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this listof conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation are
+ * those of the authors and should not be interpreted as representing official
+ * policies, either expressed or implied, of the copyright holder.
+ *
+ * @copyright Copyright 2011 Bas de Nooijer <solarium@raspberry.nl>
+ * @license http://github.com/basdenooijer/solarium/raw/master/COPYING
+ * @link http://www.solarium-project.org/
+ *
+ * @package Solarium
+ */
+
+/**
+ * @namespace
+ */
+namespace Solarium\Plugin;
+use Solarium\Client;
+
+/**
+ * Prefetch plugin
+ *
+ * This plugin can be used to create an 'endless' iterator over a complete resultset. The iterator will take care of
+ * fetching the data in sets (sequential prefetching).
+ *
+ * @package Solarium
+ * @subpackage Plugin
+ */
+class PrefetchIterator extends AbstractPlugin implements \Iterator, \Countable
+{
+
+    /**
+     * Default options
+     *
+     * @var array
+     */
+    protected $_options = array(
+        'prefetch' => 100,
+    );
+
+    /**
+     * Query instance to execute
+     *
+     * @var Solarium\Query\Select
+     */
+    protected $_query;
+
+    /**
+     * Start position (offset)
+     *
+     * @var int
+     */
+    protected $_start = 0;
+
+    /**
+     * Last resultset from the query instance
+     *
+     * @var Solarium\Result\Select
+     */
+    protected $_result;
+
+    /**
+     * Iterator position
+     *
+     * @var int
+     */
+    protected $_position;
+
+    /**
+     * Documents from the last resultset
+     *
+     * @var array
+     */
+    protected $_documents;
+
+    /**
+     * Set prefetch option
+     *
+     * @param integer $value
+     * @return self Provides fluent interface
+     */
+    public function setPrefetch($value)
+    {
+        return $this->_setOption('prefetch', $value);
+    }
+
+    /**
+     * Get prefetch option
+     *
+     * @return integer
+     */
+    public function getPrefetch()
+    {
+        return $this->getOption('prefetch');
+    }
+
+    /**
+     * Set query to use for prefetching
+     *
+     * @param Solarium\Query\Select $query
+     * @return self Provides fluent interface
+     */
+    public function setQuery($query)
+    {
+        $this->_query = $query;
+        return $this;
+    }
+
+    /**
+     * Get the query object used
+     *
+     * @return Solarium\Query\Select
+     */
+    public function getQuery()
+    {
+        return $this->_query;
+    }
+
+    /**
+     * Countable implementation
+     *
+     * @return int
+     */
+    public function count()
+    {
+        // if no results are available yet, get them now
+        if (null == $this->_result) $this->_fetchNext();
+
+        return $this->_result->getNumFound();
+    }
+
+    /**
+     * Iterator implementation
+     */
+    function rewind()
+    {
+        $this->_position = 0;
+
+        // this condition prevent useless re-fetching of data if a count is done before the iterator is used
+        if ($this->_start !== $this->_options['prefetch']) {
+            $this->_start = 0;
+        }
+    }
+
+    /**
+     * Iterator implementation
+     */
+    function current()
+    {
+        $adjustedIndex = $this->_position % $this->_options['prefetch'];
+        return $this->_documents[$adjustedIndex];
+    }
+
+    /**
+     * Iterator implementation
+     *
+     * @return int
+     */
+    function key()
+    {
+        return $this->_position;
+    }
+
+    /**
+     * Iterator implementation
+     */
+    function next()
+    {
+        ++$this->_position;
+    }
+
+    /**
+     * Iterator implementation
+     *
+     * @return boolean
+     */
+    function valid()
+    {
+        $adjustedIndex = $this->_position % $this->_options['prefetch'];
+
+        // this condition prevent useless re-fetching of data if a count is done before the iterator is used
+        if ($adjustedIndex == 0 && ($this->_position !== 0 || null == $this->_result)) {
+            $this->_fetchNext();
+        }
+
+        return isset($this->_documents[$adjustedIndex]);
+    }
+
+    /**
+     * Fetch the next set of results
+     *
+     * @return void
+     */
+    protected function _fetchNext()
+    {
+        $this->_query->setStart($this->_start)->setRows($this->getPrefetch());
+        $this->_result = $this->_client->execute($this->_query);
+        $this->_documents = $this->_result->getDocuments();
+        $this->_start += $this->getPrefetch();
+    }
+}
\ No newline at end of file

library/Solarium/Query/Helper.php

@@ -74,7 +74,10 @@ class Helper
     protected $_derefencedParamsLastKey = 0;
 
     /**
-     * @var Solarium\Query
+     * Solarium_Query instance, optional.
+     * Used for dereferenced params.
+     *
+     * @var Solarium\Query\Query
      */
     protected $_query;
 
@@ -83,7 +86,8 @@ class Helper
      *
      * @param Solarium\Query $query
      */
-    public function __construct($query = null) {
+    public function __construct($query = null)
+    {
         $this->_query = $query;
     }
 
@@ -128,6 +132,68 @@ class Helper
         return '"' . preg_replace('/("|\\\)/', '\\\$1', $input) . '"';
     }
 
+    /**
+     * Format a date to the expected formatting used in SOLR
+     *
+     * This format was derived to be standards compliant (ISO 8601)
+     * A date field shall be of the form 1995-12-31T23:59:59Z The trailing "Z" designates UTC time and is mandatory
+     *
+     * @see http://lucene.apache.org/solr/api/org/apache/solr/schema/DateField.html
+     *
+     * @param int|string|DateTime $input accepted formats: timestamp, date string or DateTime
+     * @return string|false false is returned in case of invalid input
+     */
+    public function formatDate($input)
+    {
+        switch(true){
+
+
+            // input of datetime object
+            case $input instanceof \DateTime:
+                // no work needed
+                break;
+
+
+            // input of timestamp or date/time string
+            case is_string($input) || is_numeric($input):
+
+                // if date/time string: convert to timestamp first
+                if (is_string($input)) $input = strtotime($input);
+
+                // now try converting the timestamp to a datetime instance, on failure return false
+                try {
+                    $input = new \DateTime('@' . $input);
+                } catch (\Exception $e) {
+                    $input = false;
+                }
+                break;
+
+
+            // any other input formats can be added in additional cases here...
+            // case $input instanceof Zend_Date:
+
+
+            // unsupported input format
+            default:
+                $input = false;
+                break;
+        }
+
+
+        // handle the filtered input
+        if ($input) {
+            // when we get here the input is always a datetime object
+            $input->setTimezone(new \DateTimeZone('UTC'));
+            $iso8601 = $input->format(\DateTime::ISO8601);
+            $iso8601 = strstr($iso8601, '+', true); //strip timezone
+            $iso8601 .= 'Z';
+            return $iso8601;
+        } else {
+            // unsupported input
+            return false;
+        }
+    }
+
     /**
      * Render a range query
      *
@@ -234,14 +300,14 @@ class Helper
     {
         if ($dereferenced) {
 
-            if(!$this->_query) {
+            if (!$this->_query) {
                 throw new \Solarium\Exception(
                     'Dereferenced params can only be used in a Solarium_Query_Helper instance retrieved from the query '
                     . 'by using the getHelper() method, this instance was manually created'
                 );
             }
 
-            foreach($params as $paramKey => $paramValue) {
+            foreach ($params as $paramKey => $paramValue) {
                 $this->_derefencedParamsLastKey++;
                 $derefKey = 'deref_' . $this->_derefencedParamsLastKey;
                 $this->_query->addParam($derefKey, $paramValue);

library/Solarium/Result/Analysis/Item.php

@@ -51,41 +51,57 @@ class Item
 {
 
     /**
+     * Text string
+     *
      * @var string
      */
     protected $_text;
 
     /**
+     * RawText string
+     *
      * @var string
      */
     protected $_rawText;
 
     /**
+     * Start
+     *
      * @var int
      */
     protected $_start;
 
     /**
+     * End
+     *
      * @var int
      */
     protected $_end;
 
     /**
+     * Position
+     *
      * @var int
      */
     protected $_position;
 
     /**
+     * Position history
+     *
      * @var array
      */
     protected $_positionHistory;
 
     /**
+     * Type
+     *
      * @var string
      */
     protected $_type;
 
     /**
+     * Match
+     *
      * @var boolean
      */
     protected $_match = false;

library/Solarium/Result/Analysis/ResultList.php

@@ -51,11 +51,15 @@ class ResultList implements \IteratorAggregate, \Countable
 {
 
     /**
+     * List name
+     *
      * @var string
      */
     protected $_name;
 
     /**
+     * List items
+     *
      * @var array
      */
     protected $_items;

library/Solarium/Result/Result.php

@@ -77,7 +77,9 @@ class Result
     protected $_query;
 
     /**
-     * @var Solarium\Client
+     * Solarium client instance
+     *
+     * @var \Solarium\Client\Client
      */
     protected $_client;
 

library/Solarium/Result/Select/Debug/Debug.php

@@ -51,36 +51,50 @@ class Debug implements \IteratorAggregate, \Countable
 {
 
     /**
+     * QueryString
+     *
      * @var string
      */
     protected $_queryString;
 
     /**
+     * ParsedQuery
+     *
      * @var string
      */
     protected $_parsedQuery;
 
     /**
+     * QueryParser
+     *
      * @var string
      */
     protected $_queryParser;
 
     /**
+     * OtherQuery
+     *
      * @var string
      */
     protected $_otherQuery;
 
     /**
+     * Explain instance
+     *
      * @var Solarium\Result\Select\Debug\DocumentSet
      */
     protected $_explain;
 
     /**
+     * ExplainOther instance
+     *
      * @var Solarium\Result\Select\Debug\DocumentSet
      */
     protected $_explainOther;
 
     /**
+     * Timing instance
+     *
      * @var Solarium\Result\Select\Debug\Timing
      */
     protected $_timing;

library/Solarium/Result/Select/Debug/Detail.php

@@ -51,16 +51,22 @@ class Detail
 {
 
     /**
+     * Value
+     *
      * @var float
      */
     protected $_value;
 
     /**
+     * Match
+     *
      * @var boolean
      */
     protected $_match;
 
     /**
+     * Description
+     *
      * @var string
      */
     protected $_description;

library/Solarium/Result/Select/Debug/Document.php

@@ -52,11 +52,15 @@ class Document extends Detail
 {
 
     /**
+     * Key
+     *
      * @var string
      */
     protected $_key;
 
     /**
+     * Details
+     *
      * @var array
      */
     protected $_details;
@@ -68,6 +72,7 @@ class Document extends Detail
      * @param boolean $match
      * @param float $value
      * @param string $description
+     * @param array $details
      */
     public function __construct($key, $match, $value, $description, $details)
     {

library/Solarium/Result/Select/Debug/Timing.php

@@ -51,6 +51,8 @@ class Timing implements \IteratorAggregate, \Countable
 {
 
     /**
+     * Time
+     *
      * @var float
      */
     protected $_time;

library/Solarium/Result/Select/Debug/TimingPhase.php

@@ -52,11 +52,15 @@ class TimingPhase
 {
 
     /**
+     * Phase name
+     *
      * @var string
      */
     protected $_name;
 
     /**
+     * Phase time
+     *
      * @var float
      */
     protected $_time;

library/Solarium/Result/Select/Spellcheck/Collation.php

@@ -51,16 +51,22 @@ class Collation implements \IteratorAggregate, \Countable
 {
 
     /**
+     * Query
+     *
      * @var string
      */
     protected $_query;
 
     /**
+     * Hit count
+     *
      * @var int
      */
     protected $_hits;
 
     /**
+     * Corrections
+     *
      * @var array
      */
     protected $_corrections;

library/Solarium/Result/Select/Spellcheck/Spellcheck.php

@@ -65,6 +65,8 @@ class Spellcheck implements \IteratorAggregate, \Countable
     protected $_collation;
 
     /**
+     * Correctly spelled?
+     *
      * @var boolean
      */
     protected $_correctlySpelled;

library/Solarium/Result/Suggester/Suggester.php

@@ -126,7 +126,7 @@ class Suggester extends \Solarium\Result\QueryType implements \IteratorAggregate
     /**
      * Get results for a specific term
      *
-     * @param string $field
+     * @param string $term
      * @return array
      */
     public function getTerm($term)

library/Solarium/Result/Suggester/Term.php

@@ -51,21 +51,29 @@ class Term implements \IteratorAggregate, \Countable
 {
 
     /**
+     * NumFound
+     *
      * @var int
      */
     protected $_numFound;
 
     /**
+     * StartOffset
+     *
      * @var int
      */
     protected $_startOffset;
 
     /**
+     * EndOffset
+     *
      * @var int
      */
     protected $_endOffset;
 
     /**
+     * Suggestions
+     *
      * @var array
      */
     protected $_suggestions;

tests/Solarium/Tests/Client/RequestBuilder/Select/Component/DebugTest.php

@@ -34,7 +34,7 @@ namespace Solarium\Tests\Client\RequestBuilder\Select\Component;
 class DebugTest extends \PHPUnit_Framework_TestCase
 {
 
-    public function testBuild()
+    public function testBuildComponent()
     {
         $builder = new \Solarium\Client\RequestBuilder\Select\Component\Debug();
         $request = new \Solarium\Client\Request();

tests/Solarium/Tests/Client/RequestBuilder/Select/Component/DisMaxTest.php

@@ -34,7 +34,7 @@ namespace Solarium\Tests\Client\RequestBuilder\Select\Component;
 class DisMaxTest extends \PHPUnit_Framework_TestCase
 {
 
-    public function testBuild()
+    public function testBuildComponent()
     {
         $builder = new \Solarium\Client\RequestBuilder\Select\Component\DisMax;
         $request = new \Solarium\Client\Request();

tests/Solarium/Tests/Client/RequestBuilder/Select/Component/DistributedSearchTest.php

@@ -34,7 +34,7 @@ namespace Solarium\Tests\Client\RequestBuilder\Select\Component;
 class DistributedSearchTest extends \PHPUnit_Framework_TestCase
 {
 
-    public function testBuild()
+    public function testBuildComponent()
     {
         $builder = new \Solarium\Client\RequestBuilder\Select\Component\DistributedSearch;
         $request = new \Solarium\Client\Request();

tests/Solarium/Tests/Client/RequestBuilder/Select/Component/FacetSetTest.php

@@ -73,6 +73,7 @@ class FacetSetTest extends \PHPUnit_Framework_TestCase
         $this->_component->addFacet(new \Solarium\Query\Select\Component\Facet\Field(array('key' => 'f1', 'field' => 'owner')));
         $this->_component->addFacet(new \Solarium\Query\Select\Component\Facet\Query(array('key' => 'f2', 'query' => 'category:23')));
         $this->_component->addFacet(new \Solarium\Query\Select\Component\Facet\MultiQuery(array('key' => 'f3', 'query' => array('f4' => array('query' => 'category:40')))));
+
         $request = $this->_builder->buildComponent($this->_component, $this->_request);
 
         $this->assertEquals(
@@ -145,6 +146,7 @@ class FacetSetTest extends \PHPUnit_Framework_TestCase
         $this->_component->addFacet(new \Solarium\Query\Select\Component\Facet\Field(array('key' => 'f1', 'field' => 'owner')));
         $this->_component->addFacet(new \Solarium\Query\Select\Component\Facet\Query(array('key' => 'f2', 'query' => 'category:23')));
         $this->_component->addFacet(new \Solarium\Query\Select\Component\Facet\MultiQuery(array('key' => 'f3', 'query' => array('f4' =>array('query' => 'category:40')))));
+
         $request = $this->_builder->buildComponent($this->_component, $this->_request);
 
         $this->assertEquals(

tests/Solarium/Tests/Client/RequestBuilder/Select/Component/GroupingTest.php

@@ -34,7 +34,7 @@ namespace Solarium\Tests\Client\RequestBuilder\Select\Component;
 class GroupingTest extends \PHPUnit_Framework_TestCase
 {
 
-    public function testBuild()
+    public function testBuildComponent()
     {
         $builder = new \Solarium\Client\RequestBuilder\Select\Component\Grouping;
         $request = new \Solarium\Client\Request();

tests/Solarium/Tests/Client/RequestBuilder/Select/Component/HighlightingTest.php

@@ -34,7 +34,7 @@ namespace Solarium\Tests\Client\RequestBuilder\Select\Component;
 class HighlightingTest extends \PHPUnit_Framework_TestCase
 {
 
-    public function testBuild()
+    public function testBuildComponent()
     {
         $builder = new \Solarium\Client\RequestBuilder\Select\Component\Highlighting;
         $request = new \Solarium\Client\Request();

tests/Solarium/Tests/Client/RequestBuilder/Select/Component/MoreLikeThisTest.php

@@ -34,7 +34,7 @@ namespace Solarium\Tests\Client\RequestBuilder\Select\Component;
 class MoreLikeThisTest extends \PHPUnit_Framework_TestCase
 {
 
-    public function testBuild()
+    public function testBuildComponent()
     {
         $builder = new \Solarium\Client\RequestBuilder\Select\Component\MoreLikeThis;
         $request = new \Solarium\Client\Request();

tests/Solarium/Tests/Client/RequestBuilder/Select/Component/SpellcheckTest.php

@@ -34,7 +34,7 @@ namespace Solarium\Tests\Client\RequestBuilder\Select\Component;
 class SpellcheckTest extends \PHPUnit_Framework_TestCase
 {
 
-    public function testBuild()
+    public function testBuildComponent()
     {
         $builder = new \Solarium\Client\RequestBuilder\Select\Component\Spellcheck();
         $request = new \Solarium\Client\Request();

tests/Solarium/Tests/Client/RequestBuilder/Select/Component/StatsTest.php

@@ -34,7 +34,7 @@ namespace Solarium\Tests\Client\RequestBuilder\Select\Component;
 class StatsTest extends \PHPUnit_Framework_TestCase
 {
 
-    public function testBuild()
+    public function testBuildComponent()
     {
         $builder = new \Solarium\Client\RequestBuilder\Select\Component\Stats();
         $request = new \Solarium\Client\Request();

tests/Solarium/Tests/Client/ResponseParser/Analysis/FieldTest.php

@@ -42,6 +42,8 @@ class FieldTest extends \PHPUnit_Framework_TestCase
                     'field1' => array(
                         'type1' => array(
                             array(
+                                'org.apache.solr.analysis.PatternReplaceCharFilter',
+                                'string value',
                                 'analysisClass',
                                 array(
                                     array(
@@ -83,9 +85,11 @@ class FieldTest extends \PHPUnit_Framework_TestCase
         $docs = $result['items'][0]->getItems();
         $fields = $docs[0]->getItems();
         $types = $fields[0]->getItems();
-        $classes = $types[0]->getItems();
+        $class1items = $types[0]->getItems();
+        $class2items = $types[1]->getItems();
 
-        $this->assertEquals('test2', $classes[1]->getText());
+        $this->assertEquals('string value', $class1items[0]->getText());
+        $this->assertEquals('test2', $class2items[1]->getText());
     }
 
     public function testParseNoData()

tests/Solarium/Tests/Plugin/BufferedAddTest.php

+<?php
+/**
+ * Copyright 2011 Bas de Nooijer. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this listof conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation are
+ * those of the authors and should not be interpreted as representing official
+ * policies, either expressed or implied, of the copyright holder.
+ */
+
+namespace Solarium\Tests\Plugin;
+
+class BufferedAddTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var Solarium_Plugin_BufferedAdd
+     */
+    protected $_plugin;
+
+    public function setUp()
+    {
+        $this->_plugin = new \Solarium\Plugin\BufferedAdd();
+        $this->_plugin->init(new \Solarium\Client\Client(), array());
+    }
+
+    public function testSetAndGetBufferSize()
+    {
+        $this->_plugin->setBufferSize(500);
+        $this->assertEquals(500, $this->_plugin->getBufferSize());
+    }
+
+    public function testAddDocument()
+    {
+        $doc = new \Solarium\Document\ReadWrite();
+        $doc->id = '123';
+        $doc->name = 'test';
+
+        $this->_plugin->addDocument($doc);
+
+        $this->assertEquals(array($doc), $this->_plugin->getDocuments());
+    }
+
+    public function testCreateDocument()
+    {
+        $data = array('id' => '123', 'name' => 'test');
+        $doc = new \Solarium\Document\ReadWrite($data);
+
+        $this->_plugin->createDocument($data);
+
+        $this->assertEquals(array($doc), $this->_plugin->getDocuments());
+    }
+
+    public function testAddDocuments()
+    {
+        $doc1 = new \Solarium\Document\ReadWrite();
+        $doc1->id = '123';
+        $doc1->name = 'test';
+
+        $doc2 = new \Solarium\Document\ReadWrite();
+        $doc2->id = '234';
+        $doc2->name = 'test2';
+
+        $docs = array($doc1, $doc2);
+
+        $this->_plugin->addDocuments($docs);
+
+        $this->assertEquals($docs, $this->_plugin->getDocuments());
+    }
+
+    public function testAddDocumentAutoFlush()
+    {
+        $observer = $this->getMock('Solarium\Plugin\BufferedAdd', array('flush'));
+        $observer->expects($this->once())->method('flush');
+        $observer->setBufferSize(1);
+
+        $doc1 = new \Solarium\Document\ReadWrite();
+        $doc1->id = '123';
+        $doc1->name = 'test';
+
+        $doc2 = new \Solarium\Document\ReadWrite();
+        $doc2->id = '234';
+        $doc2->name = 'test2';
+
+        $docs = array($doc1, $doc2);
+
+        $observer->addDocuments($docs);
+    }
+
+    public function testClear()
+    {
+        $doc = new \Solarium\Document\ReadWrite();
+        $doc->id = '123';
+        $doc->name = 'test';
+
+        $this->_plugin->addDocument($doc);
+        $this->_plugin->clear();
+
+        $this->assertEquals(array(), $this->_plugin->getDocuments());
+    }
+
+    public function testFlushEmptyBuffer()
+    {
+        $this->assertEquals(false, $this->_plugin->flush());
+    }
+
+    public function testFlush()
+    {
+        $data = array('id' => '123', 'name' => 'test');
+        $doc = new \Solarium\Document\ReadWrite($data);
+
+        $mockUpdate = $this->getMock('Solarium\Query\Update', array('addDocuments'));
+        $mockUpdate->expects($this->once())->method('addDocuments')->with($this->equalTo(array($doc)),$this->equalTo(true),$this->equalTo(12));
+
+        $mockClient = $this->getMock('Solarium\Client', array('createUpdate', 'update', 'triggerEvent'));
+        $mockClient->expects($this->exactly(2))->method('createUpdate')->will($this->returnValue($mockUpdate));
+        $mockClient->expects($this->once())->method('update')->will($this->returnValue('dummyResult'));
+        $mockClient->expects($this->exactly(2))->method('triggerEvent');
+
+        $plugin = new \Solarium\Plugin\BufferedAdd();
+        $plugin->init($mockClient, array());
+        $plugin->addDocument($doc);
+
+        $this->assertEquals('dummyResult', $plugin->flush(true,12));
+    }
+
+    public function testCommit()
+    {
+        $data = array('id' => '123', 'name' => 'test');
+        $doc = new \Solarium\Document\ReadWrite($data);
+
+        $mockUpdate = $this->getMock('Solarium\Query\Update', array('addDocuments', 'addCommit'));
+        $mockUpdate->expects($this->once())->method('addDocuments')->with($this->equalTo(array($doc)),$this->equalTo(true));
+        $mockUpdate->expects($this->once())->method('addCommit')->with($this->equalTo(false),$this->equalTo(true),$this->equalTo(false));
+
+        $mockClient = $this->getMock('Solarium\Client\Client', array('createUpdate', 'update', 'triggerEvent'));
+        $mockClient->expects($this->exactly(2))->method('createUpdate')->will($this->returnValue($mockUpdate));
+        $mockClient->expects($this->once())->method('update')->will($this->returnValue('dummyResult'));
+        $mockClient->expects($this->exactly(2))->method('triggerEvent');
+
+        $plugin = new \Solarium\Plugin\BufferedAdd();
+        $plugin->init($mockClient, array());
+        $plugin->addDocument($doc);
+
+        $this->assertEquals('dummyResult', $plugin->commit(true, false, true, false));
+    }
+
+}
\ No newline at end of file

tests/Solarium/Tests/Plugin/PrefetchIteratorTest.php

+<?php
+/**
+ * Copyright 2011 Bas de Nooijer. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this listof conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation are
+ * those of the authors and should not be interpreted as representing official
+ * policies, either expressed or implied, of the copyright holder.
+ */
+
+namespace Solarium\Tests\Plugin;
+
+class PrefetchIteratorTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Solarium\Plugin\PrefetchIterator
+     */
+    protected $_plugin;
+
+    /**
+     * @var \Solarium\Client\Client
+     */
+    protected $_client;
+
+    /**
+     * @var \Solarium\Query\Select\Select
+     */
+    protected $_query;
+
+
+    public function setUp()
+    {
+        $this->_plugin = new \Solarium\Plugin\PrefetchIterator();
+
+        $this->_client = new \Solarium\Client\Client();
+        $this->_query = $this->_client->createSelect();
+
+    }
+
+    public function testSetAndGetPrefetch()
+    {
+        $this->_plugin->setPrefetch(120);
+        $this->assertEquals(120, $this->_plugin->getPrefetch());
+    }
+
+    public function testSetAndGetQuery()
+    {
+        $this->_plugin->setQuery($this->_query);
+        $this->assertEquals($this->_query, $this->_plugin->getQuery());
+    }
+
+    public function testCount()
+    {
+        $result = $this->_getResult();
+        $mockClient = $this->getMock('Solarium\Client\Client', array('execute'));
+        $mockClient->expects($this->exactly(1))->method('execute')->will($this->returnValue($result));
+
+        $this->_plugin->init($mockClient, array());
+        $this->_plugin->setQuery($this->_query);
+        $this->assertEquals(5, count($this->_plugin));
+    }
+
+    public function testIteratorAndRewind()
+    {
+        $result = $this->_getResult();
+        $mockClient = $this->getMock('Solarium\Client\Client', array('execute'));
+        $mockClient->expects($this->exactly(1))->method('execute')->will($this->returnValue($result));
+
+        $this->_plugin->init($mockClient, array());
+        $this->_plugin->setQuery($this->_query);
+
+        $results1 = array();
+        foreach($this->_plugin as $doc) {
+            $results1[] = $doc;
+        }
+
+        // the second foreach will trigger a rewind, this time include keys
+        $results2 = array();
+        foreach($this->_plugin as $key => $doc) {
+            $results2[$key] = $doc;
+        }
+
+        $this->assertEquals($result->getDocuments(), $results1);
+        $this->assertEquals($result->getDocuments(), $results2);
+    }
+
+    public function _getResult()
+    {
+        $numFound = 5;
+
+        $docs = array(
+            new \Solarium\Document\ReadOnly(array('id'=>1,'title'=>'doc1')),
+            new \Solarium\Document\ReadOnly(array('id'=>2,'title'=>'doc2')),
+            new \Solarium\Document\ReadOnly(array('id'=>3,'title'=>'doc3')),
+            new \Solarium\Document\ReadOnly(array('id'=>4,'title'=>'doc4')),
+            new \Solarium\Document\ReadOnly(array('id'=>5,'title'=>'doc5')),
+        );
+
+        return new SelectDummy(1, 12, $numFound, $docs, array());
+    }
+}
+
+
+class SelectDummy extends \Solarium\Result\Select\Select
+{
+    protected $_parsed = true;
+
+    public function __construct($status, $queryTime, $numfound, $docs, $components)
+    {
+        $this->_numfound = $numfound;
+        $this->_documents = $docs;
+        $this->_components = $components;
+        $this->_queryTime = $queryTime;
+        $this->_status = $status;
+    }
+
+}
\ No newline at end of file

tests/Solarium/Tests/Query/HelperTest.php

@@ -33,7 +33,15 @@ namespace Solarium\Tests\Query;
 
 class HelperTest extends \PHPUnit_Framework_TestCase
 {
-    protected $_helper, $_query;
+    /**
+     * @var Solarium_Query_Helper
+     */
+    protected $_helper;
+
+    /**
+     * @var Solarium_Query_Select
+     */
+    protected $_query;
 
     public function setUp()
     {
@@ -187,6 +195,83 @@ class HelperTest extends \PHPUnit_Framework_TestCase
         );
     }
 
+    public function testFormatDateInputTimestamp()
+    {
+        $this->assertFalse(
+            $this->_helper->formatDate(strtotime('2011---')),
+            'Expects invalid strtotime/timestamp input (false) not to be accepted'
+        );
+
+        //allow negative dates.
+        $this->assertNotEquals(
+            false,
+            $this->_helper->formatDate(strtotime('2011-10-01')),
+            'Expects negative timestamp input to be accepted'
+        );
+
+        //@todo find out if we need to any test for php versions / platforms which do not support negative timestamp
+
+        $this->assertFalse(
+            $this->_helper->formatDate(strtotime('2010-31-02')),
+            'Expects invalid timestamp input (not in calendar) not to be accepted'
+        );
+
+        $this->assertEquals(
+            $this->_mockFormatDateOutput(strtotime('2011-10-01')),
+            $this->_helper->formatDate(strtotime('2011-10-01')),
+            'Expects formatDate with Timstamp input to output ISO8601 with stripped timezone'
+        );
+    }
+
+    public function testFormatDateInputString()
+    {
+        $this->assertFalse(
+            $this->_helper->formatDate('2011-13-31'),
+            'Expects an invalid date string input not to be accepted'
+        );
+
+        $this->assertEquals(
+            $this->_mockFormatDateOutput(strtotime('2011-10-01')),
+            $this->_helper->formatDate('2011-10-01'),
+            'Expects formatDate with String input to output ISO8601 with stripped timezone'
+        );
+    }
+
+    public function testFormatDateInputDateTime()
+    {
+        date_default_timezone_set("UTC"); // prevent timezone differences
+
+        $this->assertFalse(
+            $this->_helper->formatDate(new \stdClass()),
+            'Expect any other object not to be accepted'
+        );
+
+        $this->assertEquals(
+            $this->_mockFormatDateOutput(strtotime('2011-10-01')),
+            $this->_helper->formatDate(new \DateTime('2011-10-01')),
+            'Expects formatDate with DateTime input to output ISO8601 with stripped timezone'
+        );
+    }
+
+    public function testFormatDate()
+    {
+        //check if timezone is stripped
+        $expected = strtoupper('Z');
+        $actual = substr($this->_helper->formatDate(time()), 19, 20);
+        $this->assertEquals($expected, $actual, 'Expects last charachter to be uppercased Z');
+
+        $this->assertEquals(
+            $this->_mockFormatDateOutput(time()),
+            $this->_helper->formatDate(time())
+        );
+    }
+
+    protected function _mockFormatDateOutput($timestamp)
+    {
+        $date = new \DateTime('@'.$timestamp);
+        return strstr($date->format(\DateTime::ISO8601), '+', true) . 'Z';
+    }
+
     public function testAssemble()
     {
         // test single basic placeholder