fix filter debug bar

contributte · Aug 5, 2021 · b7c7634 · b7c7634
1 parent 92cab08
commit b7c7634
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/src/Bridge/Nette/DI/ImageStorageExtension.php b/src/Bridge/Nette/DI/ImageStorageExtension.php
@@ -16,7 +16,9 @@
 use Contributte\Imagist\Bridge\Nette\Tracy\ImagistBlueScreen;
 use Contributte\Imagist\Database\DatabaseConverter;
 use Contributte\Imagist\Database\DatabaseConverterInterface;
+use Contributte\Imagist\Debugger\FilterDebugger;
 use Contributte\Imagist\Debugger\FilterDebuggerInterface;
+use Contributte\Imagist\Debugger\FilterDebuggerProviderInterface;
 use Contributte\Imagist\File\FileFactory;
 use Contributte\Imagist\File\FileFactoryInterface;
 use Contributte\Imagist\Filesystem\FilesystemInterface;
@@ -342,14 +344,18 @@ private function loadDebugger(ContainerBuilder $builder): void
 				->setAutowired(false);
 		}
 
-		$bar = $builder->addDefinition($this->prefix('tracy.filter.bar'))
+		$builder->addDefinition($this->prefix('tracy.filter.bar'))
 			->setType(IBarPanel::class)
-			->setFactory(FilterBarPanel::class, [[]])
+			->setFactory(FilterBarPanel::class)
 			->setAutowired(false);
 
+		$debugger = $builder->addDefinition($this->prefix('tracy.filter.bar.debugger'))
+			->setType(FilterDebuggerInterface::class)
+			->setFactory(FilterDebugger::class);
+
 		$this->onBeforeCompile[] = fn () => $this->foreach(
-			$builder->findByType(FilterDebuggerInterface::class),
-			fn (Definition $definition) => $bar->addSetup('addProvider', [$definition])
+			$builder->findByType(FilterDebuggerProviderInterface::class),
+			fn (Definition $definition) => $debugger->addSetup('addProvider', [$definition])
 		);
 	}
 

diff --git a/src/Bridge/Nette/Tracy/assets/config.filter.panel.phtml b/src/Bridge/Nette/Tracy/assets/config.filter.panel.phtml
@@ -11,10 +11,10 @@
 			</thead>
 			<tbody>
 				<?php
-					use Contributte\Imagist\Config\ConfigFilterOperation;
-					use Contributte\Imagist\Config\ConfigFilter;
+					use Contributte\Imagist\Debugger\DebugFilterObject;
+					use Contributte\Imagist\Debugger\DebugFilterOperationObject;
 
-					/** @var ConfigFilter $filter */
+					/** @var DebugFilterObject $filter */
 					foreach ($this->getFilters() as $filter):
 				?>
 				<tr>
@@ -23,7 +23,7 @@
 					implode(
 						'<br>',
 						array_map(
-							fn (ConfigFilterOperation $op) =>
+							fn (DebugFilterOperationObject $op) =>
 								$op->getName() . ($op->getArguments() ? '(' . implode(', ', $op->getArguments()) . ')' : '') . ($op->getDescription() ? ' - ' . $op->getDescription() : ''),
 							$filter->getOperations()
 						)

diff --git a/src/Bridge/Nette/Tracy/assets/config.filter.tab.phtml b/src/Bridge/Nette/Tracy/assets/config.filter.tab.phtml
@@ -26,4 +26,4 @@
 	c33.01,0,60.02,27.01,60.02,60.02S304.015,120.04,271.005,120.04z"/>
 </svg>
 
-Filters (<?= iterator_count($this->getFilters()) ?>)
+Filters (<?= count($this->getFilters()) ?>)