diff --git a/LICENSE b/LICENSE
index 74cdc2d..7536cae 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2018-2022 Fabien Potencier
+Copyright (c) 2018-present Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/LocaleAwareInterface.php b/LocaleAwareInterface.php
index 6923b97..db40ba1 100644
--- a/LocaleAwareInterface.php
+++ b/LocaleAwareInterface.php
@@ -16,6 +16,8 @@ interface LocaleAwareInterface
     /**
      * Sets the current locale.
      *
+     * @return void
+     *
      * @throws \InvalidArgumentException If the locale contains invalid characters
      */
     public function setLocale(string $locale);
diff --git a/README.md b/README.md
index 42e5c51..b211d58 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ Symfony Translation Contracts
 
 A set of abstractions extracted out of the Symfony components.
 
-Can be used to build on semantics that the Symfony components proved useful - and
+Can be used to build on semantics that the Symfony components proved useful and
 that already have battle tested implementations.
 
 See https://github.com/symfony/contracts/blob/main/README.md for more information.
diff --git a/Test/TranslatorTest.php b/Test/TranslatorTest.php
index fbfa161..e4168cc 100644
--- a/Test/TranslatorTest.php
+++ b/Test/TranslatorTest.php
@@ -114,7 +114,7 @@ public function testGetLocaleReturnsDefaultLocaleIfNotSet()
         $this->assertEquals('en', $translator->getLocale());
     }
 
-    public function getTransTests()
+    public static function getTransTests()
     {
         return [
             ['Symfony is great!', 'Symfony is great!', []],
@@ -122,7 +122,7 @@ public function getTransTests()
         ];
     }
 
-    public function getTransChoiceTests()
+    public static function getTransChoiceTests()
     {
         return [
             ['There are no apples', '{0} There are no apples|{1} There is one apple|]1,Inf] There are %count% apples', 0],
@@ -137,7 +137,7 @@ public function getTransChoiceTests()
     }
 
     /**
-     * @dataProvider getInternal
+     * @dataProvider getInterval
      */
     public function testInterval($expected, $number, $interval)
     {
@@ -146,7 +146,7 @@ public function testInterval($expected, $number, $interval)
         $this->assertEquals($expected, $translator->trans($interval.' foo|[1,Inf[ bar', ['%count%' => $number]));
     }
 
-    public function getInternal()
+    public static function getInterval()
     {
         return [
             ['foo', 3, '{1,2, 3 ,4}'],
@@ -189,7 +189,7 @@ public function testThrowExceptionIfMatchingMessageCannotBeFound($id, $number)
         $translator->trans($id, ['%count%' => $number]);
     }
 
-    public function getNonMatchingMessages()
+    public static function getNonMatchingMessages()
     {
         return [
             ['{0} There are no apples|{1} There is one apple', 2],
@@ -199,7 +199,7 @@ public function getNonMatchingMessages()
         ];
     }
 
-    public function getChooseTests()
+    public static function getChooseTests()
     {
         return [
             ['There are no apples', '{0} There are no apples|{1} There is one apple|]1,Inf] There are %count% apples', 0],
@@ -315,7 +315,7 @@ public function testLangcodes($nplural, $langCodes)
      *
      * As it is impossible to have this ever complete we should try as hard as possible to have it almost complete.
      */
-    public function successLangcodes(): array
+    public static function successLangcodes(): array
     {
         return [
             ['1', ['ay', 'bo', 'cgg', 'dz', 'id', 'ja', 'jbo', 'ka', 'kk', 'km', 'ko', 'ky']],
@@ -334,7 +334,7 @@ public function successLangcodes(): array
      *
      * @return array with nplural together with langcodes
      */
-    public function failingLangcodes(): array
+    public static function failingLangcodes(): array
     {
         return [
             ['1', ['fa']],
diff --git a/TranslatorTrait.php b/TranslatorTrait.php
index 46e9170..e3b0adf 100644
--- a/TranslatorTrait.php
+++ b/TranslatorTrait.php
@@ -22,6 +22,9 @@ trait TranslatorTrait
 {
     private ?string $locale = null;
 
+    /**
+     * @return void
+     */
     public function setLocale(string $locale)
     {
         $this->locale = $locale;