From 932191352059ce9428b4825d06dc5aa84ba5bf42 Mon Sep 17 00:00:00 2001
From: erikn69 <erikn_69@hotmail.com>
Date: Mon, 19 Feb 2024 15:37:40 -0500
Subject: [PATCH] Fix twig demo (#602)

---
 demo/bridge/twig/index.php                          |  8 ++++----
 .../Bridge/Twig/TimeableTwigExtensionProfiler.php   | 13 +++++++------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/demo/bridge/twig/index.php b/demo/bridge/twig/index.php
index 3550acc..e6837bc 100644
--- a/demo/bridge/twig/index.php
+++ b/demo/bridge/twig/index.php
@@ -5,12 +5,12 @@ include __DIR__ . '/../../bootstrap.php';
 
 $debugbarRenderer->setBaseUrl('../../../src/DebugBar/Resources');
 
-$loader = new Twig_Loader_Filesystem('.');
-$twig = new Twig_Environment($loader);
-$profile = new Twig_Profiler_Profile();
+$loader = new Twig\Loader\FilesystemLoader('.');
+$twig = new Twig\Environment($loader);
+$profile = new Twig\Profiler\Profile();
 $twig->addExtension(new DebugBar\Bridge\Twig\TimeableTwigExtensionProfiler($profile, $debugbar['time']));
 
-$debugbar->addCollector(new DebugBar\Bridge\TwigProfileCollector($profile));
+$debugbar->addCollector(new DebugBar\Bridge\NamespacedTwigProfileCollector($profile, $twig));
 
 render_demo_page(function() use ($twig) {
     echo $twig->render('hello.html', array('name' => 'peter pan'));
diff --git a/src/DebugBar/Bridge/Twig/TimeableTwigExtensionProfiler.php b/src/DebugBar/Bridge/Twig/TimeableTwigExtensionProfiler.php
index 30238cc..9152738 100644
--- a/src/DebugBar/Bridge/Twig/TimeableTwigExtensionProfiler.php
+++ b/src/DebugBar/Bridge/Twig/TimeableTwigExtensionProfiler.php
@@ -11,16 +11,17 @@
 namespace DebugBar\Bridge\Twig;
 
 use DebugBar\DataCollector\TimeDataCollector;
-use Twig_Profiler_Profile;
+use Twig\Extension\ProfilerExtension;
+use Twig\Profiler\Profile;
 
 /**
  * Class TimeableTwigExtensionProfiler
  *
- * Extends Twig_Extension_Profiler to add rendering times to the TimeDataCollector
+ * Extends ProfilerExtension to add rendering times to the TimeDataCollector
  *
  * @package DebugBar\Bridge\Twig
  */
-class TimeableTwigExtensionProfiler extends \Twig_Extension_Profiler
+class TimeableTwigExtensionProfiler extends ProfilerExtension
 {
     /**
      * @var \DebugBar\DataCollector\TimeDataCollector
@@ -35,14 +36,14 @@ class TimeableTwigExtensionProfiler extends \Twig_Extension_Profiler
         $this->timeDataCollector = $timeDataCollector;
     }
 
-    public function __construct(\Twig_Profiler_Profile $profile, TimeDataCollector $timeDataCollector = null)
+    public function __construct(Profile $profile, TimeDataCollector $timeDataCollector = null)
     {
         parent::__construct($profile);
 
         $this->timeDataCollector = $timeDataCollector;
     }
 
-    public function enter(Twig_Profiler_Profile $profile)
+    public function enter(Profile $profile)
     {
         if ($this->timeDataCollector && $profile->isTemplate()) {
             $this->timeDataCollector->startMeasure($profile->getName(), 'template ' . $profile->getName());
@@ -50,7 +51,7 @@ class TimeableTwigExtensionProfiler extends \Twig_Extension_Profiler
         parent::enter($profile);
     }
 
-    public function leave(Twig_Profiler_Profile $profile)
+    public function leave(Profile $profile)
     {
         parent::leave($profile);
         if ($this->timeDataCollector && $profile->isTemplate()) {