Merge branch 'next' into develop

* next: test against lowest dependencies use ramsey/composer-install fix php version fix psalm errors update dependencies CS use CS 2 change email CS declare all structures as immutable prepare for next release drop php 7 support
Innmind · Mar 27, 2022 · dcce687 · dcce687
2 parents afec649 + 076fe2e
commit dcce687
Show file tree

Hide file tree

Showing 35 changed files with 682 additions and 518 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,7 +8,8 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macOS-latest]
-        php-version: ['7.4', '8.0']
+        php-version: ['8.1']
+        dependencies: ['lowest', 'highest']
     name: 'PHPUnit'
     steps:
       - name: Checkout
@@ -19,17 +20,10 @@ jobs:
           php-version: ${{ matrix.php-version }}
           extensions: mbstring, intl
           coverage: xdebug
-      - name: Get Composer Cache Directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-      - name: Cache dependencies
-        uses: actions/cache@v2
+      - name: Composer
+        uses: "ramsey/composer-install@v2"
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
-          restore-keys: ${{ runner.os }}-composer-
-      - name: Install Dependencies
-        run: composer install
+          dependency-versions: ${{ matrix.dependencies }}
       - name: PHPUnit
         run: vendor/bin/phpunit --coverage-clover=coverage.clover
       - uses: codecov/codecov-action@v1
@@ -39,7 +33,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-version: ['7.4', '8.0']
+        php-version: ['8.1']
+        dependencies: ['lowest', 'highest']
     name: 'Psalm'
     steps:
       - name: Checkout
@@ -49,24 +44,17 @@ jobs:
         with:
           php-version: ${{ matrix.php-version }}
           extensions: mbstring, intl
-      - name: Get Composer Cache Directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-      - name: Cache dependencies
-        uses: actions/cache@v2
+      - name: Composer
+        uses: "ramsey/composer-install@v2"
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
-          restore-keys: ${{ runner.os }}-composer-
-      - name: Install Dependencies
-        run: composer install
+          dependency-versions: ${{ matrix.dependencies }}
       - name: Psalm
         run: vendor/bin/psalm --shepherd
   cs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-version: ['7.4']
+        php-version: ['8.1']
     name: 'CS'
     steps:
       - name: Checkout
@@ -76,16 +64,7 @@ jobs:
         with:
           php-version: ${{ matrix.php-version }}
           extensions: mbstring, intl
-      - name: Get Composer Cache Directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-      - name: Cache dependencies
-        uses: actions/cache@v2
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }}
-          restore-keys: ${{ runner.os }}-${{ matrix.php-version }}-composer-
-      - name: Install Dependencies
-        run: composer install --no-progress
+      - name: Composer
+        uses: "ramsey/composer-install@v2"
       - name: CS
-        run: vendor/bin/php-cs-fixer fix --diff --dry-run --diff-format udiff
+        run: vendor/bin/php-cs-fixer fix --diff --dry-run
diff --git a/.php_cs.dist → .php-cs-fixer.dist.php b/.php_cs.dist → .php-cs-fixer.dist.php
diff --git a/composer.json b/composer.json
@@ -8,17 +8,17 @@
     "authors": [
         {
             "name": "Baptiste Langlade",
-            "email": "langlade.baptiste@gmail.com"
+            "email": "baptiste.langlade@hey.com"
         }
     ],
     "support": {
         "issues": "http://github.com/Innmind/StackTrace/issues"
     },
     "require": {
-        "php": "~7.4|~8.0",
-        "innmind/immutable": "~3.0",
-        "innmind/url": "~3.0",
-        "innmind/graphviz": "~2.0"
+        "php": "~8.1",
+        "innmind/immutable": "~4.1",
+        "innmind/url": "~4.0",
+        "innmind/graphviz": "~3.1"
     },
     "autoload": {
         "psr-4": {
@@ -32,10 +32,9 @@
     },
     "require-dev": {
         "phpunit/phpunit": "~9.0",
-        "innmind/file-watch": "~2.0",
-        "innmind/operating-system": "^2.0",
-        "vimeo/psalm": "~4.4",
+        "innmind/operating-system": "~3.0",
+        "vimeo/psalm": "~4.21",
         "innmind/black-box": "^4.16",
-        "innmind/coding-standard": "^1.1"
+        "innmind/coding-standard": "~2.0"
     }
 }
diff --git a/graph.dot b/graph.dot
diff --git a/graph.svg b/graph.svg
diff --git a/render.php b/render.php
@@ -2,16 +2,15 @@
 
 require __DIR__.'/vendor/autoload.php';
 
-use function Innmind\FileWatch\bootstrap;
 use Innmind\OperatingSystem\Factory;
-use Innmind\TimeWarp\Halt\Usleep;
 use Innmind\Url\Path;
 use Innmind\Server\Control\Server\Command;
+use Innmind\Immutable\Either;
 
 $os = Factory::build();
-$watch = bootstrap($os->control()->processes(), new Usleep, $os->clock());
+$watch = $os->filesystem()->watch(Path::of(__DIR__.'/graph.dot'));
 
