Skip to content

Commit

Permalink
update stubs after rebase on master
Browse files Browse the repository at this point in the history
  • Loading branch information
isfedorov committed Aug 14, 2021
1 parent 2722128 commit 84f5b80
Show file tree
Hide file tree
Showing 17 changed files with 327 additions and 268 deletions.
3 changes: 3 additions & 0 deletions PhpStormStubsMap.php
Original file line number Diff line number Diff line change
Expand Up @@ -7593,6 +7593,7 @@ final class PhpStormStubsMap
'ILL_ILLTRP' => 'pcntl/pcntl.php',
'ILL_PRVOPC' => 'pcntl/pcntl.php',
'ILL_PRVREG' => 'pcntl/pcntl.php',
'IMAGETYPE_AVIF' => 'standard/standard_defines.php',
'IMAGETYPE_BMP' => 'standard/standard_defines.php',
'IMAGETYPE_COUNT' => 'standard/standard_defines.php',
'IMAGETYPE_GIF' => 'standard/standard_defines.php',
Expand Down Expand Up @@ -11352,6 +11353,7 @@ final class PhpStormStubsMap
'SO_FREE' => 'imap/imap.php',
'SO_KEEPALIVE' => 'sockets/sockets.php',
'SO_LINGER' => 'sockets/sockets.php',
'SO_MARK' => 'sockets/sockets.php',
'SO_NOSERVER' => 'imap/imap.php',
'SO_OOBINLINE' => 'sockets/sockets.php',
'SO_PASSCRED' => 'sockets/sockets.php',
Expand Down Expand Up @@ -12151,6 +12153,7 @@ final class PhpStormStubsMap
'T_PRIVATE' => 'tokenizer/tokenizer.php',
'T_PROTECTED' => 'tokenizer/tokenizer.php',
'T_PUBLIC' => 'tokenizer/tokenizer.php',
'T_READONLY' => 'tokenizer/tokenizer.php',
'T_REQUIRE' => 'tokenizer/tokenizer.php',
'T_REQUIRE_ONCE' => 'tokenizer/tokenizer.php',
'T_RETURN' => 'tokenizer/tokenizer.php',
Expand Down
4 changes: 2 additions & 2 deletions date/date.php
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ function gmdate(string $format, ?int $timestamp) {}
#[Pure]
function mktime(
#[PhpStormStubsElementAvailable(from: '5.3', to: '7.4')] int $hour = null,
#[PhpStormStubsElementAvailable(from: '8.0')] int $hour = null,
#[PhpStormStubsElementAvailable(from: '8.0')] int $hour,
?int $minute = null,
?int $second = null,
?int $month = null,
Expand Down Expand Up @@ -502,7 +502,7 @@ function mktime(
#[Pure]
function gmmktime(
#[PhpStormStubsElementAvailable(from: '5.3', to: '7.4')] int $hour = null,
#[PhpStormStubsElementAvailable(from: '8.0')] int $hour = null,
#[PhpStormStubsElementAvailable(from: '8.0')] int $hour,
?int $minute = null,
?int $second = null,
?int $month = null,
Expand Down
15 changes: 11 additions & 4 deletions gd/gd.php
Original file line number Diff line number Diff line change
Expand Up @@ -1149,7 +1149,8 @@ function imagefilledpolygon(
GdImage $image,
array $points,
#[Deprecated(since: "8.1")] int $num_points_or_color,
#[Required(from: '5.3', to: '7.4')] ?int $color = null
#[PhpStormStubsElementAvailable(from: '5.3', to: '7.4')] ?int $color,
#[PhpStormStubsElementAvailable(from: '8.0')] ?int $color = null
): bool {}

/**
Expand Down Expand Up @@ -1343,7 +1344,8 @@ function imagepolygon(
GdImage $image,
array $points,
int $num_points_or_color,
#[Required(from: '5.3', to: '7.4')] ?int $color = null
#[PhpStormStubsElementAvailable(from: '5.3', to: '7.4')] ?int $color,
#[PhpStormStubsElementAvailable(from: '8.0')] ?int $color = null
): bool {}

/**
Expand Down Expand Up @@ -2246,7 +2248,8 @@ function imageopenpolygon(
GdImage $image,
array $points,
#[Deprecated(since: "8.1")] int $num_points_or_color,
#[Required(from: '7.2', to: '7.4')] ?int $color = null
#[PhpStormStubsElementAvailable(from: '5.3', to: '7.4')] ?int $color,
#[PhpStormStubsElementAvailable(from: '8.0')] ?int $color = null
): bool {}

/**
Expand Down Expand Up @@ -2922,7 +2925,11 @@ function imageaffinematrixconcat(array $matrix1, array $matrix2): array|false {}
* @return float[]|false Array with keys 0 to 5 and float values or <b>FALSE</b> on failure.
* @since 5.5
*/
function imageaffinematrixget(int $type, #[Required(from: '8.0')] $options = null): array|false {}
function imageaffinematrixget(
int $type,
#[PhpStormStubsElementAvailable(from: '5.3', to: '7.4')] $options = null,
#[PhpStormStubsElementAvailable(from: '8.0')] $options
): array|false {}

/**
* Crop an image using the given coordinates and size, x, y, width and height
Expand Down
4 changes: 2 additions & 2 deletions imap/imap.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
// Start of imap v.
use JetBrains\PhpStorm\Internal\LanguageLevelTypeAware;
use JetBrains\PhpStorm\Internal\PhpStormStubsElementAvailable;
use JetBrains\PhpStorm\Internal\Required;

/**
* Open an IMAP stream to a mailbox
Expand Down Expand Up @@ -495,7 +494,8 @@ function imap_fetchstructure(#[LanguageLevelTypeAware(['8.1' => 'IMAP\Connection
*/
function imap_gc(
#[LanguageLevelTypeAware(['8.1' => 'IMAP\Connection'], default: 'resource')] $imap,
#[Required(from: '8.0')] int $flags = 0
#[PhpStormStubsElementAvailable(from: '5.3', to: '7.4')] int $flags = 0,
#[PhpStormStubsElementAvailable(from: '8.0')] int $flags
): bool {}

/**
Expand Down
Loading

0 comments on commit 84f5b80

Please sign in to comment.