Skip to content

Commit

Permalink
Use ::class
Browse files Browse the repository at this point in the history
  • Loading branch information
enumag committed Mar 9, 2017
1 parent e7fdf44 commit f1b3868
Showing 1 changed file with 15 additions and 9 deletions.
24 changes: 15 additions & 9 deletions src/DI/TwigExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,14 @@
namespace Arachne\Twig\DI;

use Arachne\ServiceCollections\DI\ServiceCollectionsExtension;
use Arachne\Twig\RuntimeLoader;
use Nette\DI\CompilerExtension;
use Nette\Utils\AssertionException;
use Twig_Environment;
use Twig_Loader_Chain;
use Twig_Loader_Filesystem;
use Yep\TracyTwigExtensions\BarDumpExtension;
use Yep\TracyTwigExtensions\DumpExtension;

/**
* @author Jáchym Toušek <enumag@gmail.com>
Expand Down Expand Up @@ -54,7 +60,7 @@ public function addPaths(array $paths, $namespace = null)

if (!$builder->hasDefinition($serviceName)) {
$builder->addDefinition($serviceName)
->setClass('Twig_Loader_Filesystem')
->setClass(Twig_Loader_Filesystem::class)
->addTag(self::TAG_LOADER)
->setAutowired(false);
}
Expand All @@ -74,7 +80,7 @@ public function loadConfiguration()
$this->validateConfig($this->defaults);

/* @var $serviceCollectionsExtension ServiceCollectionsExtension */
$serviceCollectionsExtension = $this->getExtension('Arachne\ServiceCollections\DI\ServiceCollectionsExtension');
$serviceCollectionsExtension = $this->getExtension(ServiceCollectionsExtension::class);

$runtimeResolver = $serviceCollectionsExtension->getCollection(
ServiceCollectionsExtension::TYPE_RESOLVER,
Expand All @@ -84,15 +90,15 @@ public function loadConfiguration()
$builder = $this->getContainerBuilder();

$builder->addDefinition($this->prefix('runtimeLoader'))
->setClass('Arachne\Twig\RuntimeLoader')
->setClass(RuntimeLoader::class)
->setArguments(
[
'resolver' => '@'.$runtimeResolver,
]
);

$builder->addDefinition($this->prefix('environment'))
->setClass('Twig_Environment')
->setClass(Twig_Environment::class)
->setArguments(
[
'options' => $this->config['options'],
Expand All @@ -101,11 +107,11 @@ public function loadConfiguration()
->addSetup('addRuntimeLoader', [$this->prefix('@runtimeLoader')]);

$builder->addDefinition($this->prefix('loader'))
->setClass('Twig_Loader_Chain');
->setClass(Twig_Loader_Chain::class);

if (class_exists('Yep\TracyTwigExtensions\DumpExtension')) {
if (class_exists(DumpExtension::class)) {
$builder->addDefinition($this->prefix('extension.tracy.dump'))
->setClass('Yep\TracyTwigExtensions\DumpExtension')
->setClass(DumpExtension::class)
->setArguments(
[
'options' => $this->config['dumpOptions'],
Expand All @@ -115,9 +121,9 @@ public function loadConfiguration()
->setAutowired(false);
}

if (class_exists('Yep\TracyTwigExtensions\BarDumpExtension')) {
if (class_exists(BarDumpExtension::class)) {
$builder->addDefinition($this->prefix('extension.tracy.barDump'))
->setClass('Yep\TracyTwigExtensions\BarDumpExtension')
->setClass(BarDumpExtension::class)
->setArguments(
[
'options' => $this->config['dumpOptions'],
Expand Down

0 comments on commit f1b3868

Please sign in to comment.