diff --git a/composer.json b/composer.json index cb6e7b5f..fb22bbe8 100644 --- a/composer.json +++ b/composer.json @@ -13,11 +13,11 @@ "require": { "php": "~8.1.0 || ~8.2.0", "ext-mbstring": "*", + "elephox/mimey": "^4.0", "jetbrains/phpstorm-attributes": "^1.0", "psr/cache": "^3.0", "psr/container": "^2.0", - "ricardoboss/php-console-logger": "^1.8", - "elephox/mimey": "^4.0" + "ricardoboss/php-console-logger": "^1.8" }, "require-dev": { "ext-json": "*", @@ -149,6 +149,9 @@ "phpunit --configuration=phpunit.xml.dist --no-interaction --coverage-xml=build/coverage/coverage-xml --log-junit=build/coverage/junit.xml --coverage-clover=build/coverage/clover.xml --coverage-html=build/coverage/html" ], "local-ci": [ + "@composer validate --no-interaction --strict", + "@composer install --no-interaction --no-scripts --ignore-platform-req=php+", + "@composer modules:normalize", "@update-readme", "@check-dependencies", "@static-analysis", diff --git a/composer.lock b/composer.lock index 8d8fbe87..298c60de 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "3c8259422d85a15002aa3045305c7146", + "content-hash": "0b2ff594a68c710893d258a8218dd3c1", "packages": [ { "name": "elephox/mimey", @@ -5107,12 +5107,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Mbstring\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ diff --git a/modules/Cache/composer.json b/modules/Cache/composer.json index d9459ec5..28f6f3cf 100644 --- a/modules/Cache/composer.json +++ b/modules/Cache/composer.json @@ -11,11 +11,11 @@ ], "require": { "php": "~8.1.0 || ~8.2.0", - "psr/cache": "^3.0", "elephox/collection": "^0.3", "elephox/files": "^0.3", "elephox/stream": "^0.3", - "jetbrains/phpstorm-attributes": "^1.0" + "jetbrains/phpstorm-attributes": "^1.0", + "psr/cache": "^3.0" }, "autoload": { "psr-4": { diff --git a/modules/Collection/src/Contract/GenericEnumerable.php b/modules/Collection/src/Contract/GenericEnumerable.php index 80eaba0e..3e559570 100644 --- a/modules/Collection/src/Contract/GenericEnumerable.php +++ b/modules/Collection/src/Contract/GenericEnumerable.php @@ -309,7 +309,7 @@ public function takeWhile(callable $predicate): GenericEnumerable; /** * @template TArrayKey as array-key * - * @param null|callable(TSource): TArrayKey $keySelector + * @param null|callable(NonNegativeInteger, TSource): TArrayKey $keySelector * * @return array */ diff --git a/modules/Files/composer.json b/modules/Files/composer.json index e6ceb47d..326e3ff2 100644 --- a/modules/Files/composer.json +++ b/modules/Files/composer.json @@ -12,9 +12,9 @@ "require": { "php": "~8.1.0 || ~8.2.0", "elephox/collection": "^0.3", - "elephox/support": "^0.3", - "elephox/stream": "^0.3", "elephox/mimey": "^4.0", + "elephox/stream": "^0.3", + "elephox/support": "^0.3", "jetbrains/phpstorm-attributes": "^1.0" }, "autoload": { diff --git a/modules/Http/composer.json b/modules/Http/composer.json index 5a6ba58e..5c89e1a8 100644 --- a/modules/Http/composer.json +++ b/modules/Http/composer.json @@ -8,6 +8,8 @@ "ext-mbstring": "*", "elephox/collection": "^0.3", "elephox/files": "^0.3", + "elephox/mimey": "^4.0", + "elephox/oor": "^0.3", "elephox/stream": "^0.3", "elephox/support": "^0.3", "jetbrains/phpstorm-attributes": "^1.0" diff --git a/modules/Http/src/Contract/Response.php b/modules/Http/src/Contract/Response.php index 0724f5f3..e8e05126 100644 --- a/modules/Http/src/Contract/Response.php +++ b/modules/Http/src/Contract/Response.php @@ -5,7 +5,7 @@ use Elephox\Http\ResponseCode; use JetBrains\PhpStorm\Pure; -use Mimey\MimeTypeInterface; +use Elephox\Mimey\MimeTypeInterface; interface Response extends Message { diff --git a/modules/Http/src/Contract/ResponseBuilder.php b/modules/Http/src/Contract/ResponseBuilder.php index c375b277..8689d3bb 100644 --- a/modules/Http/src/Contract/ResponseBuilder.php +++ b/modules/Http/src/Contract/ResponseBuilder.php @@ -4,7 +4,7 @@ namespace Elephox\Http\Contract; use Elephox\Http\ResponseCode; -use Mimey\MimeTypeInterface; +use Elephox\Mimey\MimeTypeInterface; /** * @psalm-consistent-constructor diff --git a/modules/Http/src/Response.php b/modules/Http/src/Response.php index 801ac1d1..aa821edf 100644 --- a/modules/Http/src/Response.php +++ b/modules/Http/src/Response.php @@ -7,7 +7,7 @@ use Elephox\Stream\Contract\Stream; use JetBrains\PhpStorm\Immutable; use JetBrains\PhpStorm\Pure; -use Mimey\MimeTypeInterface; +use Elephox\Mimey\MimeTypeInterface; #[Immutable] class Response extends AbstractMessage implements Contract\Response diff --git a/modules/Http/src/ResponseBuilder.php b/modules/Http/src/ResponseBuilder.php index 0c0e786c..a07f7a73 100644 --- a/modules/Http/src/ResponseBuilder.php +++ b/modules/Http/src/ResponseBuilder.php @@ -9,8 +9,8 @@ use JetBrains\PhpStorm\Pure; use JsonException; use LogicException; -use Mimey\MimeType; -use Mimey\MimeTypeInterface; +use Elephox\Mimey\MimeType; +use Elephox\Mimey\MimeTypeInterface; /** * @psalm-consistent-constructor diff --git a/modules/Stream/src/StringStream.php b/modules/Stream/src/StringStream.php index 9a3c4380..a06cecce 100644 --- a/modules/Stream/src/StringStream.php +++ b/modules/Stream/src/StringStream.php @@ -13,9 +13,14 @@ class StringStream implements Stream { #[Pure] - public static function from(string|Stringable $string): Stream + public static function from( + string|Stringable $string, + bool $seekable = true, + bool $writeable = false, + bool $readable = true + ): Stream { - return new self($string); + return new self((string)$string, $readable, $seekable, $writeable); } private bool $detached = false; @@ -26,9 +31,9 @@ public static function from(string|Stringable $string): Stream #[Pure] public function __construct( private string $string, - private bool $seekable = true, - private bool $writeable = false, - private bool $readable = true + private bool $readable = true, + private bool $seekable = true, + private bool $writeable = false ) { }