Skip to content

Commit

Permalink
#127 - removed the RendererProviderFactory and replaced references to…
Browse files Browse the repository at this point in the history
… it with the new ServiceFactory class
  • Loading branch information
alphadevx committed Mar 10, 2018
1 parent 4c01ac1 commit 12ac36b
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 295 deletions.
100 changes: 0 additions & 100 deletions Alpha/View/Renderer/RendererProviderFactory.php

This file was deleted.

2 changes: 1 addition & 1 deletion Alpha/View/Renderer/RendererProviderInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/**
* Defines the renderer interface, which allows us to have various implementations (HTML,
* JSON, XML etc.) behind one unified interface. Use the
* RendererProviderFactory::getInstance() method to get instances of this.
* ServiceFactory::getInstance() method to get instances of this.
*
* @since 1.2
*
Expand Down
8 changes: 4 additions & 4 deletions Alpha/View/View.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
use Alpha\Model\ActiveRecord;
use Alpha\Model\Type\DEnum;
use Alpha\Exception\IllegalArguementException;
use Alpha\View\Renderer\RendererProviderFactory;
use Alpha\Util\Service\ServiceFactory;
use Alpha\View\Renderer\RendererProviderInterface;
use ReflectionClass;

Expand Down Expand Up @@ -963,13 +963,13 @@ public static function setProvider($ProviderClassName, $acceptHeader = null)
$ProviderClassName = 'Alpha\View\Renderer\Json\RendererProviderJSON';
}

self::$provider = RendererProviderFactory::getInstance($ProviderClassName);
self::$provider = ServiceFactory::getInstance($ProviderClassName, 'Alpha\View\Renderer\RendererProviderInterface');
} else {
if (class_exists($ProviderClassName)) {
$provider = new $ProviderClassName();

if ($provider instanceof RendererProviderInterface) {
self::$provider = RendererProviderFactory::getInstance($ProviderClassName);
self::$provider = ServiceFactory::getInstance($ProviderClassName, 'Alpha\View\Renderer\RendererProviderInterface');
} else {
throw new IllegalArguementException('The provider class ['.$ProviderClassName.'] does not implement the RendererProviderInterface interface!');
}
Expand All @@ -993,7 +993,7 @@ public static function getProvider()
} else {
$config = ConfigProvider::getInstance();

self::$provider = RendererProviderFactory::getInstance($config->get('app.renderer.provider.name'));
self::$provider = ServiceFactory::getInstance($config->get('app.renderer.provider.name'), 'Alpha\View\Renderer\RendererProviderInterface');

return self::$provider;
}
Expand Down
190 changes: 0 additions & 190 deletions test/coverage.txt

This file was deleted.

0 comments on commit 12ac36b

Please sign in to comment.