Merge branch '2.0' into phpunit11

# Conflicts:
#	composer.json

.editorconfig

@@ -1,5 +1,3 @@
-# editorconfig.org
-
 root = true
 
 [*]
@@ -10,5 +8,14 @@ indent_style = space
 indent_size = 4
 trim_trailing_whitespace = true
 
-[*.json]
+[*.{yml, yaml, sh, conf, neon*}]
 indent_size = 2
+
+[*.http]
+end_of_line = crlf
+
+[*.md]
+trim_trailing_whitespace = false
+
+[Makefile]
+indent_style = tab

.gitattributes

@@ -1,10 +1,7 @@
-/.github            export-ignore
-/.gitattributes     export-ignore
-/.gitignore         export-ignore
-/phpunit.xml.dist   export-ignore
-/tests              export-ignore
-/.editorconfig      export-ignore
-/.php_cs.dist.php   export-ignore
-/psalm.xml          export-ignore
-/psalm.xml.dist     export-ignore
-/UPGRADING.md       export-ignore
+/.*      export-ignore
+/tests   export-ignore
+/*.xml   export-ignore
+/*.yml   export-ignore
+/*.lock  export-ignore
+/*.dist  export-ignore
+Makefile               export-ignore

.github/workflows/cs-fix.yml

@@ -0,0 +1,16 @@
+---
+
+on:  # yamllint disable-line rule:truthy
+  push:
+    branches:
+      - '*'
+
+name: Fix Code Style
+
+jobs:
+  cs-fix:
+    permissions:
+      contents: write
+    uses: spiral/gh-actions/.github/workflows/cs-fix.yml@master
+
+...

.github/workflows/psalm.yml

@@ -0,0 +1,15 @@
+on:
+    pull_request: null
+    push:
+        branches:
+            - master
+            - '*.*'
+
+name: static analysis
+
+jobs:
+    psalm:
+        uses: spiral/gh-actions/.github/workflows/psalm.yml@master
+        with:
+            os: >-
+                ['ubuntu-latest']

.gitignore

@@ -1,12 +1,8 @@
-.idea
-.php_cs
-.php_cs.cache
-.phpunit.result.cache
-build
-composer.lock
-coverage
-docs
-vendor
-node_modules
-.php-cs-fixer.cache
-.phpunit.cache/
+/.*/
+!/.github/
+/runtime/
+/vendor/
+/.env
+/composer.lock
+*.log
+*.exe

.php-cs-fixer.dist.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+require_once 'vendor/autoload.php';
+
+return \Spiral\CodeStyle\Builder::create()
+    ->include(__DIR__ . '/src')
+    ->include(__DIR__ . '/tests')
+    ->include(__FILE__)
+    ->cache('./runtime/php-cs-fixer.cache')
+    ->allowRisky(false)
+    ->build();

composer.json

