Twig Metrics
- ' . $this->formatDuration($collect->getTime()) . 'Render time
- 1Template calls
- 0Block calls
- 0Macro calls
Rendered Templates
| Template Name | Render Count |
|---|---|
| test.twig | 1 |
Rendering Call Graph
' . $collect->getHtmlCallGraph() . '| Extension |
|---|
| Twig_Extension_Core |
| Twig_Extension_Escaper |
| Twig_Extension_Optimizer |
| Twig_Extension_Profiler |
| Type | Message |
|---|---|
"error"
-
- | "[2017-01-03 18:58:03] develop.ERROR: Viserio\Contracts\Container\Exceptions\NotFoundException: Abstract (Viserio\Translation\DataCollectors\ViserioTranslationDataCollector) is not being managed by the container in \src\Viserio\Container\Container.php:378 Stack trace: #0 \src\Viserio\WebProfiler\Providers\WebProfilerServiceProvider.php(131): Viserio\Container\Container->get('Viserio\\\\Transla...') #1 \src\Viserio\WebProfiler\Providers\WebProfilerServiceProvider.php(68): Viserio\WebProfiler\Providers\WebProfilerServiceProvider::registerCollectorsFromConfig(Object(Viserio\Foundation\Application), Object(Viserio\WebProfiler\WebProfiler)) #2 \src\Viserio\Container\Container.php(433): Viserio\WebProfiler\Providers\WebProfilerServiceProvider::createWebProfiler(Object(Viserio\Foundation\Application), NULL) #3 [internal function]: Viserio\Container\Container::Viserio\Container\{closure}(Object(Viserio\Foundation\Application)) #4 \src\Viserio\Container\ContainerResolver.php(131): ReflectionFunction->invokeArgs(Array) #5 \src\Viserio\Container\ContainerResolver.php(37): Viserio\Container\ContainerResolver->resolveFunction(Object(Closure), Array) #6 \src\Viserio\Container\Container.php(621): Viserio\Container\ContainerResolver->resolve(Object(Closure), Array) #7 \src\Viserio\Container\Container.php(260): Viserio\Container\Container->resolveSingleton('Viserio\\\\Contrac...', Array) #8 \src\Viserio\Container\Container.php(232): Viserio\Container\Container->resolveBound('Viserio\\\\Contrac...', Array) #9 \src\Viserio\Container\Container.php(373): Viserio\Container\Container->resolve('Viserio\\\\Contrac...') #10 \src\Viserio\Foundation\Http\Kernel.php(216): Viserio\Container\Container->get('Viserio\\\\Contrac...') #11 \src\Viserio\Foundation\Http\Kernel.php(174): Viserio\Foundation\Http\Kernel->handleRequest(Object(Viserio\Http\ServerRequest)) #12 D:\Anolilab\Github\Php\narrowspark\public\index.php(36): Viserio\Foundation\Http\Kernel->handle(Object(Viserio\Http\ServerRequest)) #13 {main} {"identification":{}} []"
-
- |
';
foreach ($data as $strong => $infos) {
- $tooltip .= '
';
+ $tooltip .= '
';
if (is_array($infos)) {
$tooltip .= '' . $strong . '';
@@ -198,21 +198,15 @@ protected function createTooltipGroup(array $data): string
*/
protected function createTabs(array $data): string
{
- $grid = '';
-
- if (($counted = count($data)) < 12) {
- $grid = ' col span_' . floor(12 / $counted);
- }
-
- $html = '
';
+ $html = '
';
foreach ($data as $key => $value) {
$id = uniqid($key . '-');
- $html .= '
';
+ $html .= '
';
$html .= '';
$html .= '';
- $html .= '
';
+ $html .= '
';
}
@@ -233,18 +227,19 @@ protected function createTabs(array $data): string
protected function createTable(array $data, array $settings = []): string
{
$options = array_merge([
- 'name' => null,
- 'headers' => ['Key', 'Value'],
- 'vardumper' => true,
+ 'name' => null,
+ 'headers' => ['Key', 'Value'],
+ 'vardumper' => true,
+ 'empty_text' => 'Empty',
], $settings);
$html = $options['name'] !== null ? '';
$html .= $value['content'];
$html .= '
' . $options['name'] . '
' : ''; if (count($data) !== 0) { - $html .= '| ' . $header . ' | '; + $html .= '' . $header . ' | '; } $html .= '||
|---|---|---|---|
| ' . $key . ' | '; - $html .= '' . ($options['vardumper'] ? $this->cloneVar($values) : $values) . ' | '; + $html .= sprintf('%s | ', ($options['vardumper'] ? $this->cloneVar($values) : $values)); $html .= '|
| ' . ($options['vardumper'] ? $this->cloneVar($value) : $value) . ' | '; + $html .= sprintf('%s | ', ($options['vardumper'] ? $this->cloneVar($value) : $value)); } } else { - $html .= '' . ($options['vardumper'] ? $this->cloneVar($values) : $values) . ' | '; + $html .= sprintf('%s | ', ($options['vardumper'] ? $this->cloneVar($values) : $values)); } $html .= '
Empty
';
+ $html .= sprintf('%s
', $options['empty_text']);
}
return $html;
diff --git a/src/Viserio/Component/WebProfiler/DataCollectors/AjaxRequestsDataCollector.php b/src/Viserio/Component/Profiler/DataCollectors/AjaxRequestsDataCollector.php
similarity index 81%
rename from src/Viserio/Component/WebProfiler/DataCollectors/AjaxRequestsDataCollector.php
rename to src/Viserio/Component/Profiler/DataCollectors/AjaxRequestsDataCollector.php
index b5c900922..7335a9d37 100644
--- a/src/Viserio/Component/WebProfiler/DataCollectors/AjaxRequestsDataCollector.php
+++ b/src/Viserio/Component/Profiler/DataCollectors/AjaxRequestsDataCollector.php
@@ -1,11 +1,11 @@
createTooltipGroup([
'0 AJAX requests' => '',
- '| Method | @@ -49,7 +49,7 @@ public function getTooltip(): stringProfile |
|---|
' . '
' . date('H:i:s', $log['timestamp']) . '
',
+ $log['channel'],
+ $log['message'] . '' . (! empty($log['context']) ? $this->cloneVar($log['context']) : ''), + ]; + }; + + foreach ($this->data['logs'] as $log) { + if (isset($log['priority']) && (in_array($log['priority'], [Logger::ERROR, Logger::INFO]))) { + $infoAndErrorLogs[] = $formatLog($log); + } elseif (isset($log['priority']) && $log['priority'] === Logger::DEBUG) { + $debugLogs[] = $formatLog($log); + } elseif ($this->isSilencedOrDeprecationErrorLog($log)) { + if (isset($log['context']) && $log['context']['exception'] instanceof SilencedErrorContext) { + $silencedLogs[] = $formatLog($log); + } else { + $deprecationLogs[] = $formatLog($log); + } + } + } + + return [ + 'deprecation' => $deprecationLogs, + 'debug' => $debugLogs, + 'info_error' => $infoAndErrorLogs, + 'silenced' => $silencedLogs, + ]; + } +} diff --git a/src/Viserio/Component/WebProfiler/DataCollectors/Bridge/PDO/PDODataCollector.php b/src/Viserio/Component/Profiler/DataCollectors/Bridge/PDO/PDODataCollector.php similarity index 70% rename from src/Viserio/Component/WebProfiler/DataCollectors/Bridge/PDO/PDODataCollector.php rename to src/Viserio/Component/Profiler/DataCollectors/Bridge/PDO/PDODataCollector.php index 908db7715..4ce328f6f 100644 --- a/src/Viserio/Component/WebProfiler/DataCollectors/Bridge/PDO/PDODataCollector.php +++ b/src/Viserio/Component/Profiler/DataCollectors/Bridge/PDO/PDODataCollector.php @@ -1,24 +1,24 @@ has(ProfilerContract::class)) { + $profiler = $container->get(ProfilerContract::class); + } + + $this->profiler = $profiler; + } + + /** + * {@inheritdoc} + */ + public function process(ServerRequestInterface $request, DelegateInterface $delegate): ResponseInterface + { + $server = $request->getServerParams(); + $startTime = $server['REQUEST_TIME_FLOAT'] ?? microtime(true); + + $response = $delegate->process($request); + $response = $response->withHeader('X-Response-Time', sprintf('%2.3fms', (microtime(true) - $startTime) * 1000)); + + if ($this->profiler === null) { + return $response; + } + + // Modify the response to add the Profiler + return $this->profiler->modifyResponse($request, $response); + } +} diff --git a/src/Viserio/Component/WebProfiler/Profile.php b/src/Viserio/Component/Profiler/Profile.php similarity index 91% rename from src/Viserio/Component/WebProfiler/Profile.php rename to src/Viserio/Component/Profiler/Profile.php index 6d5d0db9d..b628a376f 100644 --- a/src/Viserio/Component/WebProfiler/Profile.php +++ b/src/Viserio/Component/Profiler/Profile.php @@ -1,9 +1,9 @@ addCollector($collector); + $this->addCollector($collector['collector']); } } /** * Adds a Collector. * - * @param \Viserio\Component\Contracts\WebProfiler\DataCollector $collector + * @param \Viserio\Component\Contracts\Profiler\DataCollector $collector * * @return void */ diff --git a/src/Viserio/Component/WebProfiler/WebProfiler.php b/src/Viserio/Component/Profiler/Profiler.php similarity index 86% rename from src/Viserio/Component/WebProfiler/WebProfiler.php rename to src/Viserio/Component/Profiler/Profiler.php index e6fa579ea..489e62446 100644 --- a/src/Viserio/Component/WebProfiler/WebProfiler.php +++ b/src/Viserio/Component/Profiler/Profiler.php @@ -1,6 +1,6 @@ assetsRenderer = $assetsRenderer->setWebProfiler($this); + $this->assetsRenderer = $assetsRenderer->setProfiler($this); } /** @@ -99,7 +100,7 @@ public function enable(): void /** * {@inheritdoc} */ - public function setUrlGenerator(UrlGeneratorContract $urlGenerator): WebProfilerContract + public function setUrlGenerator(UrlGeneratorContract $urlGenerator): ProfilerContract { $this->urlGenerator = $urlGenerator; @@ -115,13 +116,13 @@ public function getUrlGenerator(): ?UrlGeneratorContract } /** - * Set the webprofiler template path. + * Set the Profiler template path. * * @param string $path * * @return $this */ - public function setTemplate(string $path): WebProfilerContract + public function setTemplate(string $path): ProfilerContract { $this->template = $path; @@ -129,7 +130,7 @@ public function setTemplate(string $path): WebProfilerContract } /** - * Get the webprofiler template path. + * Get the Profiler template path. * * @return string */ @@ -141,7 +142,7 @@ public function getTemplate(): string /** * {@inheritdoc} */ - public function addCollector(DataCollectorContract $collector, int $priority = 100): WebProfilerContract + public function addCollector(DataCollectorContract $collector, int $priority = 100): ProfilerContract { if (isset($this->collectors[$collector->getName()])) { throw new RuntimeException(sprintf('[%s] is already a registered collector.', $collector->getName())); @@ -196,21 +197,21 @@ public function modifyResponse( } } catch (Throwable $exception) { if ($this->logger !== null) { - $this->logger->error('WebProfiler exception: ' . $exception->getMessage()); + $this->logger->error('Profiler exception: ' . $exception->getMessage()); } else { throw $exception; } } - return $this->injectWebProfiler($response, $token); + return $this->injectProfiler($response, $token); } /** * Returns a AssetsRenderer for this instance. * - * @return \Viserio\Component\WebProfiler\AssetsRenderer + * @return \Viserio\Component\Contracts\Profiler\AssetsRenderer */ - public function getAssetsRenderer(): AssetsRenderer + public function getAssetsRenderer(): AssetsRendererContract { return $this->assetsRenderer; } @@ -223,9 +224,9 @@ public function getAssetsRenderer(): AssetsRenderer * * @return \Psr\Http\Message\ResponseInterface * - * @link https://github.com/symfony/WebProfilerBundle/blob/master/EventListener/WebDebugToolbarListener.php + * @link https://github.com/symfony/ProfilerBundle/blob/master/EventListener/WebDebugToolbarListener.php */ - protected function injectWebProfiler(ResponseInterface $response, string $token): ResponseInterface + protected function injectProfiler(ResponseInterface $response, string $token): ResponseInterface { $content = (string) $response->getBody(); $renderedContent = $this->createTemplate($token); @@ -282,7 +283,7 @@ private function collectData( foreach ($this->collectors as $name => $collector) { $collector['collector']->collect($serverRequest, $response); - $this->collectors[$name] = $collector['collector']; + $this->collectors[$name]['collector'] = $collector['collector']; } if ($this->cachePool !== null) { diff --git a/src/Viserio/Component/Log/Providers/LogsDataCollectorServiceProvider.php b/src/Viserio/Component/Profiler/Providers/ProfilerMonologDataCollectorServiceProvider.php similarity index 50% rename from src/Viserio/Component/Log/Providers/LogsDataCollectorServiceProvider.php rename to src/Viserio/Component/Profiler/Providers/ProfilerMonologDataCollectorServiceProvider.php index c047fd2a3..23789888f 100644 --- a/src/Viserio/Component/Log/Providers/LogsDataCollectorServiceProvider.php +++ b/src/Viserio/Component/Profiler/Providers/ProfilerMonologDataCollectorServiceProvider.php @@ -1,22 +1,21 @@ [self::class, 'createLogParser'], - WebProfilerContract::class => [self::class, 'createWebProfiler'], + ProfilerContract::class => [self::class, 'extendProfiler'], + Logger::class => [self::class, 'extendLogger'], ]; } @@ -41,15 +40,7 @@ public function getServices() */ public function getDimensions(): iterable { - return ['viserio', 'webprofiler']; - } - - /** - * {@inheritdoc} - */ - public function getMandatoryOptions(): iterable - { - return ['logs_storages']; + return ['viserio', 'profiler']; } /** @@ -65,42 +56,47 @@ public function getDefaultOptions(): iterable } /** - * Create a handler parser. + * Extend monolog with a processor. * - * @return \Viserio\Component\Log\DataCollectors\LogParser + * @param \Interop\Container\ContainerInterface $container + * @param null|callable $getPrevious + * + * @return null|\Monolog\Logger|\Viserio\Component\Log\Writer */ - public static function createLogParser(): LogParser + public static function extendLogger(ContainerInterface $container, ?callable $getPrevious = null) { - return new LogParser(); + $log = is_callable($getPrevious) ? $getPrevious() : $getPrevious; + + if ($log !== null) { + $log->pushProcessor(new DebugProcessor()); + } + + return $log; } /** - * Extend viserio profiler with data collector. + * Extend viserio profiler with a data collector. * * @param \Interop\Container\ContainerInterface $container * @param null|callable $getPrevious * - * @return null|\Viserio\Component\Contracts\WebProfiler\WebProfiler + * @return null|\Viserio\Component\Contracts\Profiler\Profiler */ - public static function createWebProfiler(ContainerInterface $container, ?callable $getPrevious = null): ?WebProfilerContract + public static function extendProfiler(ContainerInterface $container, ?callable $getPrevious = null): ?ProfilerContract { - if ($getPrevious !== null) { - self::resolveOptions($container); + $profiler = is_callable($getPrevious) ? $getPrevious() : $getPrevious; - $profiler = $getPrevious(); + if ($profiler !== null) { + self::resolveOptions($container); - if (self::$options['collector']['logs']) { - $profiler->addCollector(new LogsDataCollector( - $container->get(LogParser::class), - self::$options['logs_storages'] - )); + if (self::$options['collector']['logs'] === true && $container->has(Logger::class)) { + $profiler->addCollector(new MonologLoggerDataCollector($container->get(Logger::class))); } return $profiler; } - // @codeCoverageIgnoreStart - return null; - // @codeCoverageIgnoreEnd + + return $profiler; } /** diff --git a/src/Viserio/Component/WebProfiler/Providers/WebProfilerPDOBridgeServiceProvider.php b/src/Viserio/Component/Profiler/Providers/ProfilerPDOBridgeServiceProvider.php similarity index 62% rename from src/Viserio/Component/WebProfiler/Providers/WebProfilerPDOBridgeServiceProvider.php rename to src/Viserio/Component/Profiler/Providers/ProfilerPDOBridgeServiceProvider.php index a195a319b..3ccd68c0d 100644 --- a/src/Viserio/Component/WebProfiler/Providers/WebProfilerPDOBridgeServiceProvider.php +++ b/src/Viserio/Component/Profiler/Providers/ProfilerPDOBridgeServiceProvider.php @@ -1,15 +1,15 @@ function (ContainerInterface $container) { return $container->get(PDO::class); }, - WebProfilerContract::class => [self::class, 'createWebProfiler'], + ProfilerContract::class => [self::class, 'createProfiler'], ]; } @@ -31,17 +31,17 @@ public function getServices() * @param \Interop\Container\ContainerInterface $container * @param null|callable $getPrevious * - * @return null|\Viserio\Component\WebProfiler\DataCollectors\Bridge\PDO\TraceablePDODecorater + * @return null|\Viserio\Component\Profiler\DataCollectors\Bridge\PDO\TraceablePDODecorater */ public static function createTraceablePDODecorater(ContainerInterface $container, ?callable $getPrevious = null): ?TraceablePDODecorater { - if ($getPrevious !== null) { - $pdo = $getPrevious(); + $pdo = is_callable($getPrevious) ? $getPrevious() : $getPrevious; + if ($pdo !== null) { return new TraceablePDODecorater($pdo); } - return null; + return $pdo; } /** @@ -50,9 +50,9 @@ public static function createTraceablePDODecorater(ContainerInterface $container * @param \Interop\Container\ContainerInterface $container * @param null|callable $getPrevious * - * @return null|\Viserio\Component\Contracts\WebProfiler\WebProfiler + * @return null|\Viserio\Component\Contracts\Profiler\Profiler */ - public static function createWebProfiler(ContainerInterface $container, ?callable $getPrevious = null): ?WebProfilerContract + public static function createProfiler(ContainerInterface $container, ?callable $getPrevious = null): ?ProfilerContract { $profiler = $getPrevious(); diff --git a/src/Viserio/Component/Profiler/Providers/ProfilerPsr6Psr16CacheBridgeServiceProvider.php b/src/Viserio/Component/Profiler/Providers/ProfilerPsr6Psr16CacheBridgeServiceProvider.php new file mode 100644 index 000000000..0afed9488 --- /dev/null +++ b/src/Viserio/Component/Profiler/Providers/ProfilerPsr6Psr16CacheBridgeServiceProvider.php @@ -0,0 +1,118 @@ + [self::class, 'createCacheItemPoolDecorator'], + CacheInterface::class => [self::class, 'createSimpleTraceableCacheDecorator'], + ProfilerContract::class => [self::class, 'createProfiler'], + ]; + } + + /** + * Decorate CacheItemPool instances. + * + * @param \Interop\Container\ContainerInterface $container + * @param null|callable $getPrevious + * + * @return null|\Psr\Cache\CacheItemPoolInterface + */ + public static function createCacheItemPoolDecorator(ContainerInterface $container, ?callable $getPrevious = null): ?CacheItemPoolInterface + { + $cache = is_callable($getPrevious) ? $getPrevious() : $getPrevious; + + if ($cache !== null) { + if (self::checkForPhpCacheNamespace($cache)) { + return new PhpCacheTraceableCacheDecorator($cache); + } + + return new TraceableCacheItemDecorator($cache); + } + + return $cache; + } + + /** + * Decorate SimpleTraceableCache instances. + * + * @param \Interop\Container\ContainerInterface $container + * @param null|callable $getPrevious + * + * @return null|\Psr\SimpleCache\CacheInterface + */ + public static function createSimpleTraceableCacheDecorator(ContainerInterface $container, ?callable $getPrevious = null): ?CacheInterface + { + $cache = is_callable($getPrevious) ? $getPrevious() : $getPrevious; + + if ($cache !== null) { + if (self::checkForPhpCacheNamespace($cache)) { + return new PhpCacheTraceableCacheDecorator($cache); + } + + return new SimpleTraceableCacheDecorator($cache); + } + + return $cache; + } + + /** + * Extend viserio profiler with data collector. + * + * @param \Interop\Container\ContainerInterface $container + * @param null|callable $getPrevious + * + * @return null|\Viserio\Component\Contracts\Profiler\Profiler + */ + public static function createProfiler(ContainerInterface $container, ?callable $getPrevious = null): ?ProfilerContract + { + $profiler = is_callable($getPrevious) ? $getPrevious() : $getPrevious; + + if ($profiler !== null) { + $collector = new Psr6Psr16CacheDataCollector(); + + if ($container->has(CacheItemPoolInterface::class) || $container->has(CacheInterface::class)) { + if (($cache = $container->get(CacheItemPoolInterface::class)) instanceof TraceableCacheItemDecorator || + ($cache = $container->get(CacheInterface::class)) instanceof SimpleTraceableCacheDecorator || + ($cache = $container->get(CacheInterface::class)) instanceof PhpCacheTraceableCacheDecorator + ) { + $collector->addPool($cache); + } + } + + $profiler->addCollector($collector); + + return $profiler; + } + + return $profiler; + } + + private static function checkForPhpCacheNamespace($class): bool + { + $class = get_class($class); + $pos = mb_strrpos($class, '\\'); + + if ($pos === false) { + return false; + } + + return mb_strpos(mb_substr($class, 0, $pos), 'Cache\Adapter') !== false; + } +} diff --git a/src/Viserio/Component/WebProfiler/Providers/WebProfilerServiceProvider.php b/src/Viserio/Component/Profiler/Providers/ProfilerServiceProvider.php similarity index 55% rename from src/Viserio/Component/WebProfiler/Providers/WebProfilerServiceProvider.php rename to src/Viserio/Component/Profiler/Providers/ProfilerServiceProvider.php index 9866c96d4..4631d2623 100644 --- a/src/Viserio/Component/WebProfiler/Providers/WebProfilerServiceProvider.php +++ b/src/Viserio/Component/Profiler/Providers/ProfilerServiceProvider.php @@ -1,6 +1,6 @@ [self::class, 'registerWebProfilerAssetsControllers'], - AssetsRenderer::class => [self::class, 'createAssetsRenderer'], - WebProfilerContract::class => [self::class, 'createWebProfiler'], - WebProfiler::class => function (ContainerInterface $container) { - return $container->get(WebProfilerContract::class); + RouterContract::class => [self::class, 'registerProfilerAssetsControllers'], + AssetsRenderer::class => [self::class, 'createAssetsRenderer'], + ProfilerContract::class => [self::class, 'createProfiler'], + Profiler::class => function (ContainerInterface $container) { + return $container->get(ProfilerContract::class); }, ]; } @@ -55,7 +55,7 @@ public function getServices() */ public function getDimensions(): iterable { - return ['viserio', 'webprofiler']; + return ['viserio', 'profiler']; } /** @@ -82,15 +82,15 @@ public function getDefaultOptions(): iterable ], 'jquery_is_used' => false, 'path' => null, - 'collectors' => null, + 'collectors' => [], ]; } - public static function createWebProfiler(ContainerInterface $container): WebProfilerContract + public static function createProfiler(ContainerInterface $container): ProfilerContract { self::resolveOptions($container); - $profiler = new WebProfiler($container->get(AssetsRenderer::class)); + $profiler = new Profiler($container->get(AssetsRenderer::class)); if (self::$options['enable']) { $profiler->enable(); @@ -109,13 +109,11 @@ public static function createWebProfiler(ContainerInterface $container): WebProf ); if ($container->has(UrlGeneratorContract::class)) { - // $profiler->setUrlGenerator( - // $container->get(UrlGeneratorContract::class) - // ); + $profiler->setUrlGenerator($container->get(UrlGeneratorContract::class)); } self::registerCollectorsFromConfig($container, $profiler); - self::registerCollectors($container, $profiler); + self::registerBaseCollectors($container, $profiler); return $profiler; } @@ -124,37 +122,52 @@ public static function createAssetsRenderer(ContainerInterface $container): Asse { self::resolveOptions($container); - return new AssetsRenderer( - self::$options['jquery_is_used'], - self::$options['path'] - ); + return new AssetsRenderer(self::$options['jquery_is_used'], self::$options['path']); } - public static function registerWebProfilerAssetsControllers(ContainerInterface $container): RouterContract + /** + * Register profiler asset controllers. + * + * @param \Interop\Container\ContainerInterface $container + * @param null|callable $getPrevious + * + * @return \Viserio\Component\Contracts\Routing\Router + */ + public static function registerProfilerAssetsControllers(ContainerInterface $container, ?callable $getPrevious = null): RouterContract { - $router = $container->get(RouterContract::class); - - $router->group( - [ - 'namespace' => 'Viserio\Component\WebProfiler\Controllers', - 'prefix' => 'webprofiler', - ], - function ($router) { - $router->get('assets/stylesheets', [ - 'uses' => 'AssetController@css', - 'as' => 'webprofiler.assets.css', - ]); - $router->get('assets/javascript', [ - 'uses' => 'AssetController@js', - 'as' => 'webprofiler.assets.js', - ]); - } - ); + $router = is_callable($getPrevious) ? $getPrevious() : $getPrevious; + + if ($router !== null) { + $router->group( + [ + 'namespace' => 'Viserio\Component\Profiler\Controllers', + 'prefix' => 'profiler', + ], + function ($router) { + $router->get('assets/stylesheets', [ + 'uses' => 'AssetController@css', + 'as' => 'profiler.assets.css', + ]); + $router->get('assets/javascript', [ + 'uses' => 'AssetController@js', + 'as' => 'profiler.assets.js', + ]); + } + ); + } return $router; } - protected static function registerCollectors(ContainerInterface $container, WebProfiler $profiler) + /** + * Register base collectors. + * + * @param \Interop\Container\ContainerInterface $container + * @param \Viserio\Component\Contracts\Profiler\Profiler $profiler + * + * @return void + */ + protected static function registerBaseCollectors(ContainerInterface $container, ProfilerContract $profiler): void { self::resolveOptions($container); @@ -177,9 +190,17 @@ protected static function registerCollectors(ContainerInterface $container, WebP } } - private static function registerCollectorsFromConfig(ContainerInterface $container, WebProfiler $profiler) + /** + * Register all found collectors in config. + * + * @param \Interop\Container\ContainerInterface $container + * @param \Viserio\Component\Contracts\Profiler\Profiler $profiler + * + * @return void + */ + private static function registerCollectorsFromConfig(ContainerInterface $container, ProfilerContract $profiler): void { - if (($collectors = self::$options['collectors']) !== null) { + if ($collectors = self::$options['collectors']) { foreach ($collectors as $collector) { $profiler->addCollector($container->get($collector)); } diff --git a/src/Viserio/Component/WebProfiler/Providers/WebProfilerSwiftMailerBridgeServiceProvider.php b/src/Viserio/Component/Profiler/Providers/ProfilerSwiftMailerBridgeServiceProvider.php similarity index 53% rename from src/Viserio/Component/WebProfiler/Providers/WebProfilerSwiftMailerBridgeServiceProvider.php rename to src/Viserio/Component/Profiler/Providers/ProfilerSwiftMailerBridgeServiceProvider.php index c79a4417b..b2aef1233 100644 --- a/src/Viserio/Component/WebProfiler/Providers/WebProfilerSwiftMailerBridgeServiceProvider.php +++ b/src/Viserio/Component/Profiler/Providers/ProfilerSwiftMailerBridgeServiceProvider.php @@ -1,14 +1,14 @@ [self::class, 'createWebProfiler'], + ProfilerContract::class => [self::class, 'createProfiler'], ]; } @@ -26,11 +26,11 @@ public function getServices() * @param \Interop\Container\ContainerInterface $container * @param null|callable $getPrevious * - * @return null|\Viserio\Component\Contracts\WebProfiler\WebProfiler + * @return null|\Viserio\Component\Contracts\Profiler\Profiler */ - public static function createWebProfiler(ContainerInterface $container, ?callable $getPrevious = null): ?WebProfilerContract + public static function createProfiler(ContainerInterface $container, ?callable $getPrevious = null): ?ProfilerContract { - $profiler = $getPrevious(); + $profiler = is_callable($getPrevious) ? $getPrevious() : $getPrevious; if ($profiler !== null) { $profiler->addCollector(new SwiftMailDataCollector( diff --git a/src/Viserio/Component/WebProfiler/Proxies/WebProfiler.php b/src/Viserio/Component/Profiler/Proxies/Profiler.php similarity index 64% rename from src/Viserio/Component/WebProfiler/Proxies/WebProfiler.php rename to src/Viserio/Component/Profiler/Proxies/Profiler.php index 099099bd3..81322d457 100644 --- a/src/Viserio/Component/WebProfiler/Proxies/WebProfiler.php +++ b/src/Viserio/Component/Profiler/Proxies/Profiler.php @@ -1,10 +1,10 @@ Viserio Profiler Component +
+ 
+ 
+ 
+ 
+ 
+
If you want to build an application using Narrowspark, visit the main [source](https://github.com/narrowspark/framework). + +Installation +------------- + +Use [Composer](https://getcomposer.org/) to install this package: + +```sh +composer require viserio/profiler +``` + +Official Documentation +------------- + +Documentation for the framework can be found on the [Narrowspark website](http://narrowspark.com/docs). + +Contributing +------------- +Issues for this package shall be posted on [Narrowspark framework issues](http://github.com/narrowspark/framework/issues).
+Thank you for considering contributing to the Narrowspark framework! The contribution guide can be found in the [Narrowspark contributing](/CONTRIBUTING.md). + +License +------------- + +The Narrowspark framework is open-sourced software licensed under the [MIT license](http://opensource.org/licenses/MIT). diff --git a/src/Viserio/Component/WebProfiler/Resources/css/ajax-requests.css b/src/Viserio/Component/Profiler/Resources/css/ajax-requests.css similarity index 53% rename from src/Viserio/Component/WebProfiler/Resources/css/ajax-requests.css rename to src/Viserio/Component/Profiler/Resources/css/ajax-requests.css index 3575f0df3..a85cdac75 100644 --- a/src/Viserio/Component/WebProfiler/Resources/css/ajax-requests.css +++ b/src/Viserio/Component/Profiler/Resources/css/ajax-requests.css @@ -1,50 +1,50 @@ -.webprofiler-menu-ajax-requests-data-collector { +.profiler-menu-ajax-requests-data-collector { display: none; } -.webprofiler-menu-ajax-requests-data-collector.ajax-request { +.profiler-menu-ajax-requests-data-collector.ajax-request { display: inline-block; } -.webprofiler-menu-ajax-requests-data-collector .webprofiler-menu-icon svg { +.profiler-menu-ajax-requests-data-collector .profiler-menu-icon svg { transform: rotate(90deg) scaleX(-1); } -.webprofiler-menu-ajax-requests-data-collector .webprofiler-ajax-requests { +.profiler-menu-ajax-requests-data-collector .profiler-ajax-requests { table-layout: auto; width: 100%; } -.webprofiler-menu-ajax-requests-data-collector .webprofiler-ajax-requests td { +.profiler-menu-ajax-requests-data-collector .profiler-ajax-requests td { background-color: #444; border-bottom: 1px solid #777; color: #F5F5F5; font-size: 12px; padding: 4px; } -.webprofiler-menu-ajax-requests-data-collector .webprofiler-ajax-requests tr:last-child td { +.profiler-menu-ajax-requests-data-collector .profiler-ajax-requests tr:last-child td { border-bottom: 0; } -.webprofiler-menu-ajax-requests-data-collector .webprofiler-ajax-requests th { +.profiler-menu-ajax-requests-data-collector .profiler-ajax-requests th { background-color: #222; border-bottom: 0; color: #AAA; font-size: 11px; padding: 4px; } -.webprofiler-menu-ajax-requests-data-collector .webprofiler-ajax-requests .ajax-request-url { +.profiler-menu-ajax-requests-data-collector .profiler-ajax-requests .ajax-request-url { max-width: 250px; line-height: 9px; overflow: hidden; text-overflow: ellipsis; } -.webprofiler-menu-ajax-requests-data-collector .webprofiler-ajax-requests .ajax-request-url a { +.profiler-menu-ajax-requests-data-collector .profiler-ajax-requests .ajax-request-url a { text-decoration: none; } -.webprofiler-menu-ajax-requests-data-collector .webprofiler-ajax-requests .ajax-request-url a:hover { +.profiler-menu-ajax-requests-data-collector .profiler-ajax-requests .ajax-request-url a:hover { text-decoration: underline; } -.webprofiler-menu-ajax-requests-data-collector .webprofiler-ajax-requests .ajax-request-duration { +.profiler-menu-ajax-requests-data-collector .profiler-ajax-requests .ajax-request-duration { text-align: right; } -.webprofiler-menu-ajax-requests-data-collector .webprofiler-ajax-requests .ajax-request-loading { +.profiler-menu-ajax-requests-data-collector .profiler-ajax-requests .ajax-request-loading { -webkit-animation: ns-blink .5s ease-in-out infinite; -o-animation: ns-blink .5s ease-in-out infinite; -moz-animation: ns-blink .5s ease-in-out infinite; diff --git a/src/Viserio/Component/Profiler/Resources/css/profiler-grid.css b/src/Viserio/Component/Profiler/Resources/css/profiler-grid.css new file mode 100644 index 000000000..8c7c0ccc8 --- /dev/null +++ b/src/Viserio/Component/Profiler/Resources/css/profiler-grid.css @@ -0,0 +1,31 @@ +.profiler * { + -webkit-box-sizing: content-box; + -moz-box-sizing: content-box; + box-sizing: content-box; + vertical-align: baseline; +} +.profiler .row:after, +.profiler .col:after, +.profiler .clearfix:after { + content: ""; + display: table; + clear: both; +} +.profiler .row { + display: -webkit-flex; + display: -ms-flexbox; + display: flex; +} +.profiler .col { + -webkit-flex: 1; + -ms-flex: 1; + flex: 1; +} +@media (max-width : 480px) { + .profiler .row { + display: block; + } + .profiler .col { + width: 100%; + } +} diff --git a/src/Viserio/Component/Profiler/Resources/css/profiler.css b/src/Viserio/Component/Profiler/Resources/css/profiler.css new file mode 100644 index 000000000..f7096ef84 --- /dev/null +++ b/src/Viserio/Component/Profiler/Resources/css/profiler.css @@ -0,0 +1,538 @@ +:root { + --profiler-font-color: #eee; + --profiler-second-font-color: #2b2a28; + --profiler-profiler-background-color: #212121; + --profiler-menu-background-active-color: #424242; + --profiler-status-default-color: #666; + --profiler-status-red-color: #b71c1c; + --profiler-status-yellow-color: #fdd835; + --profiler-status-green-color: #7cb342; + --profiler-tab-default-color: #424242; + --profiler-tab-active-color: #fff; + --profiler-tab-active-font-color: #2b2a28; + --profiler-tab-counter-color: #424242; + --profiler-table-head-background-color: #424242; + --profiler-table-body-background-color-even: #eee; + --profiler-table-body-background-color-odd: #fff; +} + +.profiler { + font: 11px -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', Helvetica, Arial, sans-serif; + + position: fixed; + right: 0; + bottom: 0; + left: 0; + + margin: 0; + padding: 0; + + text-align: left; + text-transform: none; + + /* neutralize the aliasing defined by external CSS styles */ + -webkit-font-smoothing: subpixel-antialiased; + -moz-osx-font-smoothing: auto; +} + + +.profiler ::-webkit-scrollbar-track { + background-color: #FFF; +} +.profiler ::-webkit-scrollbar { + width: 10px; + background-color: #F5F5F5; +} +.profiler ::-webkit-scrollbar-thumb { + background-color: var(--profiler-tab-default-color); +} + +.profiler .profiler-header.hide, +.profiler .profiler-body .profiler-panel .selected-content { + display: none; +} +.profiler .profiler-show-button.active, +.profiler .profiler-body.active, +.profiler .profiler-body .profiler-panel.active, +.profiler .profiler-body .profiler-panel .selected-content.active { + display: block; +} + +.profiler .profiler-header { + position: absolute; + z-index: 9999; + right: 0; + bottom: 0; + left: 0; + + background-color: var(--profiler-profiler-background-color); +} + +.profiler .profiler-show-button { + position: fixed; + z-index: 99999; + right: 0; + bottom: 0; + + display: none; + + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + height: 36px; + padding: 6px; + + cursor: pointer; + + border-top-left-radius: 4px; + background-color: var(--profiler-profiler-background-color); +} +.profiler .profiler-header .profiler-hide-button, +.profiler .profiler-body .profiler-body-close-panel, +.profiler .profiler-body .profiler-body-menu .profiler-body-resize-panel { + display: block; + float: right; + + width: 36px; + height: 36px; + + cursor: pointer; + text-align: center; + + background: var(--profiler-menu-background-active-color); +} +.profiler .profiler-header .profiler-hide-button svg, +.profiler .profiler-header .profiler-menus .profiler-menu svg { + position: relative; + top: 6px; + + max-height: 24px; +} + +.profiler .profiler-header .profiler-menus .profiler-menu { + display: block; + + height: 36px; + margin-right: 0; + + cursor: default; + white-space: nowrap; +} +.profiler .profiler-header .profiler-menus .profiler-menu .status-red, +.profiler .profiler-header .profiler-menus .profiler-menu .status-yellow, +.profiler .profiler-header .profiler-menus .profiler-menu .status-green { + display: inline-block; + + min-width: 15px; + min-height: 13px; + margin-bottom: 2px; + padding: 3px 6px; + + text-align: center; + vertical-align: middle; + + color: #fff; + background-color: var(--profiler-status-default-color); +} +.profiler .profiler-header .profiler-menus .profiler-menu .status-red + .status-red, +.profiler .profiler-header .profiler-menus .profiler-menu .status-yellow + .status-yellow, +.profiler .profiler-header .profiler-menus .profiler-menu .status-green + .status-green { + border-left: 5px solid #444; +} +.profiler .profiler-header .profiler-menus .profiler-menu .status-green { + background-color: var(--profiler-status-green-color); +} +.profiler .profiler-header .profiler-menus .profiler-menu .status-yellow { + color: #fff; + background-color: var(--profiler-status-yellow-color); +} +.profiler .profiler-header .profiler-menus .profiler-menu .status-red { + background-color: var(--profiler-status-red-color); +} +.profiler .profiler-header .profiler-menus .profiler-menu.active, +.profiler .profiler-header .profiler-menus .profiler-menu:hover { + position: relative; + z-index: 10002; + + background-color: var(--profiler-menu-background-active-color); +} +.profiler .profiler-header .profiler-menus .profiler-menu.profiler-menu-has-tooltip:hover { + cursor: help; +} +.profiler .profiler-header .profiler-menus .profiler-menu.profiler-menu-has-panel:hover { + cursor: pointer; +} +.profiler .profiler-header .profiler-menus .profiler-menu.profiler-menu-has-tooltip .profiler-menu-tooltip { + display: none; +} +.profiler .profiler-header .profiler-menus .profiler-menu.profiler-menu-has-tooltip:hover .profiler-menu-tooltip { + position: absolute; + bottom: 36px; + + display: block; + overflow: hidden; + overflow-y: auto; + + max-width: 480px; + max-height: 480px; + padding: 10px; + + word-wrap: break-word; + + background-color: var(--profiler-menu-background-active-color); +} +.profiler .profiler-header .profiler-menus .profiler-menu.profiler-menu-has-tooltip:hover .profiler-menu-tooltip .profiler-menu-tooltip-group { + margin-bottom: 4px; + padding-bottom: 4px; + + border-bottom: 1px solid #333; +} +.profiler .profiler-header .profiler-menus .profiler-menu.profiler-menu-has-tooltip:hover .profiler-menu-tooltip .profiler-menu-tooltip-group:last-child { + margin-bottom: 0; + padding-bottom: 0; + + border-bottom: none; +} +.profiler .profiler-header .profiler-menus .profiler-menu.profiler-menu-has-tooltip:hover .profiler-menu-tooltip .profiler-menu-tooltip-group-piece { + display: table-row; + + border-bottom: solid transparent 3px; +} +.profiler .profiler-header .profiler-menus .profiler-menu.profiler-menu-has-tooltip:hover .profiler-menu-tooltip .profiler-menu-tooltip-group b { + font-size: 11px; + + display: table-cell; + + padding: 4px 8px 4px 0; + + color: #aaa; +} +.profiler .profiler-header .profiler-menus .profiler-menu.profiler-menu-has-tooltip:hover .profiler-menu-tooltip .profiler-menu-tooltip-group span { + font-size: 12px; + + display: table-cell; + + color: var(--profiler-font-color); +} +.profiler .profiler-header .profiler-menus .profiler-menu.profiler-menu-has-tooltip:hover .profiler-menu-tooltip .profiler-menu-tooltip-group a { + color: #fff; +} +.profiler .profiler-header .profiler-menus .profiler-menu.profiler-menu-position-left.profiler-menu-has-tooltip:hover .profiler-menu-tooltip { + left: 0; +} +.profiler .profiler-header .profiler-menus .profiler-menu.profiler-menu-position-right.profiler-menu-has-tooltip:hover .profiler-menu-tooltip { + right: 0; +} +.profiler .profiler-header .profiler-menus .profiler-menu.profiler-menu-position-left { + float: left; +} +.profiler .profiler-header .profiler-menus .profiler-menu.profiler-menu-position-right { + float: right; +} +.profiler .profiler-header .profiler-menus .profiler-menu .profiler-menu-content { + line-height: 36px; + + display: block; + + height: 36px; +} +.profiler .profiler-header .profiler-menus .profiler-menu.profiler-menu-position-left .profiler-menu-content, +.profiler .profiler-header .profiler-menus .profiler-menu.profiler-menu-position-right .profiler-menu-content { + padding: 0 7px; +} +.profiler .profiler-header .profiler-menus .profiler-menu .profiler-menu-content .profiler-menu-icon, +.profiler .profiler-header .profiler-menus .profiler-menu .profiler-menu-content .profiler-menu-label, +.profiler .profiler-header .profiler-menus .profiler-menu .profiler-menu-content .profiler-menu-value { + font-size: 13px; + line-height: 36px; + + display: inline-block; + + padding: 0; + + color: var(--profiler-font-color); +} +.profiler .profiler-header .profiler-menus .profiler-menu .profiler-menu-icon .profiler-menu-value { + margin-left: 4px; +} + +.profiler .profiler-body { + position: relative; + z-index: 9998; + + display: none; + + height: 324px; + margin-bottom: 36px; + + background-color: var(--profiler-profiler-background-color); + color: var(--profiler-font-color); +} +.profiler .profiler-body pre { + font-family: 'SFMono-Regular', Consolas, 'Liberation Mono', Menlo, Courier, monospace; +} +.profiler .profiler-body pre.sf-dump, +.profiler .profiler-body pre.sf-dump .sf-dump-num, +.profiler .profiler-body pre.sf-dump .sf-dump-const, +.profiler .profiler-body pre.sf-dump .sf-dump-str, +.profiler .profiler-body pre.sf-dump .sf-dump-note, +.profiler .profiler-body pre.sf-dump .sf-dump-ref, +.profiler .profiler-body pre.sf-dump .sf-dump-public, +.profiler .profiler-body pre.sf-dump .sf-dump-protected, +.profiler .profiler-body pre.sf-dump .sf-dump-private, +.profiler .profiler-body pre.sf-dump .sf-dump-meta, +.profiler .profiler-body pre.sf-dump .sf-dump-key, +.profiler .profiler-body pre.sf-dump .sf-dump-index { + margin: 0; + padding: 0; + + color: #2b2a28; +} +.profiler .profiler-body .text-muted { + color: #999; +} +.profiler .profiler-body .profiler-panel { + display: none; + + height: 270px; +} +.profiler .profiler-body .profiler-panel.profiler-body-has-table, +.profiler .profiler-body .profiler-panel.profiler-body-has-selector, +.profiler .profiler-body .profiler-panel.profiler-body-has-metrics { + overflow-x: hidden; + overflow-y: auto; + + padding: 15px; +} +.profiler .profiler-body .profiler-panel .profiler-tabs { + position: relative; + + min-height: 180px; +} +.profiler .profiler-body .profiler-panel .profiler-tabs-tab label { + display: block; + + margin: 0 0 0 -1px; + padding: 10px 15px; + + cursor: pointer; + text-align: center; + + color: #fff; + border-bottom: 3px solid #fff; + background: var(--profiler-tab-default-color); +} +.profiler .profiler-body .profiler-panel .profiler-tabs-tab label span.counter { + display: inline-block; + + min-width: 15px; + min-height: 13px; + margin-bottom: 2px; + margin-left: 10px; + padding: 2px 6px 3px 6px; + + text-align: center; + vertical-align: middle; + + color: var(--profiler-tab-active-font-color); + background-color: #fff; +} +.profiler .profiler-body .profiler-panel .profiler-tabs-tab [type=radio] { + position: absolute; + + overflow: hidden; + clip: rect(0, 0, 0, 0); + + width: 0; + height: 0; +} +.profiler .profiler-body .profiler-panel .profiler-tabs-tab [type=radio]:focus + label { + /* */ +} +.profiler .profiler-body .profiler-panel .profiler-tabs-tab-content { + position: absolute; + right: 0; + left: 0; + + overflow-y: auto; + + height: 247px; + padding: 15px 15px 0 15px; + + opacity: 0; +} +.profiler .profiler-body .profiler-panel .profiler-tabs .profiler-tabs-tab [type=radio]:checked ~ label { + z-index: 2; + + color: var(--profiler-tab-active-font-color); + background: var(--profiler-tab-active-color); +} +.profiler .profiler-body .profiler-panel .profiler-tabs .profiler-tabs-tab [type=radio]:checked ~ label span.counter { + color: var(--profiler-tab-active-color); + background: var(--profiler-tab-counter-color); +} +.profiler .profiler-body .profiler-panel .profiler-tabs .profiler-tabs-tab [type=radio]:checked ~ label ~ .profiler-tabs-tab-content { + z-index: 1; + opacity: 1; +} + +.profiler .profiler-body h3:first-child { + margin-top: 0; +} + +.profiler .profiler-body .profiler-panel table tr:nth-child(even) { + background: var(--profiler-table-body-background-color-even); +} +.profiler .profiler-body .profiler-panel table tr:nth-child(odd) { + background: var(--profiler-table-body-background-color-odd); +} +.profiler .profiler-body .profiler-panel table, +.profiler .profiler-body .profiler-panel tr, +.profiler .profiler-body .profiler-panel th, +.profiler .profiler-body .profiler-panel td { + line-height: 1.5; + border-collapse: collapse; + vertical-align: top; +} +.profiler .profiler-body .profiler-panel table { + width: 100%; + margin: 0; + box-shadow: 0 0 1px rgba(128, 128, 128, .2); +} +.profiler .profiler-body .profiler-panel table:last-child { + margin-bottom: 25px; +} +.profiler .profiler-body .profiler-panel table + table { + margin-top: 30px; +} + +.profiler .profiler-body .profiler-panel table th, +.profiler .profiler-body .profiler-panel table td { + padding: 8px 10px; +} +.profiler .profiler-body .profiler-panel table th { + font-weight: bold; + + text-align: left; +} +.profiler .profiler-body .profiler-panel table thead th { + color: #fff; + background-color: var(--profiler-table-head-background-color); +} +.profiler .profiler-body .profiler-panel table thead th.key { + width: 19%; +} +.profiler .profiler-body .profiler-panel table tbody th, +.profiler .profiler-body .profiler-panel table tbody td { + font-family: 'SFMono-Regular', Consolas, 'Liberation Mono', Menlo, Courier, monospace; + font-size: 13px; + font-size-adjust: .5; + + color: #2b2a28; + border: 1px solid var(--profiler-table-body-background-color-odd); + border-width: 1px 0; +} +.profiler .profiler-body .profiler-panel table tbody td { + word-break: break-all; + -ms-word-break: break-all; + -webkit-hyphens: auto; + -moz-hyphens: auto; + hyphens: auto; +} +.profiler .profiler-body .profiler-panel table tbody div { + margin: .25em 0; +} +.profiler .profiler-body .profiler-panel table tbody ul { + margin: 0; + padding: 0 0 0 1em; +} +.profiler .profiler-body .profiler-panel .empty { + font-size: 16px; + font-weight: bold; + + margin: 1em 0; + padding: .5em 2em; + + text-align: center; + + color: #fff; + border: 4px dashed var(--profiler-table-body-background-color-odd); +} + +.profiler .profiler-body .profiler-panel .metrics { + overflow: auto; + + margin: 0; + padding: 0; + + list-style: none; +} +.profiler .profiler-body .profiler-panel .metrics .metric { + display: inline-block; + + min-width: 100px; + min-height: 65px; + margin: 0 1em 1em 0; + + background: #fff; + box-shadow: 0 0 1px rgba(128, 128, 128, .2); +} +.profiler .profiler-body .profiler-panel .metrics .metric .value { + font-size: 28px; + + display: block; + + padding: 8px 15px 4px; + + text-align: center; + + color: #2b2a28; +} +.profiler .profiler-body .profiler-panel .metrics .metric .label { + font-size: 12px; + + display: block; + + padding: 5px; + + text-align: center; + + color: #fff; + background: #444; +} + +.profiler .profiler-body .profiler-panel select { + font-weight: bold; + + width: 100%; + margin-bottom: 15px; + padding: 10px 0; + + cursor: pointer; + + border: 0; +} + +.profiler .profiler-body .profiler-body-menu { + height: 24px; + + border-bottom: 1px solid #383838; + background-color: #222; + box-shadow: 0 1px 0 rgba(0, 0, 0, .2); +} +.profiler .profiler-body .profiler-body-menu .profiler-body-close-panel, +.profiler .profiler-body .profiler-body-menu .profiler-body-resize-panel { + float: right; + + width: 24px; + height: 24px; +} +.profiler .profiler-body .profiler-body-menu .profiler-body-resize-panel.orginal-size-panel svg { + transform: rotate(180deg); +} + +@media (max-width: 768px) { + .profiler .profiler-header .profiler-menus .profiler-menu .profiler-menu-content .profiler-menu-value { + display: none; + } +} diff --git a/src/Viserio/Component/WebProfiler/Resources/icons/LICENSE b/src/Viserio/Component/Profiler/Resources/icons/LICENSE similarity index 100% rename from src/Viserio/Component/WebProfiler/Resources/icons/LICENSE rename to src/Viserio/Component/Profiler/Resources/icons/LICENSE diff --git a/src/Viserio/Component/WebProfiler/Resources/icons/ic_clear_white_24px.svg b/src/Viserio/Component/Profiler/Resources/icons/ic_clear_white_24px.svg similarity index 100% rename from src/Viserio/Component/WebProfiler/Resources/icons/ic_clear_white_24px.svg rename to src/Viserio/Component/Profiler/Resources/icons/ic_clear_white_24px.svg diff --git a/src/Viserio/Component/WebProfiler/Resources/icons/ic_insert_drive_file_white_24px.svg b/src/Viserio/Component/Profiler/Resources/icons/ic_insert_drive_file_white_24px.svg similarity index 100% rename from src/Viserio/Component/WebProfiler/Resources/icons/ic_insert_drive_file_white_24px.svg rename to src/Viserio/Component/Profiler/Resources/icons/ic_insert_drive_file_white_24px.svg diff --git a/src/Viserio/Component/WebProfiler/Resources/icons/ic_keyboard_arrow_down_white_24px.svg b/src/Viserio/Component/Profiler/Resources/icons/ic_keyboard_arrow_down_white_24px.svg similarity index 100% rename from src/Viserio/Component/WebProfiler/Resources/icons/ic_keyboard_arrow_down_white_24px.svg rename to src/Viserio/Component/Profiler/Resources/icons/ic_keyboard_arrow_down_white_24px.svg diff --git a/src/Viserio/Component/WebProfiler/Resources/icons/ic_keyboard_arrow_up_white_24px.svg b/src/Viserio/Component/Profiler/Resources/icons/ic_keyboard_arrow_up_white_24px.svg similarity index 100% rename from src/Viserio/Component/WebProfiler/Resources/icons/ic_keyboard_arrow_up_white_24px.svg rename to src/Viserio/Component/Profiler/Resources/icons/ic_keyboard_arrow_up_white_24px.svg diff --git a/src/Viserio/Component/WebProfiler/Resources/icons/ic_layers_white_24px.svg b/src/Viserio/Component/Profiler/Resources/icons/ic_layers_white_24px.svg similarity index 100% rename from src/Viserio/Component/WebProfiler/Resources/icons/ic_layers_white_24px.svg rename to src/Viserio/Component/Profiler/Resources/icons/ic_layers_white_24px.svg diff --git a/src/Viserio/Component/Profiler/Resources/icons/ic_library_books_white_24px.svg b/src/Viserio/Component/Profiler/Resources/icons/ic_library_books_white_24px.svg new file mode 100644 index 000000000..f53d67bf8 --- /dev/null +++ b/src/Viserio/Component/Profiler/Resources/icons/ic_library_books_white_24px.svg @@ -0,0 +1,4 @@ + diff --git a/src/Viserio/Component/WebProfiler/Resources/icons/ic_mail_outline_white_24px.svg b/src/Viserio/Component/Profiler/Resources/icons/ic_mail_outline_white_24px.svg similarity index 100% rename from src/Viserio/Component/WebProfiler/Resources/icons/ic_mail_outline_white_24px.svg rename to src/Viserio/Component/Profiler/Resources/icons/ic_mail_outline_white_24px.svg diff --git a/src/Viserio/Component/WebProfiler/Resources/icons/ic_memory_white_24px.svg b/src/Viserio/Component/Profiler/Resources/icons/ic_memory_white_24px.svg similarity index 100% rename from src/Viserio/Component/WebProfiler/Resources/icons/ic_memory_white_24px.svg rename to src/Viserio/Component/Profiler/Resources/icons/ic_memory_white_24px.svg diff --git a/src/Viserio/Component/WebProfiler/Resources/icons/ic_message_white_24px.svg b/src/Viserio/Component/Profiler/Resources/icons/ic_message_white_24px.svg similarity index 100% rename from src/Viserio/Component/WebProfiler/Resources/icons/ic_message_white_24px.svg rename to src/Viserio/Component/Profiler/Resources/icons/ic_message_white_24px.svg diff --git a/src/Viserio/Component/WebProfiler/Resources/icons/ic_narrowspark_white_24px.svg b/src/Viserio/Component/Profiler/Resources/icons/ic_narrowspark_white_24px.svg similarity index 100% rename from src/Viserio/Component/WebProfiler/Resources/icons/ic_narrowspark_white_24px.svg rename to src/Viserio/Component/Profiler/Resources/icons/ic_narrowspark_white_24px.svg diff --git a/src/Viserio/Component/WebProfiler/Resources/icons/ic_repeat_white_24px.svg b/src/Viserio/Component/Profiler/Resources/icons/ic_repeat_white_24px.svg similarity index 100% rename from src/Viserio/Component/WebProfiler/Resources/icons/ic_repeat_white_24px.svg rename to src/Viserio/Component/Profiler/Resources/icons/ic_repeat_white_24px.svg diff --git a/src/Viserio/Component/WebProfiler/Resources/icons/ic_schedule_white_24px.svg b/src/Viserio/Component/Profiler/Resources/icons/ic_schedule_white_24px.svg similarity index 100% rename from src/Viserio/Component/WebProfiler/Resources/icons/ic_schedule_white_24px.svg rename to src/Viserio/Component/Profiler/Resources/icons/ic_schedule_white_24px.svg diff --git a/src/Viserio/Component/WebProfiler/Resources/icons/ic_storage_white_24px.svg b/src/Viserio/Component/Profiler/Resources/icons/ic_storage_white_24px.svg similarity index 100% rename from src/Viserio/Component/WebProfiler/Resources/icons/ic_storage_white_24px.svg rename to src/Viserio/Component/Profiler/Resources/icons/ic_storage_white_24px.svg diff --git a/src/Viserio/Component/Profiler/Resources/js/ajaxHandler.js b/src/Viserio/Component/Profiler/Resources/js/ajaxHandler.js new file mode 100644 index 000000000..dfc7d3ad0 --- /dev/null +++ b/src/Viserio/Component/Profiler/Resources/js/ajaxHandler.js @@ -0,0 +1,13 @@ +/** + * AjaxHandler + * + * Extract data from headers of an XMLHttpRequest and adds a new dataset + */ +var AjaxHandler = Profiler.AjaxHandler = function(Profiler, headerName) { + this.profiler = Profiler; + this.headerName = headerName || 'Profiler'; +}; + +Profiler.$.extend(AjaxHandler.prototype, { + +}); diff --git a/src/Viserio/Component/WebProfiler/Resources/js/webprofiler.js b/src/Viserio/Component/Profiler/Resources/js/profiler.js similarity index 61% rename from src/Viserio/Component/WebProfiler/Resources/js/webprofiler.js rename to src/Viserio/Component/Profiler/Resources/js/profiler.js index 2ccdbabd4..ceb23af89 100644 --- a/src/Viserio/Component/WebProfiler/Resources/js/webprofiler.js +++ b/src/Viserio/Component/Profiler/Resources/js/profiler.js @@ -1,8 +1,8 @@ -if (typeof(WebProfiler) == 'undefined') { +if (typeof(Profiler) == 'undefined') { // namespace - var WebProfiler = {}; + var Profiler = {}; - WebProfiler.$ = Zepto; + Profiler.$ = Zepto; } (function($) { @@ -21,10 +21,11 @@ if (typeof(WebProfiler) == 'undefined') { var openPanel = false; // helper vars for long class names - var panelBodyClass = '.webprofiler .webprofiler-body'; - var panelClass = panelBodyClass + ' .webprofiler-panel'; - var menuHasPanel = '.webprofiler .webprofiler-header .webprofiler-menus .webprofiler-menu.webprofiler-menu-has-panel'; - var bodyMenu = panelBodyClass + ' .webprofiler-body-menu'; + var panelBodyClass = '.profiler .profiler-body'; + var panelClass = panelBodyClass + ' .profiler-panel'; + var menuHasPanel = '.profiler .profiler-header .profiler-menus .profiler-menu.profiler-menu-has-panel'; + var bodyMenu = panelBodyClass + ' .profiler-body-menu'; + var profilerHeader = '.profiler .profiler-header'; var getPreference = function(name) { if (!window.localStorage) { return null; @@ -41,14 +42,14 @@ if (typeof(WebProfiler) == 'undefined') { }; var resizeBodyAndTabContent = function(panelHeight, tabContentHeight) { $(panelBodyClass).height(panelHeight); - $('.webprofiler-tabs-tab-content').height(tabContentHeight); + $('.profiler-tabs-tab-content').height(tabContentHeight); setPreference('panelHeight', panelHeight); setPreference('tabContentHeight', tabContentHeight); }; // Symfony VarDumper: Close the by default expanded objects - WebProfiler.symfony = function() { + Profiler.symfony = function() { $('.sf-dump-expanded') .removeClass('sf-dump-expanded') .addClass('sf-dump-compact'); @@ -57,7 +58,7 @@ if (typeof(WebProfiler) == 'undefined') { }; // Toggle Panel - WebProfiler.toggle = function() { + Profiler.toggle = function() { $(menuHasPanel).on('click', function(e) { e.preventDefault(); @@ -90,36 +91,36 @@ if (typeof(WebProfiler) == 'undefined') { }); }; - WebProfiler.openCloseHandler = function() { - // close webprofiler-body panel - $(bodyMenu + ' .webprofiler-body-close-panel').on('click', function(e) { + Profiler.openCloseHandler = function() { + // close profiler-body panel + $(bodyMenu + ' .profiler-body-close-panel').on('click', function(e) { $(menuHasPanel + ', ' + panelBodyClass + ', ' + openPanel).removeClass('active'); openPanel = false; }); - // close webprofiler button - $('.webprofiler .webprofiler-header .webprofiler-hide-button').on('click', function(e) { + // close button + $('.profiler .profiler-header .profiler-hide-button').on('click', function(e) { e.preventDefault(); openPanel = false; - $('.webprofiler .webprofiler-body, ' + panelClass).removeClass('active'); - $('.webprofiler .webprofiler-header').addClass('hide'); - $('.webprofiler .webprofiler-show-button').addClass('active'); + $('.profiler .profiler-body, ' + panelClass).removeClass('active'); + $(profilerHeader).addClass('hide'); + $('.profiler .profiler-show-button').addClass('active'); }); // open button - $('.webprofiler .webprofiler-show-button').on('click', function(e) { + $('.profiler .profiler-show-button').on('click', function(e) { e.preventDefault(); - $('.webprofiler .webprofiler-header').removeClass('hide'); - $('.webprofiler .webprofiler-show-button').removeClass('active'); + $(profilerHeader).removeClass('hide'); + $('.profiler .profiler-show-button').removeClass('active'); }); }; // select content - WebProfiler.selectContent = function() { + Profiler.selectContent = function() { var selected = $(panelClass + ' .content-selector option').not(function () { return !this.selected; }); @@ -139,21 +140,22 @@ if (typeof(WebProfiler) == 'undefined') { }); }; - WebProfiler.resize = function() { + Profiler.resize = function() { var resizeIsActive = false; - var panelHeight = $(window).height() - 38; - var tabContentHeight = $(panelBodyClass).height() - 87; - $(bodyMenu + ' .webprofiler-body-resize-panel').on('click', function(e) { + $(bodyMenu + ' .profiler-body-resize-panel').on('click', function (e) { if (resizeIsActive) { resizeIsActive = false; $(panelBodyClass).height(null); - $('.webprofiler-tabs-tab-content').height(null); + $(panelClass + ' .profiler-tabs .profiler-tabs-tab-content').height(null); $(this).removeClass('orginal-size-panel'); } else { + var panelHeight = $(window).height() - 38; + var contentHeight = $(window).height() - $(panelClass + ' .profiler-tabs').height() + ($(profilerHeader).height() + $(bodyMenu).height()); + resizeIsActive = true; - resizeBodyAndTabContent(panelHeight, tabContentHeight); + resizeBodyAndTabContent(panelHeight, $(window).height() + $(bodyMenu).height() - $(panelClass + ' .profiler-tabs').height() + $(profilerHeader).height() + 4); $(this).addClass('orginal-size-panel'); } @@ -161,19 +163,22 @@ if (typeof(WebProfiler) == 'undefined') { $(window).resize(function() { if (resizeIsActive) { - resizeBodyAndTabContent(panelHeight, tabContentHeight); + var panelHeight = $(window).height() - 38; + var contentHeight = $(window).height() - $(panelClass + ' .profiler-tabs').height() + ($(profilerHeader).height() + $(bodyMenu).height()); + + resizeBodyAndTabContent(panelHeight, contentHeight); } }); }; - WebProfiler.restoreState = function() { + Profiler.restoreState = function() { }; -})(WebProfiler.$); - -WebProfiler.$(function() { - WebProfiler.symfony(); - WebProfiler.toggle(); - WebProfiler.openCloseHandler(); - WebProfiler.selectContent(); - WebProfiler.resize(); +})(Profiler.$); + +Profiler.$(function() { + Profiler.symfony(); + Profiler.toggle(); + Profiler.openCloseHandler(); + Profiler.selectContent(); + Profiler.resize(); }); diff --git a/src/Viserio/Component/WebProfiler/Resources/js/zepto.min.js b/src/Viserio/Component/Profiler/Resources/js/zepto.min.js similarity index 100% rename from src/Viserio/Component/WebProfiler/Resources/js/zepto.min.js rename to src/Viserio/Component/Profiler/Resources/js/zepto.min.js diff --git a/src/Viserio/Component/Profiler/Resources/views/profiler.html.php b/src/Viserio/Component/Profiler/Resources/views/profiler.html.php new file mode 100644 index 000000000..8c20c904c --- /dev/null +++ b/src/Viserio/Component/Profiler/Resources/views/profiler.html.php @@ -0,0 +1,69 @@ + + diff --git a/src/Viserio/Component/WebProfiler/TemplateManager.php b/src/Viserio/Component/Profiler/TemplateManager.php similarity index 85% rename from src/Viserio/Component/WebProfiler/TemplateManager.php rename to src/Viserio/Component/Profiler/TemplateManager.php index 92bbb2828..8ddefb23b 100644 --- a/src/Viserio/Component/WebProfiler/TemplateManager.php +++ b/src/Viserio/Component/Profiler/TemplateManager.php @@ -1,10 +1,10 @@ collectors as $name => $collector) { + $collector = $collector['collector']; + if ($collector instanceof TooltipAwareContract) { $data['menus'][$collector->getName()] = [ 'menu' => $collector->getMenu(), @@ -140,14 +142,14 @@ public function getSortedData(): array $panel = $collector->getPanel(); // @codeCoverageIgnoreStart - if (mb_strpos($panel, '
') !== false) {
- $class = ' webprofiler-body-has-table';
+ $class = ' profiler-body-has-metrics';
+ } elseif (mb_strpos($panel, '') !== false) {
+ $class = ' profiler-body-has-table';
}
// @codeCoverageIgnoreEnd
diff --git a/src/Viserio/Component/WebProfiler/Tests/AssetsRendererTest.php b/src/Viserio/Component/Profiler/Tests/AssetsRendererTest.php
similarity index 55%
rename from src/Viserio/Component/WebProfiler/Tests/AssetsRendererTest.php
rename to src/Viserio/Component/Profiler/Tests/AssetsRendererTest.php
index e7ae580ab..4987e070f 100644
--- a/src/Viserio/Component/WebProfiler/Tests/AssetsRendererTest.php
+++ b/src/Viserio/Component/Profiler/Tests/AssetsRendererTest.php
@@ -1,13 +1,13 @@
setIcon('ic_clear_white_24px.svg', __DIR__ . 'Fixture/Icons/');
- static::assertSame(self::normalizePath(__DIR__ . 'Fixture/Icons/ic_clear_white_24px.svg'), $assets->getIcons()['ic_clear_white_24px.svg']);
+ self::assertSame(self::normalizePath(__DIR__ . 'Fixture/Icons/ic_clear_white_24px.svg'), $assets->getIcons()['ic_clear_white_24px.svg']);
}
public function testSetAndGetIgnoredCollectors()
@@ -28,51 +28,56 @@ public function testSetAndGetIgnoredCollectors()
$assets->setIgnoredCollector('test');
- static::assertSame('test', $assets->getIgnoredCollectors()[0]);
+ self::assertSame('test', $assets->getIgnoredCollectors()[0]);
}
public function testGetAssets()
{
- $profiler = $this->mock(WebProfilerContract::class);
+ $profiler = $this->mock(ProfilerContract::class);
$profiler->shouldReceive('getCollectors')
->twice()
->andReturn([]);
$assets = new AssetsRenderer(false, __DIR__);
- $assets->setWebProfiler($profiler);
+ $assets->setProfiler($profiler);
$cssAssets = [
- __DIR__ . '/css/webprofiler.css',
- __DIR__ . '/css/webprofiler-grid.css',
+ __DIR__ . '/css/profiler.css',
+ __DIR__ . '/css/profiler-grid.css',
];
$jsAssets = [
__DIR__ . '/js/zepto.min.js',
- __DIR__ . '/js/webprofiler.js',
+ __DIR__ . '/js/profiler.js',
];
- static::assertSame($cssAssets, $assets->getAssets('css'));
- static::assertSame($jsAssets, $assets->getAssets('js'));
+ self::assertSame($cssAssets, $assets->getAssets('css'));
+ self::assertSame($jsAssets, $assets->getAssets('js'));
}
public function testGetAssetsFromCollectors()
{
- $profiler = $this->mock(WebProfilerContract::class);
+ $profiler = $this->mock(ProfilerContract::class);
$profiler->shouldReceive('getCollectors')
->once()
- ->andReturn([new AjaxRequestsDataCollector()]);
+ ->andReturn([
+ 'ajax' => [
+ 'collector' => new AjaxRequestsDataCollector(),
+ 'priority' => 100,
+ ],
+ ]);
$assets = new AssetsRenderer(true, __DIR__);
- $assets->setWebProfiler($profiler);
+ $assets->setProfiler($profiler);
$cssAssets = [
- __DIR__ . '/css/webprofiler.css',
- __DIR__ . '/css/webprofiler-grid.css',
+ __DIR__ . '/css/profiler.css',
+ __DIR__ . '/css/profiler-grid.css',
str_replace('Tests', 'DataCollectors', __DIR__) . '/../Resources/css/ajax-requests.css',
];
$jsAssets = [
- __DIR__ . '/js/webprofiler.js',
+ __DIR__ . '/js/profiler.js',
str_replace('Tests', 'DataCollectors', __DIR__) . '/../Resources/js/ajaxHandler.js',
];
- static::assertSame([$cssAssets, $jsAssets], $assets->getAssets());
+ self::assertSame([$cssAssets, $jsAssets], $assets->getAssets());
}
public function testRenderWithUrlGenerator()
@@ -84,15 +89,15 @@ public function testRenderWithUrlGenerator()
$generator->shouldReceive('generate')
->once()
->andReturn('path_js');
- $profiler = $this->mock(WebProfilerContract::class);
+ $profiler = $this->mock(ProfilerContract::class);
$profiler->shouldReceive('getUrlGenerator')
->once()
->andReturn($generator);
$profiler->shouldReceive('getCollectors')
->twice();
$assets = new AssetsRenderer();
- $assets->setWebProfiler($profiler);
+ $assets->setProfiler($profiler);
- static::assertSame('', $assets->render());
+ self::assertSame('', $assets->render());
}
}
diff --git a/src/Viserio/Component/Profiler/Tests/DataCollectors/Bridge/Cache/Psr6Psr16CacheDataCollectorTest.php b/src/Viserio/Component/Profiler/Tests/DataCollectors/Bridge/Cache/Psr6Psr16CacheDataCollectorTest.php
new file mode 100644
index 000000000..3b3d97c34
--- /dev/null
+++ b/src/Viserio/Component/Profiler/Tests/DataCollectors/Bridge/Cache/Psr6Psr16CacheDataCollectorTest.php
@@ -0,0 +1,62 @@
+getPsr6CacheDataCollector();
+
+ self::assertSame(
+ [
+ 'icon' => 'ic_layers_white_24px.svg',
+ 'label' => '0 in',
+ 'value' => '0μs',
+ ],
+ $collector->getMenu()
+ );
+ }
+
+ public function testGetTooltip()
+ {
+ $collector = $this->getPsr6CacheDataCollector();
+
+ self::assertSame(
+ '',
+ $collector->getTooltip()
+ );
+ }
+
+ private function removeTabId(string $html): string
+ {
+ return trim(preg_replace('/="tab-0(.*?)"/', '', $html));
+ }
+
+ private function getPsr6CacheDataCollector()
+ {
+ $collector = new Psr6Psr16CacheDataCollector();
+ $collector->addPool(new TraceableCacheItemDecorator(new ArrayCachePool()));
+ $collector->collect(
+ $this->mock(ServerRequestInterface::class),
+ $this->mock(ResponseInterface::class)
+ );
+
+ return $collector;
+ }
+
+ private function removeSymfonyVarDumper(string $html): string
+ {
+ $html = preg_replace('/
| Key | Value |
|---|---|
"test value"
+
+ |
test
| Key | Value |
|---|---|
| test key | "test value"
+
+ |