Use Interfaces anywhere.

In practice, there were still too many concrete classes, which makes
integration into a framework hard. To overcome this, the codebase has
been refactored to use Interfaces when a resource is needed.

All necessary Interfaces have been created, and the existing concrete
classes now implement these interfaces.
This commit is contained in:
Jacob Kiers
2013-02-11 14:02:14 +00:00
parent 4e6cc6c811
commit 8bd355f556
23 changed files with 514 additions and 324 deletions

View File

@@ -1,7 +1,7 @@
<?php
use Mockery as m;
use JacobKiers\OAuth\SignatureMethod;
use JacobKiers\OAuth\SignatureMethod\SignatureMethod;
/**
* Create concrete class from abstract SignatureMethod.
@@ -14,9 +14,9 @@ public function getName() {
}
public function buildSignature(
\JacobKiers\OAuth\RequestInterface $request,
\JacobKiers\OAuth\Client $client,
\JacobKiers\OAuth\Token $token = null
\JacobKiers\OAuth\Request\RequestInterface $request,
\JacobKiers\OAuth\Consumer\ConsumerInterface $consumer,
\JacobKiers\OAuth\Token\TokenInterface $token = null
) {
}
}
@@ -34,10 +34,10 @@ public function testGetSignatureKeyWithoutToken()
$signature_method = $this->getSignatureMethod();
// Get mock objects
$client = $this->getClient();
$consumer = $this->getConsumer();
// Run method being tested
$signature_key = $signature_method->getSignatureKey($client);
$signature_key = $signature_method->getSignatureKey($consumer);
// Check results
$this->assertEquals('secret&', $signature_key);
@@ -49,11 +49,11 @@ public function testGetSignatureKeyWithToken()
$signature_method = $this->getSignatureMethod();
// Get mock objects
$client = $this->getClient();
$consumer = $this->getConsumer();
$token = $this->getToken();
// Run method being tested
$signature_key = $signature_method->getSignatureKey($client, $token);
$signature_key = $signature_method->getSignatureKey($consumer, $token);
// Check results
$this->assertEquals('secret&token_secret', $signature_key);
@@ -64,16 +64,16 @@ private function getSignatureMethod()
return new FooBarSignatureMethod;
}
private function getClient()
private function getConsumer()
{
return m::mock('JacobKiers\OAuth\Client', function ($mock) {
return m::mock('JacobKiers\OAuth\Consumer\Consumer', function ($mock) {
$mock->shouldReceive('getSecret')->withNoArgs()->andReturn('secret')->once();
});
}
private function getToken()
{
return m::mock('JacobKiers\OAuth\Token', function ($mock) {
return m::mock('JacobKiers\OAuth\Token\Token', function ($mock) {
$mock->shouldReceive('getSecret')->withNoArgs()->andReturn('token_secret');
});
}