v1.0.5 Update init twig engine

BI0R0B0T · Feb 7, 2018 · 358096a · 358096a
1 parent 8affb2f
commit 358096a
Show file tree

Hide file tree

Showing 3 changed files with 68 additions and 16 deletions.
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
   "name": "bi0r0b0t/silex-pinba-provider",
   "description": "Provide PinbaBundle for Silex",
   "minimum-stability": "stable",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "license": "MIT",
   "authors": [
     {

diff --git a/src/SilexPinbaProvider/SilexPinbaProvider.php b/src/SilexPinbaProvider/SilexPinbaProvider.php
@@ -70,7 +70,14 @@ public function register(Container $app)
 
         $app['twig.environment_factory'] = $app->protect(function ($app) {
             $className = $app['intaro_pinba.templating.engine.twig.class'];
-            return new $className($app['twig.loader'], $app['twig.options']);
+            $twig      = new $className($app['twig.loader'], $app['twig.options']);
+            if($twig instanceof TimedTwigEnvironment) {
+                $twig
+                    ->setStopwatch( $app['intaro_pinba.stopwatch'])
+                    ->setServerName($app['intaro_pinba.server.name'])
+                ;
+            }
+            return $twig;
         });
     }
 
@@ -84,16 +91,6 @@ public function register(Container $app)
      */
     public function boot(Application $app)
     {
-        $app->extend('twig', function (\Twig_Environment $twig) use ($app) {
-            if($twig instanceof TimedTwigEnvironment) {
-                $twig
-                    ->setStopwatch( $app['intaro_pinba.stopwatch'])
-                    ->setServerName($app['intaro_pinba.server.name'])
-                ;
-            }
-            return $twig;
-        });
-
         if (!function_exists('pinba_script_name_set') || PHP_SAPI === 'cli' || !$app['intaro_pinba.script_name_configure.enable']) {
             return;
         }

diff --git a/src/SilexPinbaProvider/Test/PinbaTest.php b/src/SilexPinbaProvider/Test/PinbaTest.php
@@ -8,6 +8,7 @@
 
 use Intaro\PinbaBundle\Stopwatch\Stopwatch;
 use PHPUnit\Framework\TestCase;
+use Psr\Log\AbstractLogger;
 use Silex\Provider\TwigServiceProvider;
 use SilexPinbaProvider\SilexPinbaProvider;
 use Silex\Application;
@@ -18,10 +19,17 @@ class PinbaTest extends TestCase
     public function testTwigExtension()
     {
 
-
+        global $app;
         $storage = new \ArrayObject();
-
-        $app      = new ApplicationEmulator();
+        $app     = new ApplicationEmulator();
+        $emulate = false;
+        if(!function_exists('pinba_script_name_set')) {
+            $emulate = true;
+            $app['pinba_logger'] = function () {
+                return new PinbaLogger();
+            };
+            require __DIR__.'/../pinba_emulator.php';
+        }
         $app
             ->register(new TwigServiceProvider(),array(
                 'twig.templates' => array('hello' => 'Hello {{ name }}!'),
@@ -30,9 +38,28 @@ public function testTwigExtension()
 
         $app['intaro_pinba.stopwatch.class'] = 'SilexPinbaProvider\Test\StopwatchEmulate';
         $app->boot();
-        $app['intaro_pinba.stopwatch'] -> setStorage($storage);
+        /**
+         * @var $stopwatch StopwatchEmulate
+         */
+        $stopwatch = $app['intaro_pinba.stopwatch'];
+        $this->assertTrue($stopwatch instanceof Stopwatch);
+        $stopwatch-> setStorage($storage);
         $app->renderView('hello');
         $this->assertTrue(is_array($storage['tags']), var_export($storage, true));
+        if($emulate) {
+            /**
+             * @var $logger PinbaLogger
+             */
+            $logger = $app['pinba_logger'];
+            $this->assertTrue($logger instanceof PinbaLogger);
+            $stack = $logger->getLogStack();
+            $this->assertTrue(is_array($stack));
+            $this->assertNotEmpty($stack);
+            $expected = [
+                ['debug', 'pinba_get_info', []],
+            ];
+            $this->assertEquals($expected, $stack);
+        }
     }
 }
 
@@ -98,4 +125,32 @@ public function stop()
 class ApplicationEmulator extends Application
 {
     use Application\TwigTrait;
+}
+
+class PinbaLogger extends AbstractLogger {
+
+    private $logStack = [];
+
+    /**
+     * Logs with an arbitrary level.
+     *
+     * @param mixed $level
+     * @param string $message
+     * @param array $context
+     *
+     * @return void
+     */
+    public function log($level, $message, array $context = array())
+    {
+        $this->logStack[] = [$level, $message, $context];
+    }
+
+    /**
+     * @return array
+     */
+    public function getLogStack()
+    {
+        return $this->logStack;
+    }
+
 }