diff --git a/Ev/Ev.php b/Ev/Ev.php
index bb272827c..1e41f51a0 100644
--- a/Ev/Ev.php
+++ b/Ev/Ev.php
@@ -743,14 +743,14 @@ final public static function createStopped($fd, $events, callable $callback, $da
 final class EvPeriodic extends EvWatcher
 {
     /**
-     * @var double When repeating, this contains the offset value, otherwise this is the absolute point in time (the
+     * @var float When repeating, this contains the offset value, otherwise this is the absolute point in time (the
      *      offset value passed to EvPeriodic::set(), although libev might modify this value for better numerical
      *      stability).
      */
     public $offset;
 
     /**
-     * @var double The current interval value. Can be modified any time, but changes only take effect when the periodic
+     * @var float The current interval value. Can be modified any time, but changes only take effect when the periodic
      *      timer fires or EvPeriodic::again() is being called.
      */
     public $interval;
@@ -762,10 +762,10 @@ final class EvPeriodic extends EvWatcher
      * Constructs EvPeriodic watcher object and starts it automatically. EvPeriodic::createStopped() method creates
      * stopped periodic watcher.
      *
-     * @param double $offset When repeating, this contains the offset value, otherwise this is the absolute point in
+     * @param float $offset When repeating, this contains the offset value, otherwise this is the absolute point in
      *      time (the offset value passed to EvPeriodic::set(), although libev might modify this value for better
      *      numerical stability).
-     * @param double $interval The current interval value. Can be modified any time, but changes only take effect when
+     * @param float $interval The current interval value. Can be modified any time, but changes only take effect when
      *      the periodic timer fires or EvPeriodic::again() is being called.
      * @param callable $reschedule_cb If set, tt must return the next time to trigger, based on the passed time value
      *      (that is, the lowest time value larger than or equal to the second argument). It will usually be called just
@@ -792,7 +792,7 @@ public function again() {}
      * the same as the offset argument to EvPeriodic::set() or EvPeriodic::__construct(), but indeed works even in
      * interval mode.
      *
-     * @return double Rhe absolute time this watcher is supposed to trigger next in seconds.
+     * @return float Rhe absolute time this watcher is supposed to trigger next in seconds.
      */
     public function at() {}
 
@@ -801,10 +801,10 @@ public function at() {}
      *
      * Create EvPeriodic object. Unlike EvPeriodic::__construct() this method doesn't start the watcher automatically.
      *
-     * @param double $offset When repeating, this contains the offset value, otherwise this is the absolute point in
+     * @param float $offset When repeating, this contains the offset value, otherwise this is the absolute point in
      *      time (the offset value passed to EvPeriodic::set(), although libev might modify this value for better
      *      numerical stability).
-     * @param double $interval The current interval value. Can be modified any time, but changes only take effect when
+     * @param float $interval The current interval value. Can be modified any time, but changes only take effect when
      *      the periodic timer fires or EvPeriodic::again() is being called.
      * @param callable $reschedule_cb If set, tt must return the next time to trigger, based on the passed time value
      *      (that is, the lowest time value larger than or equal to the second argument). It will usually be called just
@@ -952,7 +952,7 @@ final public static function createStopped($signum, callable $callback, $data =
  * This watcher type is not meant for massive numbers of EvStat watchers, as even with OS-supported change
  * notifications, this can be resource-intensive.
  *
- * @property-read double $interval Hint on how quickly a change is expected to be detected and should normally be
+ * @property-read float $interval Hint on how quickly a change is expected to be detected and should normally be
  *      specified as 0.0 to let libev choose a suitable value.
  * @property-read string $path The path to wait for status changes on.
  */
@@ -964,7 +964,7 @@ final class EvStat extends EvWatcher
      * Constructs EvStat watcher object and starts the watcher automatically.
      *
      * @param string $path The path to wait for status changes on.
-     * @param double $interval Hint on how quickly a change is expected to be detected and should normally be specified
+     * @param float $interval Hint on how quickly a change is expected to be detected and should normally be specified
      *      as 0.0 to let libev choose a suitable value.
      * @param callable $callback
      * @param mixed $data
@@ -986,7 +986,7 @@ public function prev() {}
      * Configures the watcher.
      *
      * @param string $path The path to wait for status changes on.
-     * @param double $interval Hint on how quickly a change is expected to be detected and should normally be specified
+     * @param float $interval Hint on how quickly a change is expected to be detected and should normally be specified
      *      as 0.0 to let libev choose a suitable value.
      */
     public function set($path, $interval) {}
@@ -1007,7 +1007,7 @@ public function stat() {}
      * Creates EvStat watcher object, but doesn't start it automatically (unlike EvStat::__construct()).
      *
      * @param string $path The path to wait for status changes on.
-     * @param double $interval Hint on how quickly a change is expected to be detected and should normally be specified
+     * @param float $interval Hint on how quickly a change is expected to be detected and should normally be specified
      *      as 0.0 to let libev choose a suitable value.
      * @param callable $callback
      * @param mixed $data
@@ -1041,14 +1041,14 @@ final public static function createStopped($path, $interval, callable $callback,
 final class EvTimer extends EvWatcher
 {
     /**
-     * @var double If repeat is 0.0, then it will automatically be stopped once the timeout is reached. If it is
+     * @var float If repeat is 0.0, then it will automatically be stopped once the timeout is reached. If it is
      *      positive, then the timer will automatically be configured to trigger again every repeat seconds later, until
      *      stopped manually.
      */
     public $repeat;
 
     /**
-     * @var double The remaining time until a timer fires. If the timer is active, then this time is relative to the
+     * @var float The remaining time until a timer fires. If the timer is active, then this time is relative to the
      *      current event loop time, otherwise it's the timeout value currently configured.
      *
      *      That is, after instantiating an EvTimer with an after value of 5.0 and repeat value of 7.0, remaining
@@ -1061,8 +1061,8 @@ final class EvTimer extends EvWatcher
     /**
      * Constructs an EvTimer watcher object.
      *
-     * @param double $after Configures the timer to trigger after $after seconds.
-     * @param double $repeat If repeat is 0.0, then it will automatically be stopped once the timeout is reached. If it
+     * @param float $after Configures the timer to trigger after $after seconds.
+     * @param float $repeat If repeat is 0.0, then it will automatically be stopped once the timeout is reached. If it
      *      is positive, then the timer will automatically be configured to trigger again every repeat seconds later,
      *      until stopped manually.
      * @param callable $callback
@@ -1086,8 +1086,8 @@ public function again() {}
     /**
      * Configures the watcher.
      *
-     * @param double $after Configures the timer to trigger after $after seconds.
-     * @param double $repeat If repeat is 0.0, then it will automatically be stopped once the timeout is reached. If it
+     * @param float $after Configures the timer to trigger after $after seconds.
+     * @param float $repeat If repeat is 0.0, then it will automatically be stopped once the timeout is reached. If it
      *      is positive, then the timer will automatically be configured to trigger again every repeat seconds later,
      *      until stopped manually.
      */
@@ -1096,8 +1096,8 @@ public function set($after, $repeat) {}
     /**
      * Creates a stopped EvTimer watcher object.
      *
-     * @param double $after Configures the timer to trigger after $after seconds.
-     * @param double $repeat If repeat is 0.0, then it will automatically be stopped once the timeout is reached. If it
+     * @param float $after Configures the timer to trigger after $after seconds.
+     * @param float $repeat If repeat is 0.0, then it will automatically be stopped once the timeout is reached. If it
      *      is positive, then the timer will automatically be configured to trigger again every repeat seconds later,
      *      until stopped manually.
      * @param callable $callback
@@ -1215,7 +1215,7 @@ final class EvLoop
     public $pending;
 
     /**
-     * @var double Higher io_interval allows libev to spend more time collecting EvIo events, so more events can be
+     * @var float Higher io_interval allows libev to spend more time collecting EvIo events, so more events can be
      *      handled per iteration, at the cost of increasing latency. Timeouts (both EvPeriodic and EvTimer) will not be
      *      affected. Setting this to a non-zero value will introduce an additional sleep() call into most loop
      *      iterations. The sleep time ensures that libev will not poll for EvIo events more often than once per this
@@ -1226,7 +1226,7 @@ final class EvLoop
     public $io_interval;
 
     /**
-     * @var double Higher timeout_interval allows libev to spend more time collecting timeouts, at the expense of
+     * @var float Higher timeout_interval allows libev to spend more time collecting timeouts, at the expense of
      *      increased latency/jitter/inexactness (the watcher callback will be called later). EvIo watchers will not be
      *      affected. Setting this to a non-null value will not introduce any overhead in libev.
      */
@@ -1338,7 +1338,7 @@ public function loopFork() {}
      * used for relative timers. You can treat it as the timestamp of the event occurring (or more correctly, libev
      * finding out about it).
      *
-     * @return double Time of the event loop in (fractional) seconds.
+     * @return float Time of the event loop in (fractional) seconds.
      */
     public function now() {}
 
@@ -1356,8 +1356,8 @@ public function nowUpdate() {}
     /**
      * Creates EvPeriodic object associated with the current event loop instance.
      *
-     * @param double $offset
-     * @param double $interval
+     * @param float $offset
+     * @param float $interval
      * @param callable $callback
      * @param mixed $data
      * @param int $priority
@@ -1409,7 +1409,7 @@ public final function signal($signal, callable $callback, $data = null, $priorit
      * Creates EvStats object associated with the current event loop instance.
      *
      * @param string $path
-     * @param double $interval
+     * @param float $interval
      * @param callable $callback
      * @param mixed $data
      * @param int $priority
@@ -1434,8 +1434,8 @@ public function suspend() {}
     /**
      * Creates EvTimer object associated with the current event loop instance.
      *
-     * @param double $after
-     * @param double $repeat
+     * @param float $after
+     * @param float $repeat
      * @param callable $callback
      * @param mixed $data
      * @param int $priority
diff --git a/SaxonC/SaxonC.php b/SaxonC/SaxonC.php
index 4e2743f3e..46dd202a2 100644
--- a/SaxonC/SaxonC.php
+++ b/SaxonC/SaxonC.php
@@ -15,7 +15,7 @@ class SaxonProcessor {
     public function __construct($license = false, $cwd = '') {}
 
     /**
-     * Create an Xdm Atomic value from any of the main primitive types (i.e. bool, int, float, double, string)
+     * Create an Xdm Atomic value from any of the main primitive types (i.e. bool, int, float, string)
      *
      * @param bool|int|float|string $primitive_type_val
      * @return XdmValue
@@ -1179,7 +1179,7 @@ public function getStringValue() {}
     public function getBooleanValue() {}
 
     /**
-     * Get the value converted to a double using the XPath casting rules. If the value is a string, the XSD 1.1 rules are used, which means that the string "+INF" is recognised
+     * Get the value converted to a float using the XPath casting rules. If the value is a string, the XSD 1.1 rules are used, which means that the string "+INF" is recognised
      *
      * @return float
      */
diff --git a/cassandra/cassandra.php b/cassandra/cassandra.php
index e8d75364f..07631fbc5 100644
--- a/cassandra/cassandra.php
+++ b/cassandra/cassandra.php
@@ -620,7 +620,7 @@ public function prepareAsync($cql, $options);
         /**
          * Close the session and all its connections.
          *
-         * @param double $timeout The amount of time in seconds to wait for the session to close.
+         * @param float $timeout The amount of time in seconds to wait for the session to close.
          *
          * @return null Nothing.
          * @throws \Cassandra\Exception
@@ -1197,7 +1197,7 @@ interface Future
         /**
          * Waits for a given future resource to resolve and throws errors if any.
          *
-         * @param int|double|null $timeout A timeout in seconds
+         * @param int|float|null $timeout A timeout in seconds
          *
          * @return mixed a value that the future has been resolved with
          * @throws \Cassandra\Exception\TimeoutException
@@ -1985,7 +1985,7 @@ final class Smallint implements Value, Numeric
         /**
          * Creates a new 16-bit signed integer.
          *
-         * @param int|double|string $value The value as an integer, double or string
+         * @param int|float|string $value The value as an integer, double or string
          *
          * @link https://docs.datastax.com/en/developer/php-driver/latest/api/Cassandra/class.Smallint/#method-__construct
          */
@@ -2146,7 +2146,7 @@ final class FuturePreparedStatement implements Future
         /**
          * Waits for a given future resource to resolve and throws errors if any.
          *
-         * @param int|double|null $timeout A timeout in seconds
+         * @param int|float|null $timeout A timeout in seconds
          *
          * @return \Cassandra\PreparedStatement A prepared statement
          * @throws \Cassandra\Exception\TimeoutException
@@ -2412,7 +2412,7 @@ final class FutureRows implements Future
         /**
          * Waits for a given future resource to resolve and throws errors if any.
          *
-         * @param int|double|null $timeout A timeout in seconds
+         * @param int|float|null $timeout A timeout in seconds
          *
          * @return \Cassandra\Rows|null The result set
          * @throws \Cassandra\Exception\TimeoutException
@@ -2890,7 +2890,7 @@ final class FutureSession implements Future
         /**
          * Waits for a given future resource to resolve and throws errors if any.
          *
-         * @param int|double|null $timeout A timeout in seconds
+         * @param int|float|null $timeout A timeout in seconds
          *
          * @return \Cassandra\Session A connected session
          * @throws \Cassandra\Exception\TimeoutException
@@ -3308,7 +3308,7 @@ final class Tinyint implements Value, Numeric
         /**
          * Creates a new 8-bit signed integer.
          *
-         * @param int|double|string $value The value as an integer, double or string
+         * @param int|float|string $value The value as an integer, float or string
          *
          * @link https://docs.datastax.com/en/developer/php-driver/latest/api/Cassandra/class.Tinyint/#method-__construct
          */
@@ -3626,7 +3626,7 @@ public function prepareAsync($cql, $options)
         /**
          * Close the session and all its connections.
          *
-         * @param double $timeout The amount of time in seconds to wait for the session to close.
+         * @param float $timeout The amount of time in seconds to wait for the session to close.
          *
          * @return null Nothing.
          * @throws \Cassandra\Exception
@@ -4732,7 +4732,7 @@ final class Float_ implements Value, Numeric
         /**
          * Creates a new float.
          *
-         * @param double|int|string|\Cassandra\Float_ $value A float value as a string, number or Float
+         * @param float|int|string|\Cassandra\Float_ $value A float value as a string, number or Float
          *
          * @link https://docs.datastax.com/en/developer/php-driver/latest/api/Cassandra/class.Float/#method-__construct
          */
@@ -4914,9 +4914,9 @@ final class Duration implements Value
     {
 
         /**
-         * @param int|double|string|\Cassandra\Bigint $months Months attribute of the duration.
-         * @param int|double|string|\Cassandra\Bigint $days Days attribute of the duration.
-         * @param int|double|string|\Cassandra\Bigint $nanos Nanos attribute of the duration.
+         * @param int|float|string|\Cassandra\Bigint $months Months attribute of the duration.
+         * @param int|float|string|\Cassandra\Bigint $days Days attribute of the duration.
+         * @param int|float|string|\Cassandra\Bigint $nanos Nanos attribute of the duration.
          *
          * @link https://docs.datastax.com/en/developer/php-driver/latest/api/Cassandra/class.Duration/#method-__construct
          */
@@ -5896,7 +5896,7 @@ final class FutureClose implements Future
         /**
          * Waits for a given future resource to resolve and throws errors if any.
          *
-         * @param int|double|null $timeout A timeout in seconds
+         * @param int|float|null $timeout A timeout in seconds
          *
          * @return null Nothing
          * @throws \Cassandra\Exception\TimeoutException
diff --git a/ftp/ftp.php b/ftp/ftp.php
index 346238b94..751f40811 100644
--- a/ftp/ftp.php
+++ b/ftp/ftp.php
@@ -136,7 +136,7 @@ function ftp_exec ($ftp_stream, $command) {}
  * @param string $command <p>
  * The command to execute.
  * </p>
- * @return array the server's response as an array of strings.
+ * @return string[] the server's response as an array of strings.
  * No parsing is performed on the response string, nor does
  * <b>ftp_raw</b> determine if the command succeeded.
  */
diff --git a/http/http.php b/http/http.php
index c57cb72f4..df0c377f7 100644
--- a/http/http.php
+++ b/http/http.php
@@ -1869,7 +1869,7 @@ public static function setThrottleDelay ($seconds) {}
 	 * (PECL pecl_http &gt;= 0.10.0)<br/>
 	 * Get throttle delay
 	 * @link https://php.net/manual/en/function.httpresponse-getthrottledelay.php
-	 * @return double a double representing the throttle delay in seconds.
+	 * @return float a float representing the throttle delay in seconds.
 	 */
 	public static function getThrottleDelay () {}
 
diff --git a/http/http3.php b/http/http3.php
index 10172b547..1965a538b 100644
--- a/http/http3.php
+++ b/http/http3.php
@@ -816,7 +816,7 @@ class Header implements \Serializable {
 	/**
 	 * The value of the HTTP header.
 	 *
-	 * @var
+	 * @var mixed
 	 */
 	public $value = null;
 	/**
diff --git a/imagick/imagick.php b/imagick/imagick.php
index 03cd8c899..508d2018f 100644
--- a/imagick/imagick.php
+++ b/imagick/imagick.php
@@ -1469,7 +1469,7 @@ public function getImageAlphaChannel () {}
 	 * @param int $channel [optional] <p>
 	 * Provide any channel constant that is valid for your channel mode. To apply to more than one channel, combine channel constants using bitwise operators. Defaults to <b>Imagick::CHANNEL_DEFAULT</b>. Refer to this list of channel constants
 	 * </p>
-	 * @return float a double describing the channel distortion.
+	 * @return float a float describing the channel distortion.
 	 */
 	public function getImageChannelDistortions (Imagick $reference, $metric, $channel = Imagick::CHANNEL_DEFAULT) {}
 
@@ -3029,7 +3029,7 @@ public function compareImageChannels (Imagick $image, $channelType, $metricType)
 	 * list of metric constants.
 	 * </p>
 	 * @return array Array consisting of an Imagick object of the
-	 * reconstructed image and a double representing the difference.
+	 * reconstructed image and a float representing the difference.
 	 * @throws ImagickException Throws ImagickException on error.
 	 */
 	public function compareImages (Imagick $compare, $metric) {}
@@ -5535,7 +5535,7 @@ public function getStrokeMiterLimit () {}
 	 * (PECL imagick 2.0.0)<br/>
 	 * Returns the opacity of stroked object outlines
 	 * @link https://php.net/manual/en/imagickdraw.getstrokeopacity.php
-	 * @return float a double describing the opacity.
+	 * @return float a float describing the opacity.
 	 */
 	public function getStrokeOpacity () {}
 
@@ -5543,7 +5543,7 @@ public function getStrokeOpacity () {}
 	 * (PECL imagick 2.0.0)<br/>
 	 * Returns the width of the stroke used to draw object outlines
 	 * @link https://php.net/manual/en/imagickdraw.getstrokewidth.php
-	 * @return float a double describing the stroke width.
+	 * @return float a float describing the stroke width.
 	 */
 	public function getStrokeWidth () {}
 
diff --git a/intl/intl.php b/intl/intl.php
index 881dbcd6e..ad2f53dbc 100644
--- a/intl/intl.php
+++ b/intl/intl.php
@@ -2251,13 +2251,13 @@ class IntlGregorianCalendar extends IntlCalendar {
     public static function createInstance($timeZone = null, $locale = null) { }
 
     /**
-     * @param double $change
+     * @param float $change
      *
      */
     public function setGregorianChange($change) { }
 
     /**
-     * @return double $change
+     * @return float $change
      */
     public function getGregorianChange() { }
 
@@ -5727,14 +5727,14 @@ function intlgregcal_create_instance($timeZone = null, $locale = null) { }
 
 /**
  * @param IntlGregorianCalendar $obj
- * @param double $change
+ * @param float $change
  *
  */
 function intlgregcal_set_gregorian_change($obj, $change) { }
 
 /**
  * @param IntlGregorianCalendar $obj
- * @return double $change
+ * @return float $change
  */
 function intlgregcal_get_gregorian_change($obj) { }
 
diff --git a/mapscript/mapscript.php b/mapscript/mapscript.php
index a1159fdc8..2130c7351 100644
--- a/mapscript/mapscript.php
+++ b/mapscript/mapscript.php
@@ -278,7 +278,7 @@ final class classObj
     public $label;
 
     /**
-     * @var double
+     * @var float
      */
     public $maxscaledenom;
 
@@ -288,7 +288,7 @@ final class classObj
     public $metadata;
 
     /**
-     * @var double
+     * @var float
      */
     public $minscaledenom;
 
@@ -552,12 +552,12 @@ final public function updateFromString($snippet) {}
 final class clusterObj
 {
     /**
-     * @var double
+     * @var float
      */
     public $buffer;
 
     /**
-     * @var double
+     * @var float
      */
     public $maxdistance;
 
@@ -692,32 +692,32 @@ final class gridObj
     public $labelformat;
 
     /**
-     * @var double
+     * @var float
      */
     public $maxacrs;
 
     /**
-     * @var double
+     * @var float
      */
     public $maxinterval;
 
     /**
-     * @var double
+     * @var float
      */
     public $maxsubdivide;
 
     /**
-     * @var double
+     * @var float
      */
     public $minarcs;
 
     /**
-     * @var double
+     * @var float
      */
     public $mininterval;
 
     /**
-     * @var double
+     * @var float
      */
     public $minsubdivide;
 
@@ -972,7 +972,7 @@ final class labelObj
     public $align;
 
     /**
-     * @var double
+     * @var float
      */
     public $angle;
 
@@ -1404,12 +1404,12 @@ final class layerObj
     public $labelitem;
 
     /**
-     * @var double
+     * @var float
      */
     public $labelmaxscaledenom;
 
     /**
-     * @var double
+     * @var float
      */
     public $labelminscaledenom;
 
@@ -1429,7 +1429,7 @@ final class layerObj
     public $maxfeatures;
 
     /**
-     * @var double
+     * @var float
      */
     public $maxscaledenom;
 
@@ -1439,7 +1439,7 @@ final class layerObj
     public $metadata;
 
     /**
-     * @var double
+     * @var float
      */
     public $minscaledenom;
 
@@ -1508,7 +1508,7 @@ final class layerObj
     public $styleitem;
 
     /**
-     * @var double
+     * @var float
      */
     public $symbolscaledenom;
 
@@ -1528,7 +1528,7 @@ final class layerObj
     public $tileitem;
 
     /**
-     * @var double
+     * @var float
      */
     public $tolerance;
 
@@ -1914,7 +1914,7 @@ final public function queryByFeatures($slayer) {}
      *
      * @param pointObj $point
      * @param int $mode
-     * @param double $buffer
+     * @param float $buffer
      * @return int
      */
     final public function queryByPoint(pointObj $point, $mode, $buffer) {}
@@ -2207,9 +2207,9 @@ final public function add(pointObj $point) {}
      * the 3rd parameter m is used for measured shape files only.
      * It is not mandatory.
      *
-     * @param double $x
-     * @param double $y
-     * @param double $m
+     * @param float $x
+     * @param float $y
+     * @param float $m
      * @return int
      */
     final public function addXY($x, $y, $m) {}
@@ -2220,10 +2220,10 @@ final public function addXY($x, $y, $m) {}
      * the 4th parameter m is used for measured shape files only.
      * It is not mandatory.
      *
-     * @param double $x
-     * @param double $y
-     * @param double $z
-     * @param double $m
+     * @param float $x
+     * @param float $y
+     * @param float $z
+     * @param float $m
      * @return int
      */
     final public function addXYZ($x, $y, $z, $m) {}
@@ -2251,7 +2251,7 @@ final public function project(projectionObj $in, projectionObj $out) {}
 final class mapObj
 {
     /**
-     * @var double
+     * @var float
      */
     public $cellsize;
 
@@ -2263,7 +2263,7 @@ final class mapObj
     /**
      * pixels per inch, defaults to 72
      *
-     * @var double
+     * @var float
      */
     public $defresolution;
 
@@ -2383,7 +2383,7 @@ final class mapObj
     /**
      * pixels per inch, defaults to 72
      *
-     * @var double
+     * @var float
      */
     public $resolution;
 
@@ -2395,7 +2395,7 @@ final class mapObj
     /**
      * read-only, set by drawMap()
      *
-     * @var double
+     * @var float
      */
     public $scaledenom;
 
@@ -2769,8 +2769,8 @@ final public function moveLayerUp($layerindex) {}
      * Offset the map extent based on the given distances in map coordinates.
      * Returns MS_SUCCESS or MS_FAILURE.
      *
-     * @param double $x
-     * @param double $y
+     * @param float $x
+     * @param float $y
      * @return int
      */
     final public function offsetExtent($x, $y) {}
@@ -2899,7 +2899,7 @@ final public function queryByIndex( $layerindex,  $tileindex,  $shapeindex,  $ad
      *
      * @param pointObj $point
      * @param int $mode
-     * @param double $buffer
+     * @param float $buffer
      * @return int
      */
     final public function queryByPoint(pointObj $point, $mode, $buffer) {}
@@ -2993,9 +2993,9 @@ final public function saveQuery($filename, $results) {}
      * minscaledenom and/or maxscaledenom is 0 then the parameter is not
      * taken into account.  Returns MS_SUCCESS or MS_FAILURE.
      *
-     * @param double $zoomfactor
-     * @param double $minscaledenom
-     * @param double $maxscaledenom
+     * @param float $zoomfactor
+     * @param float $minscaledenom
+     * @param float $maxscaledenom
      * @return int
      */
     final public function scaleExtent($zoomfactor, $minscaledenom, $maxscaledenom) {}
@@ -3071,10 +3071,10 @@ final public function setConfigOption($key, $value) {}
      * Set the map extents using the georef extents passed in argument.
      * Returns MS_SUCCESS or MS_FAILURE on error.
      *
-     * @param double $minx
-     * @param double $miny
-     * @param double $maxx
-     * @param double $maxy
+     * @param float $minx
+     * @param float $miny
+     * @param float $maxx
+     * @param float $maxy
      * @return void
      */
     final public function setExtent($minx, $miny, $maxx, $maxy) {}
@@ -3123,7 +3123,7 @@ final public function setProjection($proj_params, $bSetUnitsAndExtents) {}
      * will be rotated by the angle in the clockwise direction.
      * Returns MS_SUCCESS or MS_FAILURE.
      *
-     * @param double $rotation_angle
+     * @param float $rotation_angle
      * @return int
      */
     final public function setRotation($rotation_angle) {}
@@ -3216,7 +3216,7 @@ final public function zoomRectangle(rectObj $oPixelExt, $nImageWidth, $nImageHei
      * If provided then it will be impossible to zoom/pan outside of
      * those extents.
      *
-     * @param double $nScaleDenom
+     * @param float $nScaleDenom
      * @param pointObj $oPixelPos
      * @param int $nImageWidth
      * @param int $nImageHeight
@@ -3400,26 +3400,26 @@ final public function setParameter($name, $value) {}
 final class pointObj
 {
     /**
-     * @var double
+     * @var float
      */
     public $x;
 
     /**
-     * @var double
+     * @var float
      */
     public $y;
 
     /**
      * used for 3d shape files. set to 0 for other types
      *
-     * @var double
+     * @var float
      */
     public $z;
 
     /**
      * used only for measured shape files - set to 0 for other types
      *
-     * @var double
+     * @var float
      */
     public $m;
 
@@ -3441,7 +3441,7 @@ final public function ms_newPointObj() {}
      *
      * @param pointObj $p1
      * @param pointObj $p2
-     * @return double
+     * @return float
      */
     final public function distanceToLine(pointObj $p1, pointObj $p2) {}
 
@@ -3449,7 +3449,7 @@ final public function distanceToLine(pointObj $p1, pointObj $p2) {}
      * Calculates distance between two points.
      *
      * @param pointObj $poPoint
-     * @return double
+     * @return float
      */
     final public function distanceToPoint(pointObj $poPoint) {}
 
@@ -3457,7 +3457,7 @@ final public function distanceToPoint(pointObj $poPoint) {}
      * Calculates the minimum distance between a point and a shape.
      *
      * @param shapeObj $shape
-     * @return double
+     * @return float
      */
     final public function distanceToShape(shapeObj $shape) {}
 
@@ -3492,9 +3492,9 @@ final public function project(projectionObj $in, projectionObj $out) {}
      * the 3rd parameter m is used for measured shape files only.
      * It is not mandatory.
      *
-     * @param double $x
-     * @param double $y
-     * @param double $m
+     * @param float $x
+     * @param float $y
+     * @param float $m
      * @return int
      */
     final public function setXY($x, $y, $m) {}
@@ -3505,10 +3505,10 @@ final public function setXY($x, $y, $m) {}
      * the 4th parameter m is used for measured shape files only.
      * It is not mandatory.
      *
-     * @param double $x
-     * @param double $y
-     * @param double $z
-     * @param double $m
+     * @param float $x
+     * @param float $y
+     * @param float $z
+     * @param float $m
      * @return int
      */
     final public function setXYZ($x, $y, $z, $m) {}
@@ -3623,22 +3623,22 @@ final public function updateFromString($snippet) {}
 final class rectObj
 {
     /**
-     * @var double
+     * @var float
      */
     public $minx;
 
     /**
-     * @var double
+     * @var float
      */
     public $miny;
 
     /**
-     * @var double
+     * @var float
      */
     public $maxx;
 
     /**
-     * @var double
+     * @var float
      */
     public $maxy;
 
@@ -3675,7 +3675,7 @@ final public function draw(mapObj $map, layerObj $layer, imageObj $img, $class_i
      *
      * @param int $width
      * @param int $height
-     * @return double
+     * @return float
      */
     final public function fit($width, $height) {}
 
@@ -3701,10 +3701,10 @@ final public function set($property_name,  $new_value) {}
     /**
      * Set the rectangle extents.
      *
-     * @param double $minx
-     * @param double $miny
-     * @param double $maxx
-     * @param double $maxy
+     * @param float $minx
+     * @param float $miny
+     * @param float $maxx
+     * @param float $maxy
      * @return void
      */
     final public function setextent($minx, $miny, $maxx, $maxy) {}
@@ -4282,7 +4282,7 @@ final public function free() {}
      * Returns the area of the shape (if applicable).
      * Only available if php/mapscript is built with GEOS library.
      *
-     * @return double
+     * @return float
      */
     final public function getArea() {}
 
@@ -4310,7 +4310,7 @@ final public function getLabelPoint() {}
      * nearest point on the shape object. Return a point object
      * of this point with the m value set.
      *
-     * @return double
+     * @return float
      */
     final public function getLength() {}
 
@@ -4318,7 +4318,7 @@ final public function getLength() {}
      * Apply only on Measured shape files. Given a measure m, retun the
      * corresponding XY location on the shapeobject.
      *
-     * @param double $m
+     * @param float $m
      * @return pointObj
      */
     final public function getPointUsingMeasure($m) {}
@@ -4401,7 +4401,7 @@ final public function setBounds() {}
      * error.  Only available if php/mapscript is built with GEOS library
      * (>=3.0).
      *
-     * @param double $tolerance
+     * @param float $tolerance
      * @return shapeObj|null
      */
     final public function simplify($tolerance) {}
@@ -4421,7 +4421,7 @@ final public function symdifference(shapeObj $shape) {}
      * error.  Only available if php/mapscript is built with GEOS library
      * (>=3.0).
      *
-     * @param double $tolerance
+     * @param float $tolerance
      * @return shapeObj|null
      */
     final public function topologyPreservingSimplify($tolerance) {}
@@ -4473,7 +4473,7 @@ final public function within(shapeObj $shape2) {}
 final class styleObj
 {
     /**
-     * @var double
+     * @var float
      */
     public $angle;
 
@@ -4493,32 +4493,32 @@ final class styleObj
     public $color;
 
     /**
-     * @var double
+     * @var float
      */
     public $maxsize;
 
     /**
-     * @var double
+     * @var float
      */
     public $maxvalue;
 
     /**
-     * @var double
+     * @var float
      */
     public $maxwidth;
 
     /**
-     * @var double
+     * @var float
      */
     public $minsize;
 
     /**
-     * @var double
+     * @var float
      */
     public $minvalue;
 
     /**
-     * @var double
+     * @var float
      */
     public $minwidth;
 
@@ -4550,7 +4550,7 @@ final class styleObj
     public $rangeitem;
 
     /**
-     * @var double
+     * @var float
      */
     public $size;
 
@@ -4565,7 +4565,7 @@ final class styleObj
     public $symbolname;
 
     /**
-     * @var double
+     * @var float
      */
     public $width;
 
@@ -4735,12 +4735,12 @@ final class symbolObj
     public $numpoints;
 
     /**
-     * @var double
+     * @var float
      */
     public $sizex;
 
     /**
-     * @var double
+     * @var float
      */
     public $sizey;
 
@@ -4909,7 +4909,7 @@ final class webObj
     public $log;
 
     /**
-     * @var double
+     * @var float
      */
     public $maxscaledenom;
 
@@ -4924,7 +4924,7 @@ final class webObj
     public $metadata;
 
     /**
-     * @var double
+     * @var float
      */
     public $minscaledenom;
 
diff --git a/mysqli/mysqli.php b/mysqli/mysqli.php
index 3a9b6ade1..ca5c83802 100644
--- a/mysqli/mysqli.php
+++ b/mysqli/mysqli.php
@@ -94,7 +94,7 @@ class mysqli  {
 	 */
 	public $info;
 	/**
-	 * @var mixed
+	 * @var int|string
 	 */
 	public $insert_id;
 	/**
@@ -1669,7 +1669,7 @@ function mysqli_fetch_field_direct ($result, $fieldnr) {}
  * @link https://php.net/manual/en/mysqli-result.lengths.php
  * @param mysqli_result $result A result set identifier returned by mysqli_query(),
  * mysqli_store_result() or mysqli_use_result().
- * @return array|false An array of integers representing the size of each column (not including any terminating null characters). FALSE if an error occurred.
+ * @return int[]|false An array of integers representing the size of each column (not including any terminating null characters). FALSE if an error occurred.
  */
 function mysqli_fetch_lengths ($result) {}
 
diff --git a/stomp/stomp.php b/stomp/stomp.php
index dfca88a58..74ae36c32 100644
--- a/stomp/stomp.php
+++ b/stomp/stomp.php
@@ -137,7 +137,7 @@ class StompFrame
 
     /**
      * Frame Command
-     * @var String
+     * @var string
      */
     public $command;
 
@@ -149,7 +149,7 @@ class StompFrame
 
     /**
      * Frame body
-     * @var String
+     * @var string
      */
     public $body;
 }
diff --git a/tests/Parsers/MetaExpectedArgumentsCollector.php b/tests/Parsers/MetaExpectedArgumentsCollector.php
index 594b9d341..ffbe9bfba 100644
--- a/tests/Parsers/MetaExpectedArgumentsCollector.php
+++ b/tests/Parsers/MetaExpectedArgumentsCollector.php
@@ -21,7 +21,7 @@ class MetaExpectedArgumentsCollector extends NodeVisitorAbstract
      */
     private array $expectedArgumentsInfos;
     /**
-     * @var String[]
+     * @var string[]
      */
     private array $registeredArgumentsSet;
 
@@ -64,7 +64,7 @@ public function getExpectedArgumentsInfos(): array
     }
 
     /**
-     * @return String[]
+     * @return string[]
      */
     public function getRegisteredArgumentsSet(): array
     {
diff --git a/tests/StubsMetaExpectedArgumentsTest.php b/tests/StubsMetaExpectedArgumentsTest.php
index 279665070..72a91d6b7 100644
--- a/tests/StubsMetaExpectedArgumentsTest.php
+++ b/tests/StubsMetaExpectedArgumentsTest.php
@@ -22,7 +22,7 @@ class StubsMetaExpectedArgumentsTest extends TestCase
      */
     private static array $expectedArguments;
     /**
-     * @var String[]
+     * @var string[]
      */
     private static array $registeredArgumentsSet;
     private static $functionsFqns;