Resolved remaining psalm issues and updated composer.lock

elephox-dev · Feb 13, 2022 · a352016 · a352016
1 parent bae1793
commit a352016
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 22 deletions.
diff --git 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
diff --git 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
@@ -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<TArrayKey, TSource>
 	 */

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
 	) {
 	}