Updated examples for namespacing

examples/1.1-check-solarium-and-ping.php

@@ -7,7 +7,7 @@ htmlHeader();
 echo 'Solarium library version: ' . Solarium\Version::VERSION . ' - ';
 
 // create a client instance
-$client = new Solarium\Client($config);
+$client = new Solarium\Client\Client($config);
 
 // create a ping query
 $ping = $client->createPing();

examples/1.2-basic-select.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client($config);
+$client = new Solarium\Client\Client($config);
 
 // get a select query instance
 $query = $client->createSelect();
@@ -25,7 +25,7 @@ foreach ($resultset as $document) {
     {
         // this converts multivalue fields to a comma-separated string
         if(is_array($value)) $value = implode(', ', $value);
-        
+
         echo '<tr><th>' . $field . '</th><td>' . $value . '</td></tr>';
     }
 

examples/1.3-basic-update.php

@@ -7,7 +7,7 @@ if ($_POST) {
     // if data is posted add it to solr
 
     // create a client instance
-    $client = new Solarium\Client($config);
+    $client = new Solarium\Client\Client($config);
 
     // get an update query instance
     $update = $client->createUpdate();
@@ -18,7 +18,7 @@ if ($_POST) {
     $doc->id = $_POST['id'];
     $doc->name = $_POST['name'];
     $doc->price = $_POST['price'];
-    
+
     // add the document and a commit command to the update query
     $update->addDocument($doc);
     $update->addCommit();

examples/2.1.1-query-params.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client($config);
+$client = new Solarium\Client\Client($config);
 
 // get a select query instance
 $query = $client->createSelect();
@@ -19,7 +19,7 @@ $query->setStart(2)->setRows(20);
 $query->setFields(array('id','name','price'));
 
 // sort the results by price ascending
-$query->addSort('price', Solarium\Query\Select::SORT_ASC);
+$query->addSort('price', Solarium\Query\Select\Select::SORT_ASC);
 
 // this executes the query and returns the result
 $resultset = $client->select($query);
@@ -37,7 +37,7 @@ foreach ($resultset as $document) {
     {
         // this converts multivalue fields to a comma-separated string
         if(is_array($value)) $value = implode(', ', $value);
-        
+
         echo '<tr><th>' . $field . '</th><td>' . $value . '</td></tr>';
     }
 

examples/2.1.2-custom-result-document.php

@@ -16,7 +16,7 @@ class myDoc extends Solarium\Document\ReadOnly{
 
 
 // create a client instance
-$client = new Solarium\Client($config);
+$client = new Solarium\Client\Client($config);
 
 // get a select query instance
 $query = $client->createSelect();

examples/2.1.3-filterquery.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client($config);
+$client = new Solarium\Client\Client($config);
 
 // get a select query instance
 $query = $client->createSelect();

examples/2.1.5.1.1-facet-field.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client($config);
+$client = new Solarium\Client\Client($config);
 
 // get a select query instance
 $query = $client->createSelect();

examples/2.1.5.1.2-facet-query.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client($config);
+$client = new Solarium\Client\Client($config);
 
 // get a select query instance
 $query = $client->createSelect();

examples/2.1.5.1.3-facet-multiquery.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client($config);
+$client = new Solarium\Client\Client($config);
 
 // get a select query instance
 $query = $client->createSelect();

examples/2.1.5.1.4-facet-range.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client($config);
+$client = new Solarium\Client\Client($config);
 
 // get a select query instance
 $query = $client->createSelect();

examples/2.1.5.10-stats.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client($config);
+$client = new Solarium\Client\Client($config);
 
 // get a select query instance
 $query = $client->createSelect();

examples/2.1.5.11-debug.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client($config);
+$client = new Solarium\Client\Client($config);
 
 // get a select query instance
 $query = $client->createSelect();

examples/2.1.5.2-morelikethis.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client($config);
+$client = new Solarium\Client\Client($config);
 
 // get a select query instance
 $query = $client->createSelect();
@@ -33,7 +33,7 @@ foreach ($resultset as $document) {
     {
         // this converts multivalue fields to a comma-separated string
         if(is_array($value)) $value = implode(', ', $value);
-        
+
         echo '<tr><th>' . $field . '</th><td>' . $value . '</td></tr>';
     }
 

examples/2.1.5.3-highlighting.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client($config);
+$client = new Solarium\Client\Client($config);
 
 // get a select query instance
 $query = $client->createSelect();
@@ -32,7 +32,7 @@ foreach ($resultset as $document) {
     {
         // this converts multivalue fields to a comma-separated string
         if(is_array($value)) $value = implode(', ', $value);
-        
+
         echo '<tr><th>' . $field . '</th><td>' . $value . '</td></tr>';
     }
 

examples/2.1.5.3.1-per-field-highlighting.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client($config);
+$client = new Solarium\Client\Client($config);
 
 // get a select query instance
 $query = $client->createSelect();

examples/2.1.5.4-dismax.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client($config);
+$client = new Solarium\Client\Client($config);
 
 // get a select query instance
 $query = $client->createSelect();
@@ -32,7 +32,7 @@ foreach ($resultset as $document) {
     {
         // this converts multivalue fields to a comma-separated string
         if(is_array($value)) $value = implode(', ', $value);
-        
+
         echo '<tr><th>' . $field . '</th><td>' . $value . '</td></tr>';
     }
 

examples/2.1.5.5-edismax.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client($config);
+$client = new Solarium\Client\Client($config);
 
 // get a select query instance
 $query = $client->createSelect();
@@ -34,7 +34,7 @@ foreach ($resultset as $document) {
     {
         // this converts multivalue fields to a comma-separated string
         if(is_array($value)) $value = implode(', ', $value);
-        
+
         echo '<tr><th>' . $field . '</th><td>' . $value . '</td></tr>';
     }
 

examples/2.1.5.6-grouping-by-field.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client($config);
+$client = new Solarium\Client\Client($config);
 
 // get a select query instance
 $query = $client->createSelect();
@@ -33,7 +33,7 @@ foreach($groups AS $groupKey => $fieldGroup) {
         echo '<h2>'.(int)$valueGroup->getValue().'</h2>';
 
         foreach($valueGroup AS $document) {
-            
+
             echo '<hr/><table>';
 
             // the documents are also iterable, to get all fields

examples/2.1.5.7-grouping-by-query.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client($config);
+$client = new Solarium\Client\Client($config);
 
 // get a select query instance
 $query = $client->createSelect();

examples/2.1.5.8-distributed-search.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client($config);
+$client = new Solarium\Client\Client($config);
 
 // get a select query instance
 $query = $client->createSelect();

examples/2.1.5.9-spellcheck.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client($config);
+$client = new Solarium\Client\Client($config);
 
 // get a select query instance
 $query = $client->createSelect();

examples/2.1.6-helper-functions.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client($config);
+$client = new Solarium\Client\Client($config);
 
 // get a select query instance and a query helper instance
 $query = $client->createSelect();

examples/2.1.7-query-reuse.php

@@ -4,11 +4,11 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client($config);
+$client = new Solarium\Client\Client($config);
 
 
 // first create a base query as a query class
-class PriceQuery extends Solarium\Query\Select
+class PriceQuery extends Solarium\Query\Select\Select
 {
     protected function _init()
     {

examples/2.2.1-add-docs.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client($config);
+$client = new Solarium\Client\Client($config);
 
 // get an update query instance
 $update = $client->createUpdate();

examples/2.2.2-delete-by-query.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client($config);
+$client = new Solarium\Client\Client($config);
 
 // get an update query instance
 $update = $client->createUpdate();

examples/2.2.3-delete-by-id.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client($config);
+$client = new Solarium\Client\Client($config);
 
 // get an update query instance
 $update = $client->createUpdate();

examples/2.2.4-optimize.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client($config);
+$client = new Solarium\Client\Client($config);
 
 // get an update query instance
 $update = $client->createUpdate();

examples/2.2.5-rollback.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client($config);
+$client = new Solarium\Client\Client($config);
 
 // get an update query instance
 $update = $client->createUpdate();

examples/2.3.1-mlt-query.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client($config);
+$client = new Solarium\Client\Client($config);
 
 // get a morelikethis query instance
 $query = $client->createMoreLikeThis();
@@ -44,7 +44,7 @@ foreach ($resultset as $document) {
     {
         // this converts multivalue fields to a comma-separated string
         if(is_array($value)) $value = implode(', ', $value);
-        
+
         echo '<tr><th>' . $field . '</th><td>' . $value . '</td></tr>';
     }
 

examples/2.3.2-mlt-stream.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client($config);
+$client = new Solarium\Client\Client($config);
 
 // get a morelikethis query instance
 $query = $client->createMoreLikeThis();
@@ -45,7 +45,7 @@ foreach ($resultset as $document) {
     {
         // this converts multivalue fields to a comma-separated string
         if(is_array($value)) $value = implode(', ', $value);
-        
+
         echo '<tr><th>' . $field . '</th><td>' . $value . '</td></tr>';
     }
 

examples/2.4.1-analysis-document.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client($config);
+$client = new Solarium\Client\Client($config);
 
 // get an analysis document query
 $query = $client->createAnalysisDocument();

examples/2.4.2-analysis-field.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client($config);
+$client = new Solarium\Client\Client($config);
 
 // get an analysis document query
 $query = $client->createAnalysisField();

examples/2.5-terms-query.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client($config);
+$client = new Solarium\Client\Client($config);
 
 // get a terms query instance
 $query = $client->createTerms();

examples/4.1-api-usage.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client($config);
+$client = new Solarium\Client\Client($config);
 
 // get a select query instance
 $query = $client->createSelect();
@@ -13,7 +13,7 @@ $query = $client->createSelect();
 $query->setQuery('*:*');
 $query->setStart(2)->setRows(20);
 $query->setFields(array('id','name','price'));
-$query->addSort('price', Solarium\Query\Select::SORT_ASC);
+$query->addSort('price', Solarium\Query\Select\Select::SORT_ASC);
 
 // create a filterquery using the API
 $fq = $query->createFilterQuery('maxprice')->setQuery('price:[1 TO 300]');

examples/4.2-configuration-usage.php

@@ -29,7 +29,7 @@ $select = array(
 );
 
 // create a client instance
-$client = new Solarium\Client($config);
+$client = new Solarium\Client\Client($config);
 
 // get a select query instance based on the config
 $query = $client->createSelect($select);

examples/4.3-extending-usage.php

@@ -39,7 +39,7 @@ class ProductPriceLimitedQuery extends ProductQuery{
 }
 
 // create a client instance
-$client = new Solarium\Client($config);
+$client = new Solarium\Client\Client($config);
 
 // create a query instance
 $query = new ProductPriceLimitedQuery;

examples/5.1-partial-usage.php

@@ -10,7 +10,7 @@ htmlHeader();
 
 
 // create a client instance
-$client = new Solarium\Client($config);
+$client = new Solarium\Client\Client($config);
 
 // create a select query instance
 $query = $client->createSelect();
@@ -41,7 +41,7 @@ foreach ($result as $document) {
     {
         // this converts multivalue fields to a comma-separated string
         if(is_array($value)) $value = implode(', ', $value);
-        
+
         echo '<tr><th>' . $field . '</th><td>' . $value . '</td></tr>';
     }
 

examples/5.2-extending.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // This is a custom query class that could have some customized logic
-class MyQuery extends Solarium\Query\Select
+class MyQuery extends Solarium\Query\Select\Select
 {
     // ...customization here...
 }
@@ -12,7 +12,7 @@ class MyQuery extends Solarium\Query\Select
 // And this is the extended client, that modifies the default query mapping
 // for select queries to our custom query class.
 // BTW, the same could also be done using a plugin, see example 5.3.2
-class MyClient extends Solarium\Client
+class MyClient extends Solarium\Client\Client
 {
      /**
      * Querytype mappings
@@ -20,8 +20,8 @@ class MyClient extends Solarium\Client
     protected $_queryTypes = array(
         self::QUERYTYPE_SELECT => array(
             'query'          => 'MyQuery',
-            'requestbuilder' => 'Solarium\Client\RequestBuilder\Select',
-            'responseparser' => 'Solarium\Client\ResponseParser\Select'
+            'requestbuilder' => 'Solarium\Client\RequestBuilder\Select\Select',
+            'responseparser' => 'Solarium\Client\ResponseParser\Select\Select'
         ),
         self::QUERYTYPE_UPDATE => array(
             'query'          => 'Solarium\Query\Update',
@@ -62,7 +62,7 @@ foreach ($result as $document) {
     {
         // this converts multivalue fields to a comma-separated string
         if(is_array($value)) $value = implode(', ', $value);
-        
+
         echo '<tr><th>' . $field . '</th><td>' . $value . '</td></tr>';
     }
 

examples/5.3.1-plugin-event-hooks.php

@@ -3,7 +3,7 @@ require('init.php');
 
 
 // this very simple plugin shows a timing for each event and display some request debug info
-class basicDebug extends Solarium\PluginAbstractPlugin
+class basicDebug extends Solarium\Plugin\AbstractPlugin
 {
 
     protected $_start;
@@ -90,7 +90,7 @@ htmlHeader();
 
 // create a client instance and register the plugin
 $plugin = new basicDebug();
-$client = new Solarium\Client($config);
+$client = new Solarium\Client\Client($config);
 $client->registerPlugin('debugger', $plugin);
 
 // execute a select query and display the results

examples/5.3.2-plugin-solarium-presets.php

@@ -2,32 +2,32 @@
 require('init.php');
 
 // This is a custom query class that could have some customized logic
-class MyQuery extends Solarium\Query\Select
+class MyQuery extends Solarium\Query\Select\Select
 {
     // ...customization here...
 }
 
 // this very simple plugin that modifies the default querytype mapping
-class queryCustomizer extends Solarium\PluginAbstractPlugin
+class queryCustomizer extends Solarium\Plugin\AbstractPlugin
 {
 
     protected function _initPlugin()
     {
         $this->_client->registerQueryType(
-            Solarium\Client::QUERYTYPE_SELECT,
+            Solarium\Client\Client::QUERYTYPE_SELECT,
             'MyQuery',
-            'Solarium\Client\RequestBuilder\Select',
-            'Solarium\Client\ResponseParser\Select'
+            'Solarium\Client\RequestBuilder\Select\Select',
+            'Solarium\Client\ResponseParser\Select\Select'
         );
     }
-    
+
 }
 
 
 htmlHeader();
 
 // create a client instance and register the plugin
-$client = new Solarium\Client($config);
+$client = new Solarium\Client\Client($config);
 $client->registerPlugin('querycustomizer', 'queryCustomizer');
 
 // create a select query instance

examples/6.1.1-zend-http-adapter.php

@@ -7,7 +7,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client($config);
+$client = new Solarium\Client\Client($config);
 
 // set the adapter to zendhttp and get a zendhttp client instance reference
 $client->setAdapter('Solarium\Client\Adapter\ZendHttp');
@@ -35,7 +35,7 @@ foreach ($resultset as $document) {
     {
         // this converts multivalue fields to a comma-separated string
         if(is_array($value)) $value = implode(', ', $value);
-        
+
         echo '<tr><th>' . $field . '</th><td>' . $value . '</td></tr>';
     }
 

examples/6.1.2-pecl-http-adapter.php

@@ -7,7 +7,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client($config);
+$client = new Solarium\Client\Client($config);
 
 // set the adapter to peclhttp
 $client->setAdapter('Solarium\Client\Adapter\PeclHttp');
@@ -31,7 +31,7 @@ foreach ($resultset as $document) {
     {
         // this converts multivalue fields to a comma-separated string
         if(is_array($value)) $value = implode(', ', $value);
-        
+
         echo '<tr><th>' . $field . '</th><td>' . $value . '</td></tr>';
     }
 

examples/6.1.3-curl-adapter.php

@@ -7,7 +7,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client($config);
+$client = new Solarium\Client\Client($config);
 
 // set the adapter to curl
 $client->setAdapter('Solarium\Client\Adapter\Curl');

examples/6.2-escaping.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client($config);
+$client = new Solarium\Client\Client($config);
 
 // get a select query instance
 $query = $client->createSelect();
@@ -33,7 +33,7 @@ foreach ($resultset as $document) {
     {
         // this converts multivalue fields to a comma-separated string
         if(is_array($value)) $value = implode(', ', $value);
-        
+
         echo '<tr><th>' . $field . '</th><td>' . $value . '</td></tr>';
     }
 

examples/6.3-placeholder-syntax.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance
-$client = new Solarium\Client($config);
+$client = new Solarium\Client\Client($config);
 
 // get a select query instance
 $query = $client->createSelect();
@@ -35,7 +35,7 @@ foreach ($resultset as $document) {
     {
         // this converts multivalue fields to a comma-separated string
         if(is_array($value)) $value = implode(', ', $value);
-        
+
         echo '<tr><th>' . $field . '</th><td>' . $value . '</td></tr>';
     }
 

examples/7.1-plugin-loadbalancer.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance and get loadbalancer plugin instance
-$client = new Solarium\Client($config);
+$client = new Solarium\Client\Client($config);
 $loadbalancer = $client->getPlugin('loadbalancer');
 
 // apply loadbalancer settings
@@ -39,7 +39,7 @@ echo 'Loadbalanced ping query, should display a loadbalancing server:<br/>';
 echo 'Ping server: ' . $loadbalancer->getLastServerKey() .'<hr/>';
 
 // exclude ping query from loadbalancing
-$loadbalancer->addBlockedQueryType(Solarium\Client::QUERYTYPE_PING);
+$loadbalancer->addBlockedQueryType(Solarium\Client\Client::QUERYTYPE_PING);
 $client->ping($query);
 echo 'Non-loadbalanced ping query, should not display a loadbalancing server:<br/>';
 echo 'Ping server: ' . $loadbalancer->getLastServerKey() .'<hr/>';

examples/7.2-plugin-postbigrequest.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance and autoload the postbigrequest plugin
-$client = new Solarium\Client($config);
+$client = new Solarium\Client\Client($config);
 $client->getPlugin('postbigrequest');
 
 // create a basic query to execute

examples/7.3-plugin-customizerequest.php

@@ -4,7 +4,7 @@ require('init.php');
 htmlHeader();
 
 // create a client instance and autoload the customize request plugin
-$client = new Solarium\Client($config);
+$client = new Solarium\Client\Client($config);
 $customizer = $client->getPlugin('customizerequest');
 
 // add a persistent HTTP header (using array input values)