Skip to content

Commit 7fea71c

Browse files
committed
[Toolkit] Remove checks layers for tales-from-a-dev/twig-tailwind-extra on PHP < 8.2, since it now supports PHP 8.1
1 parent 1b1c545 commit 7fea71c

File tree

4 files changed

+5
-26
lines changed

4 files changed

+5
-26
lines changed

.github/workflows/test.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,6 @@ jobs:
116116
working-directory: "src/${{ matrix.component }}"
117117
dependency-versions: ${{ matrix.dependency-version }}
118118

119-
- name: Install specific packages for Toolkit when PHP >=8.2
120-
if: ${{ matrix.component == 'Toolkit' && matrix.php-version != '8.1' }}
121-
run:
122-
composer require --dev tales-from-a-dev/twig-tailwind-extra
123-
working-directory: "src/${{ matrix.component }}"
124-
125119
- name: ${{ matrix.component }} Tests
126120
working-directory: "src/${{ matrix.component }}"
127121
run: vendor/bin/simple-phpunit

src/Toolkit/composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@
4848
"vincentlanglet/twig-cs-fixer": "^3.5",
4949
"spatie/phpunit-snapshot-assertions": "^4.2.17",
5050
"phpunit/phpunit": "^9.6.22",
51-
"symfony/ux-icons": "^2.18"
51+
"symfony/ux-icons": "^2.18",
52+
"tales-from-a-dev/twig-tailwind-extra": "^0.4.0"
5253
},
5354
"bin": [
5455
"bin/ux-toolkit-kit-create",

src/Toolkit/tests/Fixtures/Kernel.php

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,15 @@ final class Kernel extends BaseKernel
2828

2929
public function registerBundles(): iterable
3030
{
31-
$bundles = [
31+
return [
3232
new FrameworkBundle(),
3333
new TwigBundle(),
3434
new TwigComponentBundle(),
3535
new TwigExtraBundle(),
3636
new UXIconsBundle(),
37+
new TalesFromADevTwigExtraTailwindBundle(),
3738
new UXToolkitBundle(),
3839
];
39-
40-
if (class_exists(TalesFromADevTwigExtraTailwindBundle::class)) {
41-
$bundles[] = new TalesFromADevTwigExtraTailwindBundle();
42-
} elseif (\PHP_VERSION_ID >= 80200) {
43-
throw new \RuntimeException('The dependency "tales-from-a-dev/twig-tailwind-extra" must be installed when using PHP 8.2+.');
44-
}
45-
46-
return $bundles;
4740
}
4841

4942
protected function configureContainer(ContainerConfigurator $container): void

src/Toolkit/tests/Functional/ComponentsRenderingTest.php

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -61,16 +61,7 @@ public function testComponentRendering(string $kitName, string $componentName, s
6161

6262
$kit = $this->instantiateKit($kitName);
6363
$template = $twig->createTemplate($code);
64-
65-
try {
66-
$renderedCode = $kitContextRunner->runForKit($kit, fn () => $template->render());
67-
} catch (\Twig\Error\SyntaxError $e) {
68-
if (\PHP_VERSION < 80200 && str_contains($e->getMessage(), 'Unknown "tailwind_merge" filter')) {
69-
$this->markTestSkipped('Filter "tailwind_merge" is not supported on PHP <8.2.');
70-
}
71-
72-
throw $e;
73-
}
64+
$renderedCode = $kitContextRunner->runForKit($kit, fn () => $template->render());
7465

7566
$this->assertCodeRenderedMatchesHtmlSnapshot($kit, $kit->getComponent($componentName), $code, $renderedCode);
7667
}

0 commit comments

Comments
 (0)