Skip to content

Commit

Permalink
moved payload & representation creators to implementations
Browse files Browse the repository at this point in the history
  • Loading branch information
AndyWendt committed Jun 6, 2016
1 parent 78e059d commit 8518ce7
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 191 deletions.
8 changes: 4 additions & 4 deletions spec/Factory/VersionFactorySpec.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

use Illuminate\Contracts\Container\Container as App;
use LaraPackage\Api\Contracts\Request\Payload;
use LaraPackage\Api\PayloadCreator;
use LaraPackage\Api\RepresentationCreator;
use LaraPackage\Api\Implementations\PayloadCreator;
use LaraPackage\Api\Implementations\RepresentationCreator;
use PhpSpec\ObjectBehavior;
use Prophecy\Argument;

Expand All @@ -29,13 +29,13 @@ function it_makes_a_media_type()

function it_makes_a_payload_creator(App $app, PayloadCreator $payloadCreator)
{
$app->make(\LaraPackage\Api\PayloadCreator::class)->shouldBeCalled()->willReturn($payloadCreator);
$app->make(\LaraPackage\Api\Implementations\PayloadCreator::class)->shouldBeCalled()->willReturn($payloadCreator);
$this->makePayloadCreator()->shouldReturn($payloadCreator);
}

function it_makes_a_representation_creator(App $app, RepresentationCreator $responseCreator)
{
$app->make(\LaraPackage\Api\RepresentationCreator::class)->shouldBeCalled()->willReturn($responseCreator);
$app->make(\LaraPackage\Api\Implementations\RepresentationCreator::class)->shouldBeCalled()->willReturn($responseCreator);
$this->makeRepresentationCreator()->shouldReturn($responseCreator);
}

Expand Down
2 changes: 1 addition & 1 deletion spec/PayloadCreatorSpec.php
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ function it_builds_an_entity_resource(

function it_is_initializable()
{
$this->shouldHaveType('LaraPackage\Api\PayloadCreator');
$this->shouldHaveType('LaraPackage\Api\Implementations\PayloadCreator');
}

function it_returns_an_empty_collection_for_no_results(
Expand Down
2 changes: 1 addition & 1 deletion spec/RepresentationCreatorSpec.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class RepresentationCreatorSpec extends ObjectBehavior

function it_is_initializable()
{
$this->shouldHaveType('LaraPackage\Api\RepresentationCreator');
$this->shouldHaveType('LaraPackage\Api\Implementations\RepresentationCreator');
}

function it_makes_a_response(
Expand Down
11 changes: 4 additions & 7 deletions src/Implementations/PayloadCreator.php
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
<?php
namespace LaraPackage\Api\Implementations;

use InvalidArgumentException;
use LaraPackage\Api\Contracts\Factory\VersionFactory;
use LaraPackage\Api\Contracts\Request\Parser;
use LaraPackage\Api\Exceptions\InvalidArgumentException;
use LaraPackage\Api\FractalFactory;
use League\Fractal;

Expand All @@ -17,21 +15,20 @@ class PayloadCreator implements \LaraPackage\Api\Contracts\PayloadCreator
protected $payload;

/**
* @var Parser
* @var \LaraPackage\Api\Contracts\Request\Parser
*/
protected $requestParser;

/**
* @var FractalFactory
*/
protected $fractalFactory;

/**
* @var VersionFactory
* @var \LaraPackage\Api\Contracts\Factory\VersionFactory
*/
private $versionFactory;

public function __construct(\LaraPackage\Api\Contracts\Request\Parser $requestParser, FractalFactory $fractalFactory, VersionFactory $versionFactory)
public function __construct(\LaraPackage\Api\Contracts\Request\Parser $requestParser, FractalFactory $fractalFactory, \LaraPackage\Api\Contracts\Factory\VersionFactory $versionFactory)
{
$this->requestParser = $requestParser;
$this->fractalFactory = $fractalFactory;
Expand Down
5 changes: 3 additions & 2 deletions src/Implementations/RepresentationCreator.php
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class RepresentationCreator implements \LaraPackage\Api\Contracts\Representation
/**
* @var int
*/
private $version = 4;
private $version = 1;
/**
* @var \LaraPackage\Api\Contracts\Config\ApiVersion
*/
Expand All @@ -31,7 +31,8 @@ public function __construct(
ResponseFactory $response,
\LaraPackage\Api\Contracts\Factory\VersionFactory $versionFactory,
\LaraPackage\Api\Contracts\Config\ApiVersion $versionInfoRetriever
) {
)
{
$this->requestParser = $requestParser;
$this->response = $response;
$this->versionFactory = $versionFactory;
Expand Down
105 changes: 0 additions & 105 deletions src/PayloadCreator.php

This file was deleted.

71 changes: 0 additions & 71 deletions src/RepresentationCreator.php

This file was deleted.

0 comments on commit 8518ce7

Please sign in to comment.