Skip to content

IBX-9697: Added priority attribute to ibexa data collector #517

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mikadamczyk merged 8 commits into from
Mar 28, 2025
Merged

IBX-9697: Added priority attribute to ibexa data collector #517

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8651403
Adding priority to ibexa data collector
Mar 25, 2025
a827d86
Fixing CI
Mar 25, 2025
cf1b500
Fixing cs
Mar 25, 2025
8f6c7bb
Fixing CI
Mar 25, 2025
ed81bb2
Fixing CI
Mar 25, 2025
f8b33f5
Fixing after CR
Mar 26, 2025
fa6b6fa
Fixing after CR
Mar 26, 2025
fe0df5d
Fixing after CR
Mar 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixing after CR
  • Loading branch information
MateuszKolankowski committed Mar 26, 2025
commit f8b33f5db724367873d8920577c27f67f53553d0
3 changes: 2 additions & 1 deletion src/bundle/Debug/DependencyInjection/Compiler/DataCollectorPass.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@
}
}

usort($collectors, static fn ($a, $b) => $b['priority'] <=> $a['priority']);
/** @var array<int, mixed> $collectors */
usort($collectors, static fn (array $a, array $b): int => $b['priority'] <=> $a['priority']);

Check failure on line 38 in src/bundle/Debug/DependencyInjection/Compiler/DataCollectorPass.php

View workflow job for this annotation

GitHub Actions / Unit tests & SQLite integration tests (7.4) 

PHPDoc tag @var with type array<int, mixed> is not subtype of native type list<array{id: mixed, priority: mixed, panelTemplate: mixed, toolbarTemplate: mixed}>.

Check failure on line 38 in src/bundle/Debug/DependencyInjection/Compiler/DataCollectorPass.php

View workflow job for this annotation

GitHub Actions / Unit tests & SQLite integration tests (8.0) 

PHPDoc tag @var with type array<int, mixed> is not subtype of native type list<array{id: mixed, priority: mixed, panelTemplate: mixed, toolbarTemplate: mixed}>.

Check failure on line 38 in src/bundle/Debug/DependencyInjection/Compiler/DataCollectorPass.php

View workflow job for this annotation

GitHub Actions / Unit tests & SQLite integration tests (8.1) 

PHPDoc tag @var with type array<int, mixed> is not subtype of native type list<array{id: mixed, priority: mixed, panelTemplate: mixed, toolbarTemplate: mixed}>.

foreach ($collectors as $collector) {
$dataCollectorDef->addMethodCall('addCollector', [
Expand Down
41 changes: 31 additions & 10 deletions tests/bundle/Debug/DependencyInjection/Compiler/DataCollectorPassTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,23 +28,44 @@ protected function registerCompilerPass(ContainerBuilder $container): void

public function testAddCollector()
{
$panelTemplate = 'panel.html.twig';
$toolbarTemplate = 'toolbar.html.twig';
$definition = new Definition();
$definition->addTag(
'ibexa.debug.data_collector',
['panelTemplate' => $panelTemplate, 'toolbarTemplate' => $toolbarTemplate]
);
$defA = new Definition();
$defA->addTag('ibexa.debug.data_collector', [
'panelTemplate' => 'panel_a.html.twig',
'toolbarTemplate' => 'toolbar_a.html.twig',
'priority' => 5,
]);
$this->setDefinition('collector_a', $defA);

$defB = new Definition();
$defB->addTag('ibexa.debug.data_collector', [
'panelTemplate' => 'panel_b.html.twig',
'toolbarTemplate' => 'toolbar_b.html.twig',
'priority' => 10,
]);
$this->setDefinition('collector_b', $defB);

$serviceId = 'service_id';
$this->setDefinition($serviceId, $definition);
$this->compile();

$this->assertContainerBuilderHasServiceDefinitionWithMethodCall(
IbexaCoreCollector::class,
'addCollector',
[new Reference($serviceId), $panelTemplate, $toolbarTemplate]
[new Reference('collector_b'), 'panel_b.html.twig', 'toolbar_b.html.twig']
);

$this->assertContainerBuilderHasServiceDefinitionWithMethodCall(
IbexaCoreCollector::class,
'addCollector',
[new Reference('collector_a'), 'panel_a.html.twig', 'toolbar_a.html.twig']
);

$calls = $this->container->getDefinition(IbexaCoreCollector::class)->getMethodCalls();

$this->assertCount(2, $calls);
$this->assertSame('addCollector', $calls[0][0]);
$this->assertEquals(new Reference('collector_b'), $calls[0][1][0]);

$this->assertSame('addCollector', $calls[1][0]);
$this->assertEquals(new Reference('collector_a'), $calls[1][1][0]);
}
}

Expand Down
Loading