diff --git a/src/Template/TwigExtension.php b/src/Template/TwigExtension.php
index 09bd266..6479fe3 100644
--- a/src/Template/TwigExtension.php
+++ b/src/Template/TwigExtension.php
@@ -27,14 +27,8 @@ class TwigExtension extends AbstractExtension {
    */
   public function getFunctions() {
     return [
-      new TwigFunction('pattern', [
-        $this,
-        'renderPattern',
-      ]),
-      new TwigFunction('pattern_preview', [
-        $this,
-        'renderPatternPreview',
-      ]),
+      new TwigFunction('pattern', $this->renderPattern(...)),
+      new TwigFunction('pattern_preview', $this->renderPatternPreview(...)),
     ];
   }
 
@@ -43,8 +37,8 @@ class TwigExtension extends AbstractExtension {
    */
   public function getFilters() {
     return [
-      new TwigFilter('add_class', [$this, 'addClass']),
-      new TwigFilter('set_attribute', [$this, 'setAttribute']),
+      new TwigFilter('add_class', $this->addClass(...)),
+      new TwigFilter('set_attribute', $this->setAttribute(...)),
     ];
   }
 
diff --git a/tests/src/Unit/Definition/PatternDefinitionTest.php b/tests/src/Unit/Definition/PatternDefinitionTest.php
index 66fb045..9d595df 100644
--- a/tests/src/Unit/Definition/PatternDefinitionTest.php
+++ b/tests/src/Unit/Definition/PatternDefinitionTest.php
@@ -45,7 +45,7 @@ class PatternDefinitionTest extends UiPatternsTestBase {
    * @return array
    *   Data.
    */
-  public function definitionGettersProvider() {
+  public static function definitionGettersProvider() {
     return [
       ['getProvider', 'provider', 'my_module'],
       ['id', 'id', 'pattern_id'],
@@ -176,7 +176,7 @@ class PatternDefinitionTest extends UiPatternsTestBase {
    * @return array
    *   Data.
    */
-  public function hasUseProvider(): array {
+  public static function hasUseProvider(): array {
     return [
       'pattern_without_use' => [
         [
@@ -267,7 +267,7 @@ class PatternDefinitionTest extends UiPatternsTestBase {
    * @return array
    *   Data.
    */
-  public function definitionGetLinksProvider(): array {
+  public static function definitionGetLinksProvider(): array {
     return [
       [
         [
@@ -332,7 +332,7 @@ class PatternDefinitionTest extends UiPatternsTestBase {
    * @return array
    *   Data.
    */
-  public function definitionGetRenderLinksProvider(): array {
+  public static function definitionGetRenderLinksProvider(): array {
     return [
       [
         [
diff --git a/tests/src/Unit/Definition/PatternDefinitionVariantTest.php b/tests/src/Unit/Definition/PatternDefinitionVariantTest.php
index 017d26b..9683221 100644
--- a/tests/src/Unit/Definition/PatternDefinitionVariantTest.php
+++ b/tests/src/Unit/Definition/PatternDefinitionVariantTest.php
@@ -93,7 +93,7 @@ class PatternDefinitionVariantTest extends UiPatternsTestBase {
    * @return array
    *   Data.
    */
-  public function definitionGettersProvider(): array {
+  public static function definitionGettersProvider(): array {
     return [
       ['getName', 'name', 'Variant name'],
       ['getLabel', 'label', 'Variant label'],
diff --git a/tests/src/Unit/Template/TwigExtensionTest.php b/tests/src/Unit/Template/TwigExtensionTest.php
index c692735..295572a 100644
--- a/tests/src/Unit/Template/TwigExtensionTest.php
+++ b/tests/src/Unit/Template/TwigExtensionTest.php
@@ -49,7 +49,7 @@ class TwigExtensionTest extends UnitTestCase {
    * @return \Iterator
    *   An iterator.
    */
-  public function providerTestTwigAddClass(): \Iterator {
+  public static function providerTestTwigAddClass(): \Iterator {
     yield 'should add a class on element' => [
       ['#type' => 'container'],
       'my-class',
@@ -136,7 +136,7 @@ class TwigExtensionTest extends UnitTestCase {
    * @return \Iterator
    *   An iterator.
    */
-  public function providerTestTwigSetAttribute(): \Iterator {
+  public static function providerTestTwigSetAttribute(): \Iterator {
     yield 'should add attributes on element' => [
       ['#theme' => 'image'],
       'title',