Issue 490

composer.json

@@ -62,6 +62,7 @@
         "symfony/polyfill-mbstring"                          : "^1.0",
         "symfony/polyfill-intl-icu"                          : "^1.0",
         "symfony/process"                                    : "^3.2",
+        "symfony/stopwatch"                                  : "^3.2",
         "symfony/var-dumper"                                 : "^3.2",
         "swiftmailer/swiftmailer"                            : "^5.4",
         "vlucas/phpdotenv"                                   : "^2.3"

phpstan.neon

@@ -125,7 +125,7 @@ parameters:
         - '#Method Viserio\\Component\\Cookie\\AbstractCookieCollector::forget#'
 
         # Wrapper
-        - '#Viserio\\Component\\WebProfiler\\DataCollectors\\Bridge\\PDO\\TraceablePDODecorater::__construct#'
+        - '#Viserio\\Component\\Profiler\\DataCollectors\\Bridge\\PDO\\TraceablePDODecorater::__construct#'
 
         # Ignore missing container property for ConfigurationTrait
         - '#Access to an undefined property Viserio\\Component\\Exception\\Displayers\\HtmlDisplayer::\$container#'

phpunit.xml.dist

@@ -121,8 +121,8 @@
         <testsuite name="Narrowspark View Component Test Suite">
             <directory>./src/Viserio/Component/View/Tests</directory>
         </testsuite>
-        <testsuite name="Narrowspark WebProfiler Component Test Suite">
-            <directory>./src/Viserio/Component/WebProfiler/Tests</directory>
+        <testsuite name="Narrowspark Profiler Component Test Suite">
+            <directory>./src/Viserio/Component/Profiler/Tests</directory>
         </testsuite>
     </testsuites>
 

src/Viserio/Bridge/Twig/DataCollector/Resources/css/twig.css

