style: upgrade code with function parameters and return types

Author: SlimDeluxe

src/gettext-context.php

@@ -8,9 +8,9 @@
      * @param string $message The message being translated
      * @return string Translated string if one is found in the translation table, or the submitted message if not found
      */
-    function pgettext($context, $message)
+    function pgettext(string $context, string $message): string
     {
-        $context_message = "{$context}\004{$message}";
+        $context_message = "$context\004$message";
 
         $translation = gettext($context_message);
 
@@ -34,15 +34,15 @@ function pgettext($context, $message)
      * @param int $number The number (e.g. item count) to determine the translation for the respective grammatical number
      * @return string Correct plural form of message identified by $singular and $plural for $number
      */
-    function npgettext($context, $singular, $plural, $number)
+    function npgettext(string $context, string $singular, string $plural, int $number): string
     {
-        $context_singular = "{$context}\004{$singular}";
-        $context_plural = "{$context}\004{$plural}";
+        $context_singular = "$context\004$singular";
+        $context_plural = "$context\004$plural";
 
         $translation = ngettext($context_singular, $context_plural, $number);
 
         // If the translation was not found...
-        if ($translation === $context_singular or $translation === $context_plural) {
+        if ($translation === $context_singular || $translation === $context_plural) {
             // Use native function to return the appropriate string
             return ngettext($singular, $plural, $number);
         }
@@ -60,9 +60,9 @@ function npgettext($context, $singular, $plural, $number)
      * @param string $message The message being translated
      * @return string Translated string if one is found in the translation table, or the submitted message if not found
      */
-    function dpgettext($domain, $context, $message)
+    function dpgettext(string $domain, string $context, string $message): string
     {
-        $context_message = "{$context}\004{$message}";
+        $context_message = "$context\004$message";
 
         $translation = dgettext($domain, $context_message);
 
@@ -87,15 +87,15 @@ function dpgettext($domain, $context, $message)
      * @param int $number The number (e.g. item count) to determine the translation for the respective grammatical number
      * @return string Translated string if one is found in the translation table, or the submitted message if not found
      */
-    function dnpgettext($domain, $context, $singular, $plural, $number)
+    function dnpgettext(string $domain, string $context, string $singular, string $plural, int $number): string
     {
-        $context_singular = "{$context}\004{$singular}";
-        $context_plural = "{$context}\004{$plural}";
+        $context_singular = "$context\004$singular";
+        $context_plural = "$context\004$plural";
 
         $translation = dngettext($domain, $context_singular, $context_plural, $number);
 
         // If the translation was not found...
-        if ($translation === $context_singular or $translation === $context_plural) {
+        if ($translation === $context_singular || $translation === $context_plural) {
             // Use native function to return the appropriate string
             return dngettext($domain, $singular, $plural, $number);
         }

tests/Unit/Test.php

@@ -30,7 +30,7 @@ protected function setUp(): void
         }
     }
 
-    public function test_pgettext()
+    public function test_pgettext(): void
     {
         // Test translated
         $this->assertEquals('Ime', pgettext('User', 'Name'));
@@ -40,22 +40,22 @@ public function test_pgettext()
         $this->assertEquals('Name', pgettext('Country', 'Name'));
     }
 
-    public function test_npgettext()
+    public function test_npgettext(): void
     {
         // Test translated
         $this->assertEquals('1 ime', sprintf(npgettext('User', '%d name', '%d names', 1), 1));
         $this->assertEquals('2 imeni', sprintf(npgettext('User', '%d name', '%d names', 2), 2));
         $this->assertEquals('3 imena', sprintf(npgettext('User', '%d name', '%d names', 3), 3));
         $this->assertEquals('5 imen', sprintf(npgettext('User', '%d name', '%d names', 5), 5));
-        $this->assertEquals('101 ime', sprintf(npgettext('User', '%d name', '%d names', 101), 101));
+        $this->assertEquals('101 ime', sprintf(npgettext('User', '%d name', '%d names', '101'), 101));
 
         $this->assertEquals('1 naziv', sprintf(npgettext('Product', '%d name', '%d names', 1), 1));
 
         // Test non-translated
         $this->assertEquals('1 name', sprintf(npgettext('Country', '%d name', '%d names', 1), 1));
     }
 
-    public function test_dpgettext()
+    public function test_dpgettext(): void
     {
         // Switch to a different domain
         textdomain('something');
@@ -70,7 +70,7 @@ public function test_dpgettext()
         $this->assertEquals('Name', dpgettext('messages', 'Country', 'Name'));
     }
 
-    public function test_dnpgettext()
+    public function test_dnpgettext(): void
     {
         // Switch to a different domain
         textdomain('something');