Commit 2bb12fb1 authored by Bas de Nooijer's avatar Bas de Nooijer

Merge pull request #362 from chadicus/fea/ClientInterface

[WIP] Fea/client interface
parents 4d4207e2 21f1799f
This diff is collapsed.
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
namespace Solarium\Support\DataFixtures; namespace Solarium\Support\DataFixtures;
use Solarium\Core\Client\Client; use Solarium\Core\Client\ClientInterface;
/** /**
* @author Baldur Rensch <brensch@gmail.com> * @author Baldur Rensch <brensch@gmail.com>
...@@ -17,9 +17,9 @@ class Executor ...@@ -17,9 +17,9 @@ class Executor
/** /**
* Constructor. * 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; $this->client = $client;
} }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
namespace Solarium\Support\DataFixtures; namespace Solarium\Support\DataFixtures;
use Solarium\Core\Client\Client; use Solarium\Core\Client\ClientInterface;
/** /**
* @author Baldur Rensch <brensch@gmail.com> * @author Baldur Rensch <brensch@gmail.com>
...@@ -10,7 +10,7 @@ use Solarium\Core\Client\Client; ...@@ -10,7 +10,7 @@ use Solarium\Core\Client\Client;
interface FixtureInterface interface FixtureInterface
{ {
/** /**
* @param Client $client * @param ClientInterface $client
*/ */
public function load(Client $client); public function load(ClientInterface $client);
} }
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
namespace Solarium\Support\DataFixtures; namespace Solarium\Support\DataFixtures;
use Solarium\Core\Client\Client; use Solarium\Core\Client\ClientInterface;
/** /**
* DataFixtures Purger. * DataFixtures Purger.
...@@ -20,9 +20,9 @@ class Purger ...@@ -20,9 +20,9 @@ class Purger
private $deleteQuery = '*:*'; private $deleteQuery = '*:*';
/** /**
* @param Client $client * @param ClientInterface $client
*/ */
public function __construct(Client $client) public function __construct(ClientInterface $client)
{ {
$this->client = $client; $this->client = $client;
} }
......
...@@ -8,7 +8,7 @@ class ExecutorTest extends \PHPUnit_Framework_TestCase ...@@ -8,7 +8,7 @@ class ExecutorTest extends \PHPUnit_Framework_TestCase
{ {
public function testLoad() public function testLoad()
{ {
$solarium = $this->getMock('Solarium\Core\Client\Client'); $solarium = $this->getMock('Solarium\Core\Client\ClientInterface');
$mockFixtures = array( $mockFixtures = array(
$this->getMockFixture($solarium), $this->getMockFixture($solarium),
......
...@@ -35,7 +35,7 @@ class FixtureLoaderTest extends \PHPUnit_Framework_TestCase ...@@ -35,7 +35,7 @@ class FixtureLoaderTest extends \PHPUnit_Framework_TestCase
protected function setUp() protected function setUp()
{ {
$this->client = $this->getMock('Solarium\Core\Client\Client'); $this->client = $this->getMock('Solarium\Core\Client\ClientInterface');
$this->fixturePath = __DIR__ . '/Fixtures/'; $this->fixturePath = __DIR__ . '/Fixtures/';
} }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
namespace Solarium\Tests\Support\DataFixtures\Fixtures; namespace Solarium\Tests\Support\DataFixtures\Fixtures;
use Solarium\Core\Client\Client; use Solarium\Core\Client\ClientInterface;
use Solarium\Support\DataFixtures\FixtureInterface; use Solarium\Support\DataFixtures\FixtureInterface;
class MockFixture1 implements FixtureInterface class MockFixture1 implements FixtureInterface
...@@ -10,7 +10,7 @@ class MockFixture1 implements FixtureInterface ...@@ -10,7 +10,7 @@ class MockFixture1 implements FixtureInterface
/** /**
* @param Client $client * @param Client $client
*/ */
public function load(Client $client) public function load(ClientInterface $client)
{ {
// Not needed in unit test // Not needed in unit test
} }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
namespace Solarium\Tests\Support\DataFixtures\Fixtures; namespace Solarium\Tests\Support\DataFixtures\Fixtures;
use Solarium\Core\Client\Client; use Solarium\Core\Client\ClientInterface;
use Solarium\Support\DataFixtures\FixtureInterface; use Solarium\Support\DataFixtures\FixtureInterface;
class MockFixture2 implements FixtureInterface class MockFixture2 implements FixtureInterface
...@@ -10,7 +10,7 @@ class MockFixture2 implements FixtureInterface ...@@ -10,7 +10,7 @@ class MockFixture2 implements FixtureInterface
/** /**
* @param Client $client * @param Client $client
*/ */
public function load(Client $client) public function load(ClientInterface $client)
{ {
// Not needed in unit test // Not needed in unit test
} }
...@@ -21,7 +21,7 @@ class MockFixture3 implements FixtureInterface ...@@ -21,7 +21,7 @@ class MockFixture3 implements FixtureInterface
/** /**
* @param Client $client * @param Client $client
*/ */
public function load(Client $client) public function load(ClientInterface $client)
{ {
// Not needed in unit test // Not needed in unit test
} }
......
...@@ -8,7 +8,7 @@ class PurgerTest extends \PHPUnit_Framework_TestCase ...@@ -8,7 +8,7 @@ class PurgerTest extends \PHPUnit_Framework_TestCase
{ {
public function testPurge() 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 = $this->getMock('\Solarium\QueryType\Update\Query\Query');
$update->expects($this->once()) $update->expects($this->once())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment