Robert Bryan · Adam Bramley · cd6c8e06
--- a/tests/src/Unit/ComponentsRegistryTest.php
+++ b/tests/src/Unit/ComponentsRegistryTest.php
  protected $systemUnderTest;

-  /**
-   * Path to the mocked modules directory.
-   *
-   * @var string
-   */
-  protected $modulesDir = 'modules/contrib';
-
-  /**
-   * Path to the mocked themes directory.
-   *
-   * @var string
-   */
-  protected $themesDir = 'themes/contrib';
-
--- a/tests/src/Unit/ComponentsRegistryTest.php
+++ b/tests/src/Unit/ComponentsRegistryTest.php
      );

    if (!empty($expectedWarnings)) {
-      $consecutiveCalls = [];
-      foreach ($expectedWarnings as $key => $warning) {
-        $consecutiveCalls[$key] = [$warning];
-      }
      $this->loggerChannel
        ->expects($this->exactly(count($expectedWarnings)))
        ->method('warning')
-        ->withConsecutive(...$consecutiveCalls);
+        ->with($this->callback(function (string $value) use (&$expectedWarnings) {
+          return $value === array_shift($expectedWarnings);
+        }));
--- a/tests/src/Unit/ComponentsRegistryTest.php
+++ b/tests/src/Unit/ComponentsRegistryTest.php
+
+      foreach ([$moduleHandler, $themeManager] as $extensionHandler) {
        $extensionHandler
          ->method('alter')
-          ->withConsecutive(...$alter);
+          ->with(
+            $this->callback(function ($value) {
+              return $value === 'protected_twig_namespaces' || $value === 'components_namespaces';
+            }),
+            $this->callback(function ($value) use ($themeName, $allNamespacesCache, $expected, $protected) {
+              return $value === $protected || $value === ($allNamespacesCache[$themeName] ?? []) || ($value === $expected[$themeName] ?? []);
+            }),
+            $this->callback(function ($value) use ($themeName) {
+              return $value === NULL || $value === $themeName;
+            }),
+          );
--- a/src/Template/TwigExtension.php
+++ b/src/Template/TwigExtension.php
   */
  public function getFunctions(): array {
    return [
-      new TwigFunction('template', [$this, 'template'], ['is_variadic' => TRUE]),
+      new TwigFunction('template', $this->template(...), ['is_variadic' => TRUE]),
--- a/components.info.yml
+++ b/components.info.yml
+php: 8.0
-php: 8.0
+php: 8.1