Fixed examples

examples/2.1.5.9-spellcheck.php

@@ -22,7 +22,6 @@ $spellcheck->setCollateExtendedResults(true);
 $resultset = $client->select($query);
 $spellcheckResult = $resultset->getSpellcheck();
 
-
 echo '<h1>Correctly spelled?</h1>';
 if ($spellcheckResult->getCorrectlySpelled()) {
     echo 'yes';

examples/2.4.1-analysis-document.php

@@ -12,7 +12,7 @@ $query = $client->createAnalysisDocument();
 $query->setShowMatch(true);
 $query->setQuery('ipod');
 
-$doc = new Solarium\Document\ReadWrite(
+$doc = new Solarium\Query\Update\Query\Document(
     array(
         'id' => 'MA147LL',
         'name' => 'Apple 60 GB iPod with Video Playback Black',

examples/4.3-extending-usage.php

@@ -10,9 +10,9 @@ htmlHeader();
 // This makes it possible to create 'query inheritance' like in this example
 class ProductQuery extends Select{
 
-    protected function _init()
+    protected function init()
     {
-        parent::_init();
+        parent::init();
 
         // basic params
         $this->setQuery('*:*');

examples/5.3.1-plugin-event-hooks.php

@@ -9,7 +9,7 @@ class basicDebug extends Solarium\Core\Plugin
     protected $start;
     protected $output = array();
 
-    public function initPlugin()
+    public function initPlugin($client, $options)
     {
         $this->start = microtime(true);
     }
@@ -26,12 +26,12 @@ class basicDebug extends Solarium\Core\Plugin
         echo implode('<br/>', $this->output);
     }
 
-    public function preCreateRequest()
+    public function preCreateRequest($query)
     {
         $this->timer('preCreateRequest');
     }
 
-    public function postCreateRequest()
+    public function postCreateRequest($query, $request)
     {
         $this->timer('postCreateRequest');
     }
@@ -48,37 +48,37 @@ class basicDebug extends Solarium\Core\Plugin
         $this->output[] = 'Request URI: ' . $request->getUri();
     }
 
-    public function postExecuteRequest()
+    public function postExecuteRequest($request, $response)
     {
         $this->timer('postExecuteRequest');
     }
 
-    public function preCreateResult()
+    public function preCreateResult($query, $response)
     {
         $this->timer('preCreateResult');
     }
 
-    public function postCreateResult()
+    public function postCreateResult($query, $response, $result)
     {
         $this->timer('postCreateResult');
     }
 
-    public function preExecute()
+    public function preExecute($query)
     {
         $this->timer('preExecute');
     }
 
-    public function postExecute()
+    public function postExecute($query, $result)
     {
         $this->timer('postExecute');
     }
 
-    public function preCreateQuery()
+    public function preCreateQuery($type, $options)
     {
         $this->timer('preCreateResult');
     }
 
-    public function postCreateQuery()
+    public function postCreateQuery($type, $options, $query)
     {
         $this->timer('postCreateResult');
     }

examples/5.3.2-plugin-solarium-presets.php

 <?php
 require('init.php');
 use Solarium\Client;
-use Solarium\Plugin\AbstractPlugin;
+use Solarium\Core\Plugin;
 use Solarium\Query\Select\Query\Query as Select;
 
 // This is a custom query class that could have some customized logic
@@ -11,12 +11,12 @@ class MyQuery extends Select
 }
 
 // this very simple plugin that modifies the default querytype mapping
-class queryCustomizer extends AbstractPlugin
+class queryCustomizer extends Plugin
 {
 
-    protected function _initPlugin()
+    public function initPlugin($client, $options)
     {
-        $this->_client->registerQueryType(
+        $client->registerQueryType(
             Client::QUERY_SELECT,
             'MyQuery',
             'Solarium\Query\Select\RequestBuilder\RequestBuilder',

examples/6.1.1-zend-http-adapter.php

@@ -10,7 +10,7 @@ htmlHeader();
 $client = new Solarium\Client($config);
 
 // set the adapter to zendhttp and get a zendhttp client instance reference
-$client->setAdapter('Solarium\Client\Adapter\ZendHttp');
+$client->setAdapter('Solarium\Core\Client\Adapter\ZendHttp');
 $zendHttp = $client->getAdapter()->getZendHttp();
 
 // you can use any of the zend_http features, like http-authentication

examples/6.1.2-pecl-http-adapter.php

@@ -10,7 +10,7 @@ htmlHeader();
 $client = new Solarium\Client($config);
 
 // set the adapter to peclhttp
-$client->setAdapter('Solarium\Client\Adapter\PeclHttp');
+$client->setAdapter('Solarium\Core\Client\Adapter\PeclHttp');
 
 // get a select query instance
 $query = $client->createSelect();

examples/6.1.3-curl-adapter.php

@@ -10,7 +10,7 @@ htmlHeader();
 $client = new Solarium\Client($config);
 
 // set the adapter to curl
-$client->setAdapter('Solarium\Client\Adapter\Curl');
+$client->setAdapter('Solarium\Core\Client\Adapter\Curl');
 
 // get a select query instance
 $query = $client->createSelect();

examples/7.5-plugin-bufferedadd.php

@@ -2,8 +2,9 @@
 require('init.php');
 
 // this very simple plugin is used to show some events
-class simpleDebug extends \Solarium\Plugin\AbstractPlugin
+class simpleDebug extends Solarium\Core\Plugin
 {
+
     protected $_output = array();
 
     public function display()

library/Solarium/Plugin/ParallelExecution.php

@@ -83,7 +83,7 @@ class ParallelExecution extends Plugin
      */
     protected function initPluginType()
     {
-        $this->client->setAdapter('Solarium\Client\Adapter\Curl');
+        $this->client->setAdapter('Solarium\Core\Client\Adapter\Curl');
     }
 
     /**