Upgrade phpstan (1.9) and remove psalm (#69)

* Upgrade phpstan (1.9) and remove psalm

* Update readme

README.md

@@ -15,7 +15,7 @@ At the moment, in the experimental phase.
 
 **[Documentation](https://munusphp.github.io/docs/start)**
 
-Due to the lack of generic types, Munus achieves genericity with the help of [Psalm](https://github.com/vimeo/psalm) `template` annotation.
+Due to the lack of generic types, Munus achieves genericity with the help of [PHPStan](https://phpstan.org/blog/generics-in-php-using-phpdocs) `template` annotation.
 
 Stream example: find the sum of the first ten squares of even numbers
 ```php

composer.json

@@ -15,9 +15,7 @@
  "require-dev": {
  "friendsofphp/php-cs-fixer": "^3.9",
  "phpunit/phpunit": "^8.4",
- "vimeo/psalm": "^4.9",
- "phpstan/phpstan": "^0.12",
- "psalm/plugin-phpunit": "^0.15"
+ "phpstan/phpstan": "^1.9"
  },
  "autoload": {
  "psr-4": {
@@ -44,9 +42,6 @@
  "phpstan": [
  "phpstan analyse src tests --level=4"
  ],
- "psalm": [
- "psalm --show-info=false"
- ],
  "phpunit": [
  "phpunit --color=always"
  ],

src/Collection/Iterator.php

@@ -140,7 +140,7 @@ public function reduce(callable $operation)
  }
 
  $accumulator = $this->next();
- while ($this->hasNext()) {
+ while ($this->hasNext()) { // @phpstan-ignore-line
  $accumulator = $operation($accumulator, $this->next());
  }
 

src/Collection/Map.php

@@ -77,7 +77,10 @@ public function get(): Option
  }
  $key = func_get_arg(0);
 
- return isset($this->map[$key]) ? Option::some($this->map[$key]) : Option::none();
+ /** @var Option<V> $option */
+ $option = isset($this->map[$key]) ? Option::some($this->map[$key]) : Option::none();
+
+ return $option;
  }
 
  /**

src/Control/Option.php

@@ -24,7 +24,10 @@ abstract class Option extends Value
  */
  public static function of($value): self
  {
- return $value === null ? self::none() : self::some($value);
+ /** @var Option<U> $option */
+ $option = $value === null ? self::none() : self::some($value);
+
+ return $option;
  }
 
  /**

tests/Collection/IteratorTest.php

@@ -73,4 +73,11 @@ public function testCompositeIterator(): void
  self::assertEquals(4, $iterator->next());
  self::assertFalse($iterator->hasNext());
  }
+
+ public function testReduce(): void
+ {
+ $iterator = Iterator::of(1, 2, 3);
+
+ self::assertEquals(6, $iterator->reduce(fn (int $a, int $b) => $a + $b));
+ }
 }