diff --git a/dictionaries/override/CallMap.php b/dictionaries/override/CallMap.php
index 5f8d5285f2b..9f351437d9f 100644
--- a/dictionaries/override/CallMap.php
+++ b/dictionaries/override/CallMap.php
@@ -50219,11 +50219,31 @@
     0 => 'string',
     'string' => 'string',
   ),
+  'rawurldecode\'1' => 
+  array (
+    0 => 'non-empty-string',
+    'string' => 'non-empty-string',
+  ),
+  'rawurldecode\'2' => 
+  array (
+    0 => '\'\'',
+    'string' => '\'\'',
+  ),
   'rawurlencode' => 
   array (
     0 => 'string',
     'string' => 'string',
   ),
+  'rawurlencode\'1' => 
+  array (
+    0 => 'non-empty-string',
+    'string' => 'non-empty-string',
+  ),
+  'rawurlencode\'2' => 
+  array (
+    0 => '\'\'',
+    'string' => '\'\'',
+  ),
   'readdir' => 
   array (
     0 => 'false|string',
@@ -73404,11 +73424,31 @@
     0 => 'string',
     'string' => 'string',
   ),
+  'urldecode\'1' => 
+  array (
+    0 => 'non-empty-string',
+    'string' => 'non-empty-string',
+  ),
+  'urldecode\'2' => 
+  array (
+    0 => '\'\'',
+    'string' => '\'\'',
+  ),
   'urlencode' => 
   array (
     0 => 'string',
     'string' => 'string',
   ),
+  'urlencode\'1' => 
+  array (
+    0 => 'non-empty-string',
+    'string' => 'non-empty-string',
+  ),
+  'urlencode\'2' => 
+  array (
+    0 => '\'\'',
+    'string' => '\'\'',
+  ),
   'use_soap_error_handler' => 
   array (
     0 => 'bool',
diff --git a/tests/UrlencodeTest.php b/tests/UrlencodeTest.php
new file mode 100644
index 00000000000..61e2a8adecb
--- /dev/null
+++ b/tests/UrlencodeTest.php
@@ -0,0 +1,79 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Psalm\Tests;
+
+use Override;
+use Psalm\Tests\Traits\InvalidCodeAnalysisTestTrait;
+use Psalm\Tests\Traits\ValidCodeAnalysisTestTrait;
+
+final class UrlencodeTest extends TestCase
+{
+    use InvalidCodeAnalysisTestTrait;
+    use ValidCodeAnalysisTestTrait;
+
+    #[Override]
+    public function providerValidCodeParse(): iterable
+    {
+        return [
+            'urlencodeEmptyStringReturnsEmptyString' => [
+                'code' => '<?php
+                    $string = urlencode("");
+                ',
+                'assertions' => [
+                    '$string' => '\'\'',
+                ],
+            ],
+            'urlencodeNonEmptyStringReturnsNonEmptyString' => [
+                'code' => '<?php
+                    /** 
+                     * @param non-empty-string $input 
+                     * @return non-empty-string 
+                     */
+                    function f(string $input): string {
+                        return urlencode($input);
+                    }
+
+                    $string = f("test");
+                ',
+                'assertions' => [
+                    '$string' => 'non-empty-string',
+                ],
+            ],
+            'urlencodeAnyStringReturnsAnyString' => [
+                'code' => '<?php
+                    function f(string $input): string {
+                        return urlencode($input);
+                    }
+
+                    $string = f("test");
+                ',
+                'assertions' => [
+                    '$string' => 'string',
+                ],
+            ],
+        ];
+    }
+
+    #[Override]
+    public function providerInvalidCodeParse(): iterable
+    {
+        return [
+            'urlencodeEmptyStringReturnsEmptyString' => [
+                'code' => '<?php
+                    $string = urlencode("");
+                    assert($string !== "");
+                ',
+                'error_message' => 'TypeDoesNotContainType',
+            ],
+            'urlencodeNonEmptyStringReturnsNonEmptyString' => [
+                'code' => '<?php
+                    $string = urlencode("hello");
+                    assert($string === "");
+                ',
+                'error_message' => 'TypeDoesNotContainType',
+            ],
+        ];
+    }
+}