Merge branch 'develop' of github.com:solariumphp/solarium into develop

README.md

@@ -50,3 +50,5 @@ http://wiki.solarium-project.org/index.php/V3:Installation#Getting_Solarium
 * Master branch [![Develop build status](https://secure.travis-ci.org/solariumphp/solarium.png?branch=master)](http://travis-ci.org/solariumphp/solarium)
 * Master branch [![Coverage Status](https://coveralls.io/repos/solariumphp/solarium/badge.png?branch=master)](https://coveralls.io/r/solariumphp/solarium?branch=master)
 * [![SensioLabsInsight](https://insight.sensiolabs.com/projects/292e29f7-10a9-4685-b9ac-37925ebef9ae/small.png)](https://insight.sensiolabs.com/projects/292e29f7-10a9-4685-b9ac-37925ebef9ae)
+* [![Total Downloads](https://poser.pugx.org/solarium/solarium/downloads.svg)](https://packagist.org/packages/solarium/solarium)
+

library/Solarium/Support/DataFixtures/Executor.php

@@ -2,7 +2,7 @@
 
 namespace Solarium\Support\DataFixtures;
 
-use Solarium\Core\Client\Client;
+use Solarium\Core\Client\ClientInterface;
 
 /**
  * @author Baldur Rensch <brensch@gmail.com>
@@ -17,9 +17,9 @@ class Executor
     /**
      * Constructor.
      *
-     * @param \Solarium\Core\Client\Client $client
+     * @param \Solarium\Core\Client\ClientInterface $client
      */
-    public function __construct(Client $client)
+    public function __construct(ClientInterface $client)
     {
         $this->client = $client;
     }

library/Solarium/Support/DataFixtures/FixtureInterface.php

@@ -2,7 +2,7 @@
 
 namespace Solarium\Support\DataFixtures;
 
-use Solarium\Core\Client\Client;
+use Solarium\Core\Client\ClientInterface;
 
 /**
  * @author Baldur Rensch <brensch@gmail.com>
@@ -10,7 +10,7 @@ use Solarium\Core\Client\Client;
 interface FixtureInterface
 {
     /**
-     * @param Client $client
+     * @param ClientInterface $client
      */
-    public function load(Client $client);
+    public function load(ClientInterface $client);
 }

library/Solarium/Support/DataFixtures/Purger.php

@@ -2,7 +2,7 @@
 
 namespace Solarium\Support\DataFixtures;
 
-use Solarium\Core\Client\Client;
+use Solarium\Core\Client\ClientInterface;
 
 /**
  * DataFixtures Purger.
@@ -20,9 +20,9 @@ class Purger
     private $deleteQuery = '*:*';
 
     /**
-     * @param Client $client
+     * @param ClientInterface $client
      */
-    public function __construct(Client $client)
+    public function __construct(ClientInterface $client)
     {
         $this->client = $client;
     }

tests/Solarium/Tests/Support/DataFixtures/ExecutorTest.php

@@ -8,7 +8,7 @@ class ExecutorTest extends \PHPUnit_Framework_TestCase
 {
     public function testLoad()
     {
-        $solarium = $this->getMock('Solarium\Core\Client\Client');
+        $solarium = $this->getMock('Solarium\Core\Client\ClientInterface');
 
         $mockFixtures = array(
             $this->getMockFixture($solarium),

tests/Solarium/Tests/Support/DataFixtures/FixtureLoaderTest.php

@@ -35,7 +35,7 @@ class FixtureLoaderTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->client = $this->getMock('Solarium\Core\Client\Client');
+        $this->client = $this->getMock('Solarium\Core\Client\ClientInterface');
         $this->fixturePath = __DIR__ . '/Fixtures/';
     }
 

tests/Solarium/Tests/Support/DataFixtures/Fixtures/MockFixture1.php

@@ -2,7 +2,7 @@
 
 namespace Solarium\Tests\Support\DataFixtures\Fixtures;
 
-use Solarium\Core\Client\Client;
+use Solarium\Core\Client\ClientInterface;
 use Solarium\Support\DataFixtures\FixtureInterface;
 
 class MockFixture1 implements FixtureInterface
@@ -10,7 +10,7 @@ class MockFixture1 implements FixtureInterface
     /**
      * @param Client $client
      */
-    public function load(Client $client)
+    public function load(ClientInterface $client)
     {
         // Not needed in unit test
     }

tests/Solarium/Tests/Support/DataFixtures/Fixtures/MockFixture2.php

@@ -2,7 +2,7 @@
 
 namespace Solarium\Tests\Support\DataFixtures\Fixtures;
 
-use Solarium\Core\Client\Client;
+use Solarium\Core\Client\ClientInterface;
 use Solarium\Support\DataFixtures\FixtureInterface;
 
 class MockFixture2 implements FixtureInterface
@@ -10,7 +10,7 @@ class MockFixture2 implements FixtureInterface
     /**
      * @param Client $client
      */
-    public function load(Client $client)
+    public function load(ClientInterface $client)
     {
         // Not needed in unit test
     }
@@ -21,7 +21,7 @@ class MockFixture3 implements FixtureInterface
     /**
      * @param Client $client
      */
-    public function load(Client $client)
+    public function load(ClientInterface $client)
     {
         // Not needed in unit test
     }

tests/Solarium/Tests/Support/DataFixtures/PurgerTest.php

@@ -8,7 +8,7 @@ class PurgerTest extends \PHPUnit_Framework_TestCase
 {
     public function testPurge()
     {
-        $solarium = $this->getMock('Solarium\Core\Client\Client');
+        $solarium = $this->getMock('Solarium\Core\Client\ClientInterface');
 
         $update = $this->getMock('\Solarium\QueryType\Update\Query\Query');
         $update->expects($this->once())