Merge branch '1.24' into fix/902

Author: pimjansen

CHANGELOG.md

@@ -11,6 +11,7 @@
 - Fix internal deprecations in Doctrine's populator by @gnutix in (#889)
 - Fix mobile phone number pattern for France by @ker0x in (#859)
 - PHP 8.4 Support by @Jubeki in (#904)
+- Add missing return type in annotations (#923)
 
 - Added support for PHP 8.4 (#904)
 

src/Faker/Generator.php

@@ -763,6 +763,8 @@ public function parse($string)
      * Get a random MIME type
      *
      * @example 'video/avi'
+     *
+     * @return string
      */
     public function mimeType()
     {
@@ -773,6 +775,8 @@ public function mimeType()
      * Get a random file extension (without a dot)
      *
      * @example avi
+     *
+     * @return string
      */
     public function fileExtension()
     {
@@ -781,6 +785,8 @@ public function fileExtension()
 
     /**
      * Get a full path to a new real file on the system.
+     *
+     * @return string
      */
     public function filePath()
     {

src/Faker/Provider/Image.php

@@ -55,7 +55,8 @@ public static function imageUrl(
         trigger_deprecation(
             'fakerphp/faker',
             '1.20',
-            'Provider is deprecated and will no longer be available in Faker 2. Please use a custom provider instead',
+            '%s is deprecated and will no longer be available in Faker 2. Please use a custom provider instead',
+            __CLASS__,
         );
 
         // Validate image format
@@ -119,7 +120,8 @@ public static function image(
         trigger_deprecation(
             'fakerphp/faker',
             '1.20',
-            'Provider is deprecated and will no longer be available in Faker 2. Please use a custom provider instead',
+            '%s is deprecated and will no longer be available in Faker 2. Please use a custom provider instead',
+            __CLASS__,
         );
 
         $dir = null === $dir ? sys_get_temp_dir() : $dir; // GNU/Linux / OS X / Windows compatible
@@ -173,7 +175,8 @@ public static function getFormats(): array
         trigger_deprecation(
             'fakerphp/faker',
             '1.20',
-            'Provider is deprecated and will no longer be available in Faker 2. Please use a custom provider instead',
+            '%s is deprecated and will no longer be available in Faker 2. Please use a custom provider instead',
+            __CLASS__,
         );
 
         return array_keys(static::getFormatConstants());
@@ -184,7 +187,8 @@ public static function getFormatConstants(): array
         trigger_deprecation(
             'fakerphp/faker',
             '1.20',
-            'Provider is deprecated and will no longer be available in Faker 2. Please use a custom provider instead',
+            '%s is deprecated and will no longer be available in Faker 2. Please use a custom provider instead',
+            __CLASS__,
         );
 
         return [