-$watch(Path::of(__DIR__.'/graph.dot'))(function() use ($os): void {
+$watch($os, function($os): Either {
     $process = $os
         ->control()
         ->processes()
@@ -21,8 +20,9 @@
                 ->withShortOption('o', 'graph.svg')
                 ->withArgument('graph.dot')
         );
-    $process->wait();
 
     echo $process->output()->toString();
     echo 'rendered'."\n";
+
+    return Either::right($os);
 });
diff --git a/src/CallFrame.php b/src/CallFrame.php
@@ -5,6 +5,9 @@
 
 use Innmind\Immutable\Sequence;
 
+/**
+ * @psalm-immutable
+ */
 interface CallFrame
 {
     public function arguments(): Sequence;

diff --git a/src/CallFrame/FunctionCall.php b/src/CallFrame/FunctionCall.php
@@ -10,6 +10,9 @@
 use Innmind\Url\Url;
 use Innmind\Immutable\Sequence;
 
+/**
+ * @psalm-immutable
+ */
 final class FunctionCall implements UserLand
 {
     private FunctionName $functionName;
@@ -18,13 +21,15 @@ final class FunctionCall implements UserLand
     private Sequence $arguments;
 
     /**
+     * @no-named-arguments
+     *
      * @param mixed $arguments
      */
     public function __construct(
         FunctionName $functionName,
         Url $file,
         Line $line,
-        ...$arguments
+        ...$arguments,
     ) {
         $this->functionName = $functionName;
         $this->file = $file;

diff --git a/src/CallFrame/InternalFunctionCall.php b/src/CallFrame/InternalFunctionCall.php
@@ -11,13 +11,16 @@
 
 /**
  * Function called within language function (ie: array_map) or by reflection
+ * @psalm-immutable
  */
 final class InternalFunctionCall implements CallFrame
 {
     private FunctionName $functionName;
     private Sequence $arguments;
 
     /**
+     * @no-named-arguments
+     *
      * @param mixed $arguments
      */
     public function __construct(FunctionName $functionName, ...$arguments)

diff --git a/src/CallFrame/InternalMethodCall.php b/src/CallFrame/InternalMethodCall.php
@@ -12,6 +12,7 @@
 
 /**
  * Function called within language function (ie: array_map) or by reflection
+ * @psalm-immutable
  */
 final class InternalMethodCall implements CallFrame
 {
@@ -20,12 +21,14 @@ final class InternalMethodCall implements CallFrame
     private Sequence $arguments;
 
     /**
+     * @no-named-arguments
+     *
      * @param mixed $arguments
      */
     public function __construct(
         ClassName $class,
         Method $method,
-        ...$arguments
+        ...$arguments,
     ) {
         $this->class = $class;
         $this->method = $method;

diff --git a/src/CallFrame/InternalStaticMethodCall.php b/src/CallFrame/InternalStaticMethodCall.php
@@ -12,6 +12,7 @@
 
 /**
  * Function called within language function (ie: array_map) or by reflection
+ * @psalm-immutable
  */
 final class InternalStaticMethodCall implements CallFrame
 {
@@ -20,12 +21,14 @@ final class InternalStaticMethodCall implements CallFrame
     private Sequence $arguments;
 
     /**
+     * @no-named-arguments
+     *
      * @param mixed $arguments
      */
     public function __construct(
         ClassName $class,
         Method $method,
-        ...$arguments
+        ...$arguments,
     ) {
         $this->class = $class;
         $this->method = $method;

diff --git a/src/CallFrame/MethodCall.php b/src/CallFrame/MethodCall.php
@@ -11,6 +11,9 @@
 use Innmind\Url\Url;
 use Innmind\Immutable\Sequence;
 
+/**
+ * @psalm-immutable
+ */
 final class MethodCall implements UserLand
 {
     private ClassName $class;
@@ -20,14 +23,16 @@ final class MethodCall implements UserLand
     private Sequence $arguments;
 
     /**
+     * @no-named-arguments
+     *
      * @param mixed $arguments
      */
     public function __construct(
         ClassName $class,
         Method $method,
         Url $file,
         Line $line,
-        ...$arguments
+        ...$arguments,
     ) {
         $this->class = $class;
         $this->method = $method;

diff --git a/src/CallFrame/StaticMethodCall.php b/src/CallFrame/StaticMethodCall.php
@@ -11,6 +11,9 @@
 use Innmind\Url\Url;
 use Innmind\Immutable\Sequence;
 
+/**
+ * @psalm-immutable
+ */
 final class StaticMethodCall implements UserLand
 {
     private ClassName $class;
@@ -20,14 +23,16 @@ final class StaticMethodCall implements UserLand
     private Sequence $arguments;
 
     /**
+     * @no-named-arguments
+     *
      * @param mixed $arguments
      */
     public function __construct(
         ClassName $class,
         Method $method,
         Url $file,
         Line $line,
-        ...$arguments
+        ...$arguments,
     ) {
         $this->class = $class;
         $this->method = $method;

diff --git a/src/CallFrame/UserLand.php b/src/CallFrame/UserLand.php
@@ -9,6 +9,9 @@
 };
 use Innmind\Url\Url;
 
+/**
+ * @psalm-immutable
+ */
 interface UserLand extends CallFrame
 {
     public function file(): Url;