Merge pull request solariumphp#362 from chadicus/fea/ClientInterface

[WIP] Fea/client interface
mulligaj · Nov 1, 2015 · 2bb12fb · 2bb12fb
2 parents 4d4207e + 21f1799
commit 2bb12fb
Show file tree

Hide file tree

Showing 9 changed files with 567 additions and 17 deletions.
diff --git a/library/Solarium/Core/Client/ClientInterface.php b/library/Solarium/Core/Client/ClientInterface.php
diff --git a/library/Solarium/Support/DataFixtures/Executor.php b/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 <[email protected]>
@@ -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;
     }

diff --git a/library/Solarium/Support/DataFixtures/FixtureInterface.php b/library/Solarium/Support/DataFixtures/FixtureInterface.php
@@ -2,15 +2,15 @@
 
 namespace Solarium\Support\DataFixtures;
 
-use Solarium\Core\Client\Client;
+use Solarium\Core\Client\ClientInterface;
 
 /**
  * @author Baldur Rensch <[email protected]>
  */
 interface FixtureInterface
 {
     /**
-     * @param Client $client
+     * @param ClientInterface $client
      */
-    public function load(Client $client);
+    public function load(ClientInterface $client);
 }
diff --git a/library/Solarium/Support/DataFixtures/Purger.php b/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;
     }

diff --git a/tests/Solarium/Tests/Support/DataFixtures/ExecutorTest.php b/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),

diff --git a/tests/Solarium/Tests/Support/DataFixtures/FixtureLoaderTest.php b/tests/Solarium/Tests/Support/DataFixtures/FixtureLoaderTest.php
@@ -35,7 +35,7 @@ public function testWithPurging()
 
     protected function setUp()
     {
-        $this->client = $this->getMock('Solarium\Core\Client\Client');
+        $this->client = $this->getMock('Solarium\Core\Client\ClientInterface');
         $this->fixturePath = __DIR__ . '/Fixtures/';
     }
 

diff --git a/tests/Solarium/Tests/Support/DataFixtures/Fixtures/MockFixture1.php b/tests/Solarium/Tests/Support/DataFixtures/Fixtures/MockFixture1.php
@@ -2,15 +2,15 @@
 
 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
 {
     /**
      * @param Client $client
      */
-    public function load(Client $client)
+    public function load(ClientInterface $client)
     {
         // Not needed in unit test
     }

diff --git a/tests/Solarium/Tests/Support/DataFixtures/Fixtures/MockFixture2.php b/tests/Solarium/Tests/Support/DataFixtures/Fixtures/MockFixture2.php
@@ -2,15 +2,15 @@
 
 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
 {
     /**
      * @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
     }

diff --git a/tests/Solarium/Tests/Support/DataFixtures/PurgerTest.php b/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())