Support for Twig 3.

derrabus · derrabus · commit 57f1451f9347 · 2019-08-21T13:51:24.000+02:00
diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
         "ext-xml": "*",
         "doctrine/event-manager": "~1.0",
         "doctrine/persistence": "~1.0",
-        "twig/twig": "^2.10",
+        "twig/twig": "^2.10|^3",
         "psr/cache": "~1.0",
         "psr/container": "^1.0",
         "psr/link": "^1.0",
diff --git a/src/Symfony/Bridge/Twig/Extension/AssetExtension.php b/src/Symfony/Bridge/Twig/Extension/AssetExtension.php
@@ -34,7 +34,7 @@ public function __construct(Packages $packages)
      *
      * @return TwigFunction[]
      */
-    public function getFunctions()
+    public function getFunctions(): array
     {
         return [
             new TwigFunction('asset', [$this, 'getAssetUrl']),
diff --git a/src/Symfony/Bridge/Twig/Extension/CodeExtension.php b/src/Symfony/Bridge/Twig/Extension/CodeExtension.php
@@ -43,7 +43,7 @@ public function __construct($fileLinkFormat, string $projectDir, string $charset
      *
      * @return TwigFilter[]
      */
-    public function getFilters()
+    public function getFilters(): array
     {
         return [
             new TwigFilter('abbr_class', [$this, 'abbrClass'], ['is_safe' => ['html']]),
diff --git a/src/Symfony/Bridge/Twig/Extension/DumpExtension.php b/src/Symfony/Bridge/Twig/Extension/DumpExtension.php
@@ -39,7 +39,7 @@ public function __construct(ClonerInterface $cloner, HtmlDumper $dumper = null)
     /**
      * @return TwigFunction[]
      */
-    public function getFunctions()
+    public function getFunctions(): array
     {
         return [
             new TwigFunction('dump', [$this, 'dump'], ['is_safe' => ['html'], 'needs_context' => true, 'needs_environment' => true]),
@@ -49,7 +49,7 @@ public function getFunctions()
     /**
      * @return TokenParserInterface[]
      */
-    public function getTokenParsers()
+    public function getTokenParsers(): array
     {
         return [new DumpTokenParser()];
     }
diff --git a/src/Symfony/Bridge/Twig/Extension/ExpressionExtension.php b/src/Symfony/Bridge/Twig/Extension/ExpressionExtension.php
@@ -27,7 +27,7 @@ class ExpressionExtension extends AbstractExtension
      *
      * @return TwigFunction[]
      */
-    public function getFunctions()
+    public function getFunctions(): array
     {
         return [
             new TwigFunction('expression', [$this, 'createExpression']),
diff --git a/src/Symfony/Bridge/Twig/Extension/FormExtension.php b/src/Symfony/Bridge/Twig/Extension/FormExtension.php
@@ -33,7 +33,7 @@ class FormExtension extends AbstractExtension
      *
      * @return TokenParserInterface[]
      */
-    public function getTokenParsers()
+    public function getTokenParsers(): array
     {
         return [
             // {% form_theme form "SomeBundle::widgets.twig" %}
@@ -46,7 +46,7 @@ public function getTokenParsers()
      *
      * @return TwigFunction[]
      */
-    public function getFunctions()
+    public function getFunctions(): array
     {
         return [
             new TwigFunction('form_widget', null, ['node_class' => 'Symfony\Bridge\Twig\Node\SearchAndRenderBlockNode', 'is_safe' => ['html']]),
@@ -68,7 +68,7 @@ public function getFunctions()
      *
      * @return TwigFilter[]
      */
-    public function getFilters()
+    public function getFilters(): array
     {
         return [
             new TwigFilter('humanize', ['Symfony\Component\Form\FormRenderer', 'humanize']),
@@ -81,7 +81,7 @@ public function getFilters()
      *
      * @return TwigTest[]
      */
-    public function getTests()
+    public function getTests(): array
     {
         return [
             new TwigTest('selectedchoice', 'Symfony\Bridge\Twig\Extension\twig_is_selected_choice'),
diff --git a/src/Symfony/Bridge/Twig/Extension/HttpFoundationExtension.php b/src/Symfony/Bridge/Twig/Extension/HttpFoundationExtension.php
@@ -35,7 +35,7 @@ public function __construct(UrlHelper $urlHelper)
      *
      * @return TwigFunction[]
      */
-    public function getFunctions()
+    public function getFunctions(): array
     {
         return [
             new TwigFunction('absolute_url', [$this, 'generateAbsoluteUrl']),
diff --git a/src/Symfony/Bridge/Twig/Extension/HttpKernelExtension.php b/src/Symfony/Bridge/Twig/Extension/HttpKernelExtension.php
@@ -25,7 +25,7 @@ class HttpKernelExtension extends AbstractExtension
     /**
      * @return TwigFunction[]
      */
-    public function getFunctions()
+    public function getFunctions(): array
     {
         return [
             new TwigFunction('render', [HttpKernelRuntime::class, 'renderFragment'], ['is_safe' => ['html']]),
diff --git a/src/Symfony/Bridge/Twig/Extension/LogoutUrlExtension.php b/src/Symfony/Bridge/Twig/Extension/LogoutUrlExtension.php
@@ -34,7 +34,7 @@ public function __construct(LogoutUrlGenerator $generator)
      *
      * @return TwigFunction[]
      */
-    public function getFunctions()
+    public function getFunctions(): array
     {
         return [
             new TwigFunction('logout_url', [$this, 'getLogoutUrl']),
diff --git a/src/Symfony/Bridge/Twig/Extension/ProfilerExtension.php b/src/Symfony/Bridge/Twig/Extension/ProfilerExtension.php
@@ -31,7 +31,7 @@ public function __construct(Profile $profile, Stopwatch $stopwatch = null)
         $this->events = new \SplObjectStorage();
     }
 
-    public function enter(Profile $profile)
+    public function enter(Profile $profile): void
     {
         if ($this->stopwatch && $profile->isTemplate()) {
             $this->events[$profile] = $this->stopwatch->start($profile->getName(), 'template');
@@ -40,7 +40,7 @@ public function enter(Profile $profile)
         parent::enter($profile);
     }
 
-    public function leave(Profile $profile)
+    public function leave(Profile $profile): void
     {
         parent::leave($profile);
 
diff --git a/src/Symfony/Bridge/Twig/Extension/RoutingExtension.php b/src/Symfony/Bridge/Twig/Extension/RoutingExtension.php
@@ -37,7 +37,7 @@ public function __construct(UrlGeneratorInterface $generator)
      *
      * @return TwigFunction[]
      */
-    public function getFunctions()
+    public function getFunctions(): array
     {
         return [
             new TwigFunction('url', [$this, 'getUrl'], ['is_safe_callback' => [$this, 'isUrlGenerationSafe']]),
diff --git a/src/Symfony/Bridge/Twig/Extension/SecurityExtension.php b/src/Symfony/Bridge/Twig/Extension/SecurityExtension.php
@@ -53,7 +53,7 @@ public function isGranted($role, object $object = null, string $field = null)
      *
      * @return TwigFunction[]
      */
-    public function getFunctions()
+    public function getFunctions(): array
     {
         return [
             new TwigFunction('is_granted', [$this, 'isGranted']),
diff --git a/src/Symfony/Bridge/Twig/Extension/StopwatchExtension.php b/src/Symfony/Bridge/Twig/Extension/StopwatchExtension.php
@@ -40,7 +40,7 @@ public function getStopwatch()
     /**
      * @return TokenParserInterface[]
      */
-    public function getTokenParsers()
+    public function getTokenParsers(): array
     {
         return [
             /*
diff --git a/src/Symfony/Bridge/Twig/Extension/WebLinkExtension.php b/src/Symfony/Bridge/Twig/Extension/WebLinkExtension.php
@@ -36,7 +36,7 @@ public function __construct(RequestStack $requestStack)
      *
      * @return TwigFunction[]
      */
-    public function getFunctions()
+    public function getFunctions(): array
     {
         return [
             new TwigFunction('link', [$this, 'link']),
diff --git a/src/Symfony/Bridge/Twig/Extension/WorkflowExtension.php b/src/Symfony/Bridge/Twig/Extension/WorkflowExtension.php
@@ -34,7 +34,7 @@ public function __construct(Registry $workflowRegistry)
     /**
      * @return TwigFunction[]
      */
-    public function getFunctions()
+    public function getFunctions(): array
     {
         return [
             new TwigFunction('workflow_can', [$this, 'canTransition']),
diff --git a/src/Symfony/Bridge/Twig/Extension/YamlExtension.php b/src/Symfony/Bridge/Twig/Extension/YamlExtension.php
@@ -28,7 +28,7 @@ class YamlExtension extends AbstractExtension
      *
      * @return TwigFilter[]
      */
-    public function getFilters()
+    public function getFilters(): array
     {
         return [
             new TwigFilter('yaml_encode', [$this, 'encode']),
diff --git a/src/Symfony/Bridge/Twig/Form/TwigRendererEngine.php b/src/Symfony/Bridge/Twig/Form/TwigRendererEngine.php
@@ -149,7 +149,7 @@ protected function loadResourcesFromTheme(string $cacheKey, &$theme)
     {
         if (!$theme instanceof Template) {
             /* @var Template $theme */
-            $theme = $this->environment->loadTemplate($theme);
+            $theme = $this->environment->load($theme)->unwrap();
         }
 
         if (null === $this->template) {
diff --git a/src/Symfony/Bridge/Twig/Node/DumpNode.php b/src/Symfony/Bridge/Twig/Node/DumpNode.php
@@ -35,7 +35,7 @@ public function __construct($varPrefix, Node $values = null, int $lineno, string
     /**
      * {@inheritdoc}
      */
-    public function compile(Compiler $compiler)
+    public function compile(Compiler $compiler): void
     {
         $compiler
             ->write("if (\$this->env->isDebug()) {\n")
diff --git a/src/Symfony/Bridge/Twig/Node/FormThemeNode.php b/src/Symfony/Bridge/Twig/Node/FormThemeNode.php
@@ -25,7 +25,7 @@ public function __construct(Node $form, Node $resources, int $lineno, string $ta
         parent::__construct(['form' => $form, 'resources' => $resources], ['only' => $only], $lineno, $tag);
     }
 
-    public function compile(Compiler $compiler)
+    public function compile(Compiler $compiler): void
     {
         $compiler
             ->addDebugInfo($this)
diff --git a/src/Symfony/Bridge/Twig/Node/RenderBlockNode.php b/src/Symfony/Bridge/Twig/Node/RenderBlockNode.php
@@ -24,7 +24,7 @@
  */
 class RenderBlockNode extends FunctionExpression
 {
-    public function compile(Compiler $compiler)
+    public function compile(Compiler $compiler): void
     {
         $compiler->addDebugInfo($this);
         $arguments = iterator_to_array($this->getNode('arguments'));
diff --git a/src/Symfony/Bridge/Twig/Node/SearchAndRenderBlockNode.php b/src/Symfony/Bridge/Twig/Node/SearchAndRenderBlockNode.php
@@ -21,7 +21,7 @@
  */
 class SearchAndRenderBlockNode extends FunctionExpression
 {
-    public function compile(Compiler $compiler)
+    public function compile(Compiler $compiler): void
     {
         $compiler->addDebugInfo($this);
         $compiler->raw('$this->env->getRuntime(\'Symfony\Component\Form\FormRenderer\')->searchAndRenderBlock(');
diff --git a/src/Symfony/Bridge/Twig/Node/StopwatchNode.php b/src/Symfony/Bridge/Twig/Node/StopwatchNode.php
@@ -27,7 +27,7 @@ public function __construct(Node $name, Node $body, AssignNameExpression $var, i
         parent::__construct(['body' => $body, 'name' => $name, 'var' => $var], [], $lineno, $tag);
     }
 
-    public function compile(Compiler $compiler)
+    public function compile(Compiler $compiler): void
     {
         $compiler
             ->addDebugInfo($this)
diff --git a/src/Symfony/Bridge/Twig/Node/TransDefaultDomainNode.php b/src/Symfony/Bridge/Twig/Node/TransDefaultDomainNode.php
@@ -25,7 +25,7 @@ public function __construct(AbstractExpression $expr, int $lineno = 0, string $t
         parent::__construct(['expr' => $expr], [], $lineno, $tag);
     }
 
-    public function compile(Compiler $compiler)
+    public function compile(Compiler $compiler): void
     {
         // noop as this node is just a marker for TranslationDefaultDomainNodeVisitor
     }
diff --git a/src/Symfony/Bridge/Twig/Node/TransNode.php b/src/Symfony/Bridge/Twig/Node/TransNode.php
@@ -46,7 +46,7 @@ public function __construct(Node $body, Node $domain = null, AbstractExpression
         parent::__construct($nodes, [], $lineno, $tag);
     }
 
-    public function compile(Compiler $compiler)
+    public function compile(Compiler $compiler): void
     {
         $compiler->addDebugInfo($this);
 
diff --git a/src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php b/src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php
@@ -39,10 +39,8 @@ public function __construct()
 
     /**
      * {@inheritdoc}
-     *
-     * @return Node
      */
-    protected function doEnterNode(Node $node, Environment $env)
+    protected function doEnterNode(Node $node, Environment $env): Node
     {
         if ($node instanceof BlockNode || $node instanceof ModuleNode) {
             $this->scope = $this->scope->enter();
@@ -93,10 +91,8 @@ protected function doEnterNode(Node $node, Environment $env)
 
     /**
      * {@inheritdoc}
-     *
-     * @return Node|null
      */
-    protected function doLeaveNode(Node $node, Environment $env)
+    protected function doLeaveNode(Node $node, Environment $env): ?Node
     {
         if ($node instanceof TransDefaultDomainNode) {
             return null;
@@ -112,7 +108,7 @@ protected function doLeaveNode(Node $node, Environment $env)
     /**
      * {@inheritdoc}
      */
-    public function getPriority()
+    public function getPriority(): int
     {
         return -10;
     }
diff --git a/src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php b/src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php
@@ -49,10 +49,8 @@ public function getMessages()
 
     /**
      * {@inheritdoc}
-     *
-     * @return Node
      */
-    protected function doEnterNode(Node $node, Environment $env)
+    protected function doEnterNode(Node $node, Environment $env): Node
     {
         if (!$this->enabled) {
             return $node;
@@ -91,18 +89,16 @@ protected function doEnterNode(Node $node, Environment $env)
 
     /**
      * {@inheritdoc}
-     *
-     * @return Node|null
      */
-    protected function doLeaveNode(Node $node, Environment $env)
+    protected function doLeaveNode(Node $node, Environment $env): ?Node
     {
         return $node;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getPriority()
+    public function getPriority(): int
     {
         return 0;
     }
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/TranslationExtensionTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/TranslationExtensionTest.php
@@ -15,8 +15,10 @@
 use Symfony\Bridge\Twig\Extension\TranslationExtension;
 use Symfony\Component\Translation\Loader\ArrayLoader;
 use Symfony\Component\Translation\Translator;
+use Symfony\Contracts\Translation\TranslatorInterface;
 use Twig\Environment;
 use Twig\Loader\ArrayLoader as TwigArrayLoader;
+use Twig\TemplateWrapper;
 
 class TranslationExtensionTest extends TestCase
 {
@@ -187,7 +189,7 @@ public function testDefaultTranslationDomainWithNamedArguments()
         $this->assertEquals('foo (custom)foo (foo)foo (custom)foo (custom)foo (fr)foo (custom)foo (fr)', trim($template->render([])));
     }
 
-    protected function getTemplate($template, $translator = null)
+    private function getTemplate($template, TranslatorInterface $translator = null): TemplateWrapper
     {
         if (null === $translator) {
             $translator = new Translator('en');
@@ -201,6 +203,6 @@ protected function getTemplate($template, $translator = null)
         $twig = new Environment($loader, ['debug' => true, 'cache' => false]);
         $twig->addExtension(new TranslationExtension($translator));
 
-        return $twig->loadTemplate('index');
+        return $twig->load('index');
     }
 }
diff --git a/src/Symfony/Bridge/Twig/TokenParser/DumpTokenParser.php b/src/Symfony/Bridge/Twig/TokenParser/DumpTokenParser.php
@@ -31,10 +31,8 @@ class DumpTokenParser extends AbstractTokenParser
 {
     /**
      * {@inheritdoc}
-     *
-     * @return Node
      */
-    public function parse(Token $token)
+    public function parse(Token $token): Node
     {
         $values = null;
         if (!$this->parser->getStream()->test(Token::BLOCK_END_TYPE)) {
@@ -47,10 +45,8 @@ public function parse(Token $token)
 
     /**
      * {@inheritdoc}
-     *
-     * @return string
      */
-    public function getTag()
+    public function getTag(): string
     {
         return 'dump';
     }
diff --git a/src/Symfony/Bridge/Twig/TokenParser/FormThemeTokenParser.php b/src/Symfony/Bridge/Twig/TokenParser/FormThemeTokenParser.php
diff --git a/src/Symfony/Bridge/Twig/TokenParser/StopwatchTokenParser.php b/src/Symfony/Bridge/Twig/TokenParser/StopwatchTokenParser.php
diff --git a/src/Symfony/Bridge/Twig/TokenParser/TransDefaultDomainTokenParser.php b/src/Symfony/Bridge/Twig/TokenParser/TransDefaultDomainTokenParser.php
diff --git a/src/Symfony/Bridge/Twig/TokenParser/TransTokenParser.php b/src/Symfony/Bridge/Twig/TokenParser/TransTokenParser.php
diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json
diff --git a/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheWarmer.php b/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheWarmer.php
diff --git a/src/Symfony/Bundle/TwigBundle/composer.json b/src/Symfony/Bundle/TwigBundle/composer.json
diff --git a/src/Symfony/Bundle/WebProfilerBundle/composer.json b/src/Symfony/Bundle/WebProfilerBundle/composer.json
diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json
diff --git a/src/Symfony/Component/VarDumper/composer.json b/src/Symfony/Component/VarDumper/composer.json

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public function __construct(Packages $packages)`
`34`	`34`	`*`
`35`	`35`	`* @return TwigFunction[]`
`36`	`36`	`*/`
`37`		`- public function getFunctions()`
	`37`	`+ public function getFunctions(): array`
`38`	`38`	`{`
`39`	`39`	`return [`
`40`	`40`	`new TwigFunction('asset', [$this, 'getAssetUrl']),`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function __construct($fileLinkFormat, string $projectDir, string $charset`
`43`	`43`	`*`
`44`	`44`	`* @return TwigFilter[]`
`45`	`45`	`*/`
`46`		`- public function getFilters()`
	`46`	`+ public function getFilters(): array`
`47`	`47`	`{`
`48`	`48`	`return [`
`49`	`49`	`new TwigFilter('abbr_class', [$this, 'abbrClass'], ['is_safe' => ['html']]),`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public function __construct(ClonerInterface $cloner, HtmlDumper $dumper = null)`
`39`	`39`	`/**`
`40`	`40`	`* @return TwigFunction[]`
`41`	`41`	`*/`
`42`		`- public function getFunctions()`
	`42`	`+ public function getFunctions(): array`
`43`	`43`	`{`
`44`	`44`	`return [`
`45`	`45`	`new TwigFunction('dump', [$this, 'dump'], ['is_safe' => ['html'], 'needs_context' => true, 'needs_environment' => true]),`
`@@ -49,7 +49,7 @@ public function getFunctions()`
`49`	`49`	`/**`
`50`	`50`	`* @return TokenParserInterface[]`
`51`	`51`	`*/`
`52`		`- public function getTokenParsers()`
	`52`	`+ public function getTokenParsers(): array`
`53`	`53`	`{`
`54`	`54`	`return [new DumpTokenParser()];`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ class ExpressionExtension extends AbstractExtension`
`27`	`27`	`*`
`28`	`28`	`* @return TwigFunction[]`
`29`	`29`	`*/`
`30`		`- public function getFunctions()`
	`30`	`+ public function getFunctions(): array`
`31`	`31`	`{`
`32`	`32`	`return [`
`33`	`33`	`new TwigFunction('expression', [$this, 'createExpression']),`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ class FormExtension extends AbstractExtension`
`33`	`33`	`*`
`34`	`34`	`* @return TokenParserInterface[]`
`35`	`35`	`*/`
`36`		`- public function getTokenParsers()`
	`36`	`+ public function getTokenParsers(): array`
`37`	`37`	`{`
`38`	`38`	`return [`
`39`	`39`	`// {% form_theme form "SomeBundle::widgets.twig" %}`
`@@ -46,7 +46,7 @@ public function getTokenParsers()`
`46`	`46`	`*`
`47`	`47`	`* @return TwigFunction[]`
`48`	`48`	`*/`
`49`		`- public function getFunctions()`
	`49`	`+ public function getFunctions(): array`
`50`	`50`	`{`
`51`	`51`	`return [`
`52`	`52`	`new TwigFunction('form_widget', null, ['node_class' => 'Symfony\Bridge\Twig\Node\SearchAndRenderBlockNode', 'is_safe' => ['html']]),`
`@@ -68,7 +68,7 @@ public function getFunctions()`
`68`	`68`	`*`
`69`	`69`	`* @return TwigFilter[]`
`70`	`70`	`*/`
`71`		`- public function getFilters()`
	`71`	`+ public function getFilters(): array`
`72`	`72`	`{`
`73`	`73`	`return [`
`74`	`74`	`new TwigFilter('humanize', ['Symfony\Component\Form\FormRenderer', 'humanize']),`
`@@ -81,7 +81,7 @@ public function getFilters()`
`81`	`81`	`*`
`82`	`82`	`* @return TwigTest[]`
`83`	`83`	`*/`
`84`		`- public function getTests()`
	`84`	`+ public function getTests(): array`
`85`	`85`	`{`
`86`	`86`	`return [`
`87`	`87`	`new TwigTest('selectedchoice', 'Symfony\Bridge\Twig\Extension\twig_is_selected_choice'),`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public function __construct(UrlHelper $urlHelper)`
`35`	`35`	`*`
`36`	`36`	`* @return TwigFunction[]`
`37`	`37`	`*/`
`38`		`- public function getFunctions()`
	`38`	`+ public function getFunctions(): array`
`39`	`39`	`{`
`40`	`40`	`return [`
`41`	`41`	`new TwigFunction('absolute_url', [$this, 'generateAbsoluteUrl']),`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class HttpKernelExtension extends AbstractExtension`
`25`	`25`	`/**`
`26`	`26`	`* @return TwigFunction[]`
`27`	`27`	`*/`
`28`		`- public function getFunctions()`
	`28`	`+ public function getFunctions(): array`
`29`	`29`	`{`
`30`	`30`	`return [`
`31`	`31`	`new TwigFunction('render', [HttpKernelRuntime::class, 'renderFragment'], ['is_safe' => ['html']]),`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public function __construct(Profile $profile, Stopwatch $stopwatch = null)`
`31`	`31`	`$this->events = new \SplObjectStorage();`
`32`	`32`	`}`
`33`	`33`
`34`		`- public function enter(Profile $profile)`
	`34`	`+ public function enter(Profile $profile): void`
`35`	`35`	`{`
`36`	`36`	`if ($this->stopwatch && $profile->isTemplate()) {`
`37`	`37`	`$this->events[$profile] = $this->stopwatch->start($profile->getName(), 'template');`
`@@ -40,7 +40,7 @@ public function enter(Profile $profile)`
`40`	`40`	`parent::enter($profile);`
`41`	`41`	`}`
`42`	`42`
`43`		`- public function leave(Profile $profile)`
	`43`	`+ public function leave(Profile $profile): void`
`44`	`44`	`{`
`45`	`45`	`parent::leave($profile);`
`46`	`46`