@@ -1,95 +1,107 @@
 {
-  "name": "spiral/testing",
-  "description": "Spiral Framework testing SDK",
-  "keywords": ["spiral-packages", "spiral", "testing"],
-  "license": "MIT",
-  "authors": [
-    {
-      "name": "Anton Titov (wolfy-j)",
-      "email": "[email protected]"
+    "name": "spiral/testing",
+    "description": "Spiral Framework testing SDK",
+    "keywords": [
+        "spiral-packages",
+        "spiral",
+        "testing"
+    ],
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Anton Titov (wolfy-j)",
+            "email": "[email protected]"
+        },
+        {
+            "name": "Pavel Buchnev (butschster)",
+            "email": "[email protected]"
+        },
+        {
+            "name": "Aleksei Gagarin (roxblnfk)",
+            "email": "[email protected]"
+        },
+        {
+            "name": "Maksim Smakouz (msmakouz)",
+            "email": "[email protected]"
+        },
+        {
+            "name": "RoadRunner Community",
+            "homepage": "https://github.com/spiral/roadrunner/graphs/contributors"
+        }
+    ],
+    "homepage": "https://spiral.dev/",
+    "support": {
+        "docs": "https://spiral.dev/docs/testing-start",
+        "issues": "https://github.com/spiral/testing/issues",
+        "chat": "https://discord.gg/TFeEmCs"
     },
-    {
-      "name": "Pavel Buchnev (butschster)",
-      "email": "[email protected]"
+    "funding": [
+        {
+            "type": "github",
+            "url": "https://github.com/sponsors/spiral"
+        }
+    ],
+    "require": {
+        "ext-json": "*",
+        "php": ">=8.1",
+        "nyholm/psr7": "^1.5",
+        "mockery/mockery": "^1.5",
+        "phpunit/phpunit": "^9.6 || ^10.0 | ^11.0",
+        "spiral/auth": "^3.14.8",
+        "spiral/auth-http": "^3.14.8",
+        "spiral/boot": "^3.14.8",
+        "spiral/events": "^3.14.8",
+        "spiral/console": "^3.14.8",
+        "spiral/core": "^3.14.8",
+        "spiral/http": "^3.14.8",
+        "spiral/mailer": "^3.14.8",
+        "spiral/queue": "^3.14.8",
+        "spiral/session": "^3.14.8",
+        "spiral/security": "^3.14.8",
+        "spiral/tokenizer": "^3.14.8",
+        "spiral/storage": "^3.14.8",
+        "spiral/views": "^3.14.8",
+        "spiral/translator": "^3.14.8",
+        "spiral/scaffolder": "^3.14.8",
+        "symfony/mime": "^6.0 || ^7.0"
     },
-    {
-      "name": "Aleksei Gagarin (roxblnfk)",
-      "email": "[email protected]"
+    "suggest": {
+        "brianium/paratest": "Required to run tests in parallel (^6.0).",
+        "ext-gd": "Required to use generate fake image files"
     },
-    {
-      "name": "Maksim Smakouz (msmakouz)",
-      "email": "[email protected]"
+    "require-dev": {
+        "spiral-packages/league-event": "^1.0.1",
+        "spiral/code-style": "^2.2",
+        "spiral/dumper": "^3.3",
+        "spiral/framework": "^3.14.8",
+        "spiral/nyholm-bridge": "^1.3",
+        "spiral/roadrunner-bridge": "^2.2 || ^3.7 || ^4.0",
+        "vimeo/psalm": "^5.9"
     },
-    {
-      "name": "RoadRunner Community",
-      "homepage": "https://github.com/spiral/roadrunner/graphs/contributors"
-    }
-  ],
-  "homepage": "https://spiral.dev/",
-  "support": {
-    "docs": "https://spiral.dev/docs/testing-start",
-    "issues": "https://github.com/spiral/testing/issues",
-    "forum": "https://forum.roadrunner.dev/",
-    "chat": "https://discord.gg/TFeEmCs"
-  },
-  "funding": [
-    {
-      "type": "github",
-      "url": "https://github.com/sponsors/roadrunner-server"
-    }
-  ],
-  "require": {
-    "ext-json": "*",
-    "php": ">=8.1",
-    "nyholm/psr7": "^1.5",
-    "mockery/mockery": "^1.5",
-    "phpunit/phpunit": "^9.6 || ^10.0 || ^11.0",
-    "spiral/auth": "^3.14.3",
-    "spiral/auth-http": "^3.14.3",
-    "spiral/boot": "^3.14.3",
-    "spiral/events": "^3.14.3",
-    "spiral/console": "^3.14.3",
-    "spiral/core": "^3.14.3",
-    "spiral/http": "^3.14.3",
-    "spiral/mailer": "^3.14.3",
-    "spiral/queue": "^3.14.3",
-    "spiral/session": "^3.14.3",
-    "spiral/security": "^3.14.3",
-    "spiral/tokenizer": "^3.14.3",
-    "spiral/storage": "^3.14.3",
-    "spiral/views": "^3.14.3",
-    "spiral/translator": "^3.14.3",
-    "spiral/scaffolder": "^3.14.3",
-    "symfony/mime": "^6.0 || ^7.0"
-  },
-  "suggest": {
-    "brianium/paratest": "Required to run tests in parallel (^6.0).",
-    "ext-gd": "Required to use generate fake image files"
-  },
-  "require-dev": {
-    "spiral/dumper": "^3.3",
-    "spiral/framework": "^3.14.3",
-    "spiral/roadrunner-bridge": "^2.2 || ^3.7 || ^4.0",
-    "spiral-packages/league-event": "^1.0.1",
-    "spiral/nyholm-bridge": "^1.3",
-    "vimeo/psalm": "^5.9"
-  },
-  "autoload": {
-    "psr-4": {
-      "Spiral\\Testing\\": "src"
-    }
-  },
-  "autoload-dev": {
-    "psr-4": {
-      "Spiral\\Testing\\Tests\\App\\": "tests/app",
-      "Spiral\\Testing\\Tests\\": "tests/src"
-    }
-  },
-  "minimum-stability": "dev",
-  "prefer-stable": true,
-  "config": {
-    "allow-plugins": {
-      "spiral/composer-publish-plugin": false
+    "autoload": {
+        "psr-4": {
+            "Spiral\\Testing\\": "src"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Spiral\\Testing\\Tests\\App\\": "tests/app",
+            "Spiral\\Testing\\Tests\\": "tests/src"
+        }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true,
+    "config": {
+        "sort-packages": true,
+        "allow-plugins": {
+            "spiral/composer-publish-plugin": false
+        }
+    },
+    "scripts": {
+        "cs:diff": "php-cs-fixer fix --dry-run -v --diff",
+        "cs:fix": "php-cs-fixer fix -v",
+        "psalm": "psalm",
+        "psalm:baseline": "psalm --set-baseline=psalm-baseline.xml",
+        "test": "phpunit --color=always"
     }
-  }
 }