Skip to content

Commit

Permalink
Update services
Browse files Browse the repository at this point in the history
  • Loading branch information
killianherbunot committed Oct 27, 2016
1 parent aaa6d4a commit 2c84866
Show file tree
Hide file tree
Showing 13 changed files with 111 additions and 40 deletions.
2 changes: 1 addition & 1 deletion DependencyInjection/OpenClassroomsFrontDeskExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class OpenClassroomsFrontDeskExtension extends Extension
*/
public function load(array $config, ContainerBuilder $container)
{
$loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config/'));
$loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/Config/'));
$loader->load('services.xml');

$config = $this->processConfiguration(new Configuration(), $config);
Expand Down
17 changes: 17 additions & 0 deletions Resources/Config/Service/pack_services.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<container xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://symfony.com/schema/dic/services" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
<services>
<service id="openclassrooms.frontdesk.gateways.pack" class="OpenClassrooms\FrontDesk\Repository\PackRepository" public="false">
<call method="setApiClient">
<argument type="service" id="openclassrooms.frontdesk.client.api_client"/>
</call>
</service>

<service id="openclassrooms.frontdesk.service.pack" class="OpenClassrooms\FrontDesk\Services\Impl\PackServiceImpl">
<call method="setPackGateway">
<argument type="service" id="openclassrooms.frontdesk.gateways.pack"/>
</call>
</service>

<service id="openclassrooms.frontdesk.models.pack_builder" class="OpenClassrooms\FrontDesk\Models\Impl\PackBuilderImpl"/>
</services>
</container>
17 changes: 17 additions & 0 deletions Resources/Config/Service/person_services.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<container xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://symfony.com/schema/dic/services" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
<services>
<service id="openclassrooms.frontdesk.gateways.person" class="OpenClassrooms\FrontDesk\Repository\PersonRepository" public="false">
<call method="setApiClient">
<argument type="service" id="openclassrooms.frontdesk.client.api_client"/>
</call>
</service>

<service id="openclassrooms.frontdesk.service.person" class="OpenClassrooms\FrontDesk\Services\Impl\PersonServiceImpl">
<call method="setPersonGateway">
<argument type="service" id="openclassrooms.frontdesk.gateways.person"/>
</call>
</service>

<service id="openclassrooms.frontdesk.models.person_builder" class="OpenClassrooms\FrontDesk\Models\Impl\PersonBuilderImpl"/>
</services>
</container>
17 changes: 17 additions & 0 deletions Resources/Config/Service/plan_services.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<container xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://symfony.com/schema/dic/services" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
<services>
<service id="openclassrooms.frontdesk.gateways.plan" class="OpenClassrooms\FrontDesk\Repository\PlanRepository" public="false">
<call method="setApiClient">
<argument type="service" id="openclassrooms.frontdesk.client.api_client"/>
</call>
</service>

<service id="openclassrooms.frontdesk.service.plan" class="OpenClassrooms\FrontDesk\Services\Impl\PlanServiceImpl">
<call method="setPlanGateway">
<argument type="service" id="openclassrooms.frontdesk.gateways.plan"/>
</call>
</service>

<service id="openclassrooms.frontdesk.models.plan_builder" class="OpenClassrooms\FrontDesk\Models\Impl\PlanBuilderImpl"/>
</services>
</container>
17 changes: 17 additions & 0 deletions Resources/Config/Service/visit_services.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<container xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://symfony.com/schema/dic/services" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
<services>
<service id="openclassrooms.frontdesk.gateways.visit" class="OpenClassrooms\FrontDesk\Repository\VisitRepository" public="false">
<call method="setApiClient">
<argument type="service" id="openclassrooms.frontdesk.client.api_client"/>
</call>
</service>

<service id="openclassrooms.frontdesk.service.visit" class="OpenClassrooms\FrontDesk\Services\Impl\VisitServiceImpl">
<call method="setVisitGateway">
<argument type="service" id="openclassrooms.frontdesk.gateways.visit"/>
</call>
</service>

<service id="openclassrooms.frontdesk.models.visit_builder" class="OpenClassrooms\FrontDesk\Models\Impl\VisitBuilderImpl"/>
</services>
</container>
16 changes: 16 additions & 0 deletions Resources/Config/services.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<container xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://symfony.com/schema/dic/services" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
<imports>
<import resource="Service/pack_services.xml"/>
<import resource="Service/person_services.xml"/>
<import resource="Service/plan_services.xml"/>
<import resource="Service/visit_services.xml"/>
</imports>

<services>
<service id="openclassrooms.frontdesk.client.api_client" class="OpenClassrooms\FrontDesk\Client\Impl\ApiClientImpl" public="false">
<argument>%openclassrooms.frontdesk.key%</argument>
<argument>%openclassrooms.frontdesk.token%</argument>
</service>
</services>
</container>

36 changes: 0 additions & 36 deletions Resources/config/services.xml

This file was deleted.

27 changes: 25 additions & 2 deletions Tests/DependencyInjection/OpenClassroomsFrontDeskExtensionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,29 @@ public function PackServiceReturnPack()
$this->assertInstanceOf('OpenClassrooms\FrontDesk\Services\Impl\PackServiceImpl', $packService);
}

/**
* @test
*/
public function PlanServiceReturnPack()
{
$this->configLoader->load('config.yml');
$this->container->compile();
$planService = $this->container->get('openclassrooms.frontdesk.service.plan');
$this->assertInstanceOf('OpenClassrooms\FrontDesk\Services\Impl\PlanServiceImpl', $planService);
}

/**
* @test
*/
public function VisitServiceReturnPack()
{
$this->configLoader->load('config.yml');
$this->container->compile();
$visitService = $this->container->get('openclassrooms.frontdesk.service.visit');
$this->assertInstanceOf('OpenClassrooms\FrontDesk\Services\Impl\VisitServiceImpl', $visitService);
}


protected function setUp()
{
$this->container = new ContainerBuilder();
Expand All @@ -92,12 +115,12 @@ protected function setUp()

$this->configLoader = new YamlFileLoader(
$this->container,
new FileLocator(__DIR__.'/Fixtures/Resources/config')
new FileLocator(__DIR__.'/Fixtures/Resources/Config')
);

$this->serviceLoader = new XmlFileLoader(
$this->container,
new FileLocator(__DIR__.'/../../Resources/config')
new FileLocator(__DIR__.'/../../Resources/Config')
);

$this->serviceLoader->load('services.xml');
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"symfony/http-kernel": ">=2.7 <4",
"symfony/dependency-injection": ">=2.7 <4",
"symfony/config": ">=2.7 <4",
"openclassrooms/front-desk": "1.0.x@dev"
"openclassrooms/front-desk": "~1.0"
},
"require-dev": {
"phpunit/phpunit": "~5.0",
Expand Down

0 comments on commit 2c84866

Please sign in to comment.