@@ -1,20 +1,20 @@
-.webprofiler-panel.webprofiler-panel-twig-data-collector.active .twig-graph {
+.profiler-panel.profiler-panel-twig-data-collector.active .twig-graph {
     margin-top: 25px;
 }
-.webprofiler-panel.webprofiler-panel-twig-data-collector.active .twig-graph pre {
+.profiler-panel.profiler-panel-twig-data-collector.active .twig-graph pre {
     font-size: 14px;
     color: #2B2A28;
     padding: 10px;
     background-color: #fff;
 }
-.webprofiler-panel.webprofiler-panel-twig-data-collector.active .twig-graph pre .status-success {
+.profiler-panel.profiler-panel-twig-data-collector.active .twig-graph pre .status-success {
     color: #4F805D;
 }
-.webprofiler-panel.webprofiler-panel-twig-data-collector.active .twig-graph pre .status-warning {
+.profiler-panel.profiler-panel-twig-data-collector.active .twig-graph pre .status-warning {
     background-color: #A46A1F;
     color: #FFF;
     padding: 0px 5px;
 }
-.webprofiler-panel.webprofiler-panel-twig-data-collector.active .twig-graph pre .status-error {
+.profiler-panel.profiler-panel-twig-data-collector.active .twig-graph pre .status-error {
     color: #B0413E;
 }

src/Viserio/Bridge/Twig/DataCollector/TwigDataCollector.php

@@ -8,10 +8,10 @@
 use Twig_Markup;
 use Twig_Profiler_Dumper_Html;
 use Twig_Profiler_Profile;
-use Viserio\Component\Contracts\WebProfiler\AssetAware as AssetAwareContract;
-use Viserio\Component\Contracts\WebProfiler\PanelAware as PanelAwareContract;
-use Viserio\Component\Contracts\WebProfiler\TooltipAware as TooltipAwareContract;
-use Viserio\Component\WebProfiler\DataCollectors\AbstractDataCollector;
+use Viserio\Component\Contracts\Profiler\AssetAware as AssetAwareContract;
+use Viserio\Component\Contracts\Profiler\PanelAware as PanelAwareContract;
+use Viserio\Component\Contracts\Profiler\TooltipAware as TooltipAwareContract;
+use Viserio\Component\Profiler\DataCollectors\AbstractDataCollector;
 
 class TwigDataCollector extends AbstractDataCollector implements
     PanelAwareContract,

src/Viserio/Bridge/Twig/Tests/DataCollector/TwigDataCollectorTest.php

@@ -36,7 +36,7 @@ public function testGetTooltip()
             $this->mock(ResponseInterface::class)
         );
 
-        static::assertSame('<div class="webprofiler-menu-tooltip-group"><div class="webprofiler-menu-tooltip-group-piece"><b>Template calls</b><span>1</span></div><div class="webprofiler-menu-tooltip-group-piece"><b>Block calls</b><span>0</span></div><div class="webprofiler-menu-tooltip-group-piece"><b>Macro calls</b><span>0</span></div></div>', $collect->getTooltip());
+        static::assertSame('<div class="profiler-menu-tooltip-group"><div class="profiler-menu-tooltip-group-piece"><b>Template calls</b><span>1</span></div><div class="profiler-menu-tooltip-group-piece"><b>Block calls</b><span>0</span></div><div class="profiler-menu-tooltip-group-piece"><b>Macro calls</b><span>0</span></div></div>', $collect->getTooltip());
     }
 
     public function testGetPanel()
@@ -56,7 +56,7 @@ public function testGetPanel()
             $this->mock(ResponseInterface::class)
         );
 
-        $expect = preg_replace('/(\r\n|\n\r|\r)/', "\n", '<div class="webprofiler-tabs row"><div class="webprofiler-tabs-tab col span_6"><input type="radio" name="tabgroup" id="tab-0-58a60028922b9"><label for="tab-0-58a60028922b9">Twig <span class="counter">1</span></label><div class="webprofiler-tabs-tab-content"><h3>Twig Metrics</h3><ul class="metrics"><li class="metric"><span class="value">' . $this->formatDuration($collect->getTime()) . '</span><span class="label">Render time</span></li><li class="metric"><span class="value">1</span><span class="label">Template calls</span></li><li class="metric"><span class="value">0</span><span class="label">Block calls</span></li><li class="metric"><span class="value">0</span><span class="label">Macro calls</span></li></ul><h3>Rendered Templates</h3><table class="row"><thead><tr><th scope="col" class="Template Name">Template Name</th><th scope="col" class="Render Count">Render Count</th></tr></thead><tbody><tr><th>test.twig</th><td>1</td></tr></tbody></table><div class="twig-graph"><h3>Rendering Call Graph</h3>' . $collect->getHtmlCallGraph() . '</div></div></div><div class="webprofiler-tabs-tab col span_6"><input type="radio" name="tabgroup" id="tab-1-58a60028922c0"><label for="tab-1-58a60028922c0">Twig Extensions <span class="counter">4</span></label><div class="webprofiler-tabs-tab-content"><table class="row"><thead><tr><th scope="col" class="Extension">Extension</th></tr></thead><tbody><tr><td>Twig_Extension_Core</td></tr><tr><td>Twig_Extension_Escaper</td></tr><tr><td>Twig_Extension_Optimizer</td></tr><tr><td>Twig_Extension_Profiler</td></tr></tbody></table></div></div></div>');
+        $expect = preg_replace('/(\r\n|\n\r|\r)/', "\n", '<div class="profiler-tabs row"><div class="profiler-tabs-tab col span_6"><input type="radio" name="tabgroup" id="tab-0-58a60028922b9"><label for="tab-0-58a60028922b9">Twig <span class="counter">1</span></label><div class="profiler-tabs-tab-content"><h3>Twig Metrics</h3><ul class="metrics"><li class="metric"><span class="value">' . $this->formatDuration($collect->getTime()) . '</span><span class="label">Render time</span></li><li class="metric"><span class="value">1</span><span class="label">Template calls</span></li><li class="metric"><span class="value">0</span><span class="label">Block calls</span></li><li class="metric"><span class="value">0</span><span class="label">Macro calls</span></li></ul><h3>Rendered Templates</h3><table class="row"><thead><tr><th scope="col" class="Template Name">Template Name</th><th scope="col" class="Render Count">Render Count</th></tr></thead><tbody><tr><th>test.twig</th><td>1</td></tr></tbody></table><div class="twig-graph"><h3>Rendering Call Graph</h3>' . $collect->getHtmlCallGraph() . '</div></div></div><div class="profiler-tabs-tab col span_6"><input type="radio" name="tabgroup" id="tab-1-58a60028922c0"><label for="tab-1-58a60028922c0">Twig Extensions <span class="counter">4</span></label><div class="profiler-tabs-tab-content"><table class="row"><thead><tr><th scope="col" class="Extension">Extension</th></tr></thead><tbody><tr><td>Twig_Extension_Core</td></tr><tr><td>Twig_Extension_Escaper</td></tr><tr><td>Twig_Extension_Optimizer</td></tr><tr><td>Twig_Extension_Profiler</td></tr></tbody></table></div></div></div>');
 
         static::assertSame($this->removeTabId($expect), $this->removeTabId(preg_replace('/(\r\n|\n\r|\r)/', "\n", $collect->getPanel())));
     }

src/Viserio/Bridge/Twig/Tests/Providers/TwigBridgeDataCollectorsServiceProviderTest.php

@@ -9,12 +9,12 @@
 use Viserio\Bridge\Twig\Providers\TwigBridgeDataCollectorsServiceProvider;
 use Viserio\Bridge\Twig\Providers\TwigBridgeServiceProvider;
 use Viserio\Component\Container\Container;
-use Viserio\Component\Contracts\WebProfiler\WebProfiler as WebProfilerContract;
+use Viserio\Component\Contracts\Profiler\Profiler as ProfilerContract;
 use Viserio\Component\Filesystem\Providers\FilesServiceProvider;
 use Viserio\Component\HttpFactory\Providers\HttpFactoryServiceProvider;
 use Viserio\Component\OptionsResolver\Providers\OptionsResolverServiceProvider;
+use Viserio\Component\Profiler\Providers\ProfilerServiceProvider;
 use Viserio\Component\View\Providers\ViewServiceProvider;
-use Viserio\Component\WebProfiler\Providers\WebProfilerServiceProvider;
 
 /**
  * @runTestsInSeparateProcesses
@@ -29,13 +29,13 @@ public function testGetServices()
         $container->register(new FilesServiceProvider());
         $container->register(new ViewServiceProvider());
         $container->register(new HttpFactoryServiceProvider());
-        $container->register(new WebProfilerServiceProvider());
+        $container->register(new ProfilerServiceProvider());
         $container->register(new TwigBridgeServiceProvider());
         $container->register(new TwigBridgeDataCollectorsServiceProvider());
 
         $container->instance('config', [
             'viserio' => [
-                'webprofiler' => [
+                'profiler' => [
                     'enable'    => true,
                     'collector' => [
                         'twig'  => true,
@@ -61,9 +61,9 @@ public function testGetServices()
             ],
         ]);
 
-        $profiler = $container->get(WebProfilerContract::class);
+        $profiler = $container->get(ProfilerContract::class);
 
-        static::assertInstanceOf(WebProfilerContract::class, $profiler);
+        static::assertInstanceOf(ProfilerContract::class, $profiler);
 
         static::assertTrue(array_key_exists('time-data-collector', $profiler->getCollectors()));
         static::assertTrue(array_key_exists('memory-data-collector', $profiler->getCollectors()));

src/Viserio/Bridge/Twig/composer.json

@@ -35,7 +35,7 @@
         "viserio/session"                    : "self.version",
         "viserio/support"                    : "self.version",
         "viserio/translation"                : "self.version",
-        "viserio/web-profiler"               : "self.version"
+        "viserio/profiler"                   : "self.version"
     },
     "autoload": {
         "psr-4": {

src/Viserio/Component/Container/Container.php

@@ -104,7 +104,7 @@ public function __construct()
     /**
      * {@inheritdoc}
      */
-    public function bind($abstract, $concrete = null)
+    public function bind($abstract, $concrete = null): void
     {
         $concrete = ($concrete) ? $concrete : $abstract;
 
@@ -121,7 +121,7 @@ public function bind($abstract, $concrete = null)
      *
      * @codeCoverageIgnore
      */
-    public function bindIf(string $abstract, $concrete = null)
+    public function bindIf(string $abstract, $concrete = null): void
     {
         if (! $this->has($abstract)) {
             $this->bind($abstract, $concrete);
@@ -131,15 +131,15 @@ public function bindIf(string $abstract, $concrete = null)
     /**
      * {@inheritdoc}
      */
-    public function instance(string $abstract, $instance)
+    public function instance(string $abstract, $instance): void
     {
         $this->bindPlain($abstract, $instance);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function singleton(string $abstract, $concrete = null)
+    public function singleton(string $abstract, $concrete = null): void
     {
         $concrete = ($concrete) ? $concrete : $abstract;
 
@@ -149,17 +149,17 @@ public function singleton(string $abstract, $concrete = null)
     /**
      * {@inheritdoc}
      */
-    public function alias(string $abstract, string $alias)
+    public function alias(string $abstract, string $alias): void
     {
         $this->bindings[$alias] = &$this->bindings[$abstract];
     }
 
     /**
      * {@inheritdoc}
      */
-    public function extend(string $abstract, Closure $closure)
+    public function extend(string $abstract, Closure $closure): void
     {
-        $this->extendAbstract($abstract, $closure);
+        $this->extenders[$abstract][] = $closure;
     }
 
     /**
@@ -189,7 +189,7 @@ public function hasInDelegate(string $abstract): bool
     /**
      * {@inheritdoc}
      */
-    public function forget(string $abstract)
+    public function forget(string $abstract): void
     {
         unset($this->bindings[$abstract]);
     }
@@ -399,19 +399,16 @@ public function call($callable, array $parameters = [])
      */
     public function register(ServiceProvider $provider, array $parameters = []): ContainerContract
     {
-        $entries   = $provider->getServices();
-        $container = $this;
-
-        foreach ($entries as $key => $callable) {
+        foreach ($provider->getServices() as $key => $callable) {
             if ($this->has($key)) {
+                $this->extend($key, function ($previous, $container) use ($callable) {
                 // Extend a previous entry
-                $this->extend($key, function ($previous) use ($container, $callable) {
                     return $callable($container, function () use ($previous) {
                         return $previous;
                     });
                 });
             } else {
-                $this->singleton($key, function () use ($container, $callable) {
+                $this->singleton($key, function ($container) use ($callable) {
                     return $callable($container, null);
                 });
             }
@@ -655,17 +652,6 @@ protected function extendResolved($abstract, &$resolved)
         }
     }
 
-    /**
-     * "Extend" an abstract type in the container.
-     *
-     * @param string   $abstract
-     * @param \Closure $closure
-     */
-    protected function extendAbstract(string $abstract, Closure $closure)
-    {
-        $this->extenders[$abstract][] = $closure;
-    }
-
     /**
      * Call the given closure.
      *

src/Viserio/Component/Container/Tests/ContainerTest.php

@@ -622,8 +622,11 @@ public function testExtendIsLazyInitialized()
 
             return $obj;
         });
+
         self::assertFalse(ContainerLazyExtendFixture::$initialized);
+
         $container->resolve(ContainerLazyExtendFixture::class);
+
         self::assertTrue(ContainerLazyExtendFixture::$initialized);
     }
 

src/Viserio/Component/Container/Tests/Fixture/SimpleFixtureServiceProvider.php

@@ -25,6 +25,6 @@ public static function getParam()
 
     public static function getPrevious(ContainerInterface $container, callable $getPrevious = null)
     {
-        return $getPrevious;
+        return $getPrevious . 'bar';
     }
 }

src/Viserio/Component/Contracts/Container/Container.php

@@ -14,40 +14,50 @@ interface Container extends ContainerInterface, Factory, ArrayAccess
      *
      * @param string $abstract
      * @param string $alias
+     *
+     * @return void
      */
-    public function alias(string $abstract, string $alias);
+    public function alias(string $abstract, string $alias): void;
 
     /**
      * Register a binding with the container.
      *
      * @param string|array         $abstract
      * @param \Closure|string|null $concrete
+     *
+     * @return void
      */
-    public function bind($abstract, $concrete = null);
+    public function bind($abstract, $concrete = null): void;
 
     /**
      * Register a binding if it hasn't already been registered.
      *
      * @param string               $abstract
      * @param \Closure|string|null $concrete
+     *
+     * @return void
      */
-    public function bindIf(string $abstract, $concrete = null);
+    public function bindIf(string $abstract, $concrete = null): void;
 
     /**
      * Register a shared binding in the container.
      *
      * @param string               $abstract
      * @param \Closure|string|null $concrete
+     *
+     * @return void
      */
-    public function singleton(string $abstract, $concrete = null);
+    public function singleton(string $abstract, $concrete = null): void;
 
     /**
      * Register an existing instance as shared in the container.
      *
      * @param string $abstract
      * @param mixed  $instance
+     *
+     * @return void
      */
-    public function instance(string $abstract, $instance);
+    public function instance(string $abstract, $instance): void;
 
     /**
      * Delegate a backup container to be checked for services if it
@@ -72,16 +82,20 @@ public function hasInDelegate(string $abstract): bool;
      * Removes an entry from the container.
      *
      * @param string $abstract Identifier of the entry to remove
+     *
+     * @return void
      */
-    public function forget(string $abstract);
+    public function forget(string $abstract): void;
 
     /**
      * "Extend" an abstract type in the container.
      *
      * @param string   $binding
      * @param \Closure $closure
+     *
+     * @return void
      */
-    public function extend(string $binding, Closure $closure);
+    public function extend(string $binding, Closure $closure): void;
 
     /**
      * Resolve a bound type from container.

src/Viserio/Component/Contracts/Events/EventManager.php

@@ -10,8 +10,10 @@ interface EventManager
      * @param string $eventName
      * @param mixed  $listener
      * @param int    $priority
+     *
+     * @return void
      */
-    public function attach(string $eventName, $listener, int $priority = 0);
+    public function attach(string $eventName, $listener, int $priority = 0): void;
 
     /**
      * Removes a specific listener from an event.
@@ -32,7 +34,7 @@ public function detach(string $eventName, $listener): bool;
      * If the eventName argument is specified, all listeners for that event are
      * removed.
      *
-     * @param string|null $eventName
+     * @param string $eventName
      *
      * @return void
      */

src/Viserio/Component/Contracts/WebProfiler/AssetAware.php → src/Viserio/Component/Contracts/Profiler/AssetAware.php

@@ -1,6 +1,6 @@
 <?php
 declare(strict_types=1);
-namespace Viserio\Component\Contracts\WebProfiler;
+namespace Viserio\Component\Contracts\Profiler;
 
 interface AssetAware extends DataCollector
 {