Merge pull request #96: Update metafiles and codestyle

.editorconfig

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

.gitattributes

@@ -1,7 +1,7 @@
-/.github export-ignore
-/tests export-ignore
-.editorconfig export-ignore
-.gitattributes export-ignore
-.gitignore export-ignore
-.travis.yml export-ignore
-phpunit.xml export-ignore
+/.*      export-ignore
+/tests   export-ignore
+/*.xml   export-ignore
+/*.yml   export-ignore
+/*.lock  export-ignore
+/*.dist  export-ignore
+/*.php   export-ignore

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: spiral

.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,19 +1,5 @@
-# IDEA
-.idea/
-*.iml
-
-# Composer
-vendor/
+/.*
+!/.github/
+/runtime/
+/vendor/
 composer.lock
-composer.phar
-
-# OS
-.DS_Store
-Thumbs.db
-
-# Other
-.phpunit.result.cache
-.php_cs.cache
-clover.xml
-.env
-builds

.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,78 +1,96 @@
 {
-  "name": "spiral/cycle-bridge",
-  "type": "library",
-  "description": "Cycle ORM integration package",
-  "license": "MIT",
-  "homepage": "https://spiral.dev",
-  "support": {
-    "issues": "https://github.com/spiral/framework/issues",
-    "source": "https://github.com/spiral/cycle-bridge"
-  },
-  "authors": [
-    {
-      "name": "Anton Titov (wolfy-j)",
-      "email": "wolfy-j@spiralscout.com"
+    "name": "spiral/cycle-bridge",
+    "type": "library",
+    "description": "Cycle ORM integration package",
+    "license": "MIT",
+    "homepage": "https://spiral.dev",
+    "support": {
+        "issues": "https://github.com/spiral/framework/issues",
+        "source": "https://github.com/spiral/cycle-bridge"
     },
-    {
-      "name": "Pavel Buchnev (butschster)",
-      "email": "pavel.buchnev@spiralscout.com"
-    }
-  ],
-  "require": {
-    "php": ">=8.1",
-    "cycle/annotated": "^4.0",
-    "cycle/migrations": "^4.0.1",
-    "cycle/orm": "^2.0.2",
-    "cycle/schema-migrations-generator": "^2.1",
-    "cycle/schema-renderer": "^1.2",
-    "cycle/schema-builder": "^2.7",
-    "doctrine/inflector": "^1.4 || ^2.0",
-    "spiral/attributes": "^2.10 || ^3.0",
-    "spiral/reactor": "^3.0",
-    "spiral/scaffolder": "^3.0",
-    "spiral/prototype": "^3.0",
-    "spiral/console": "^3.0",
-    "spiral/core": "^3.0",
-    "spiral/boot": "^3.0",
-    "spiral/auth": "^3.0",
-    "spiral/tokenizer": "^3.0",
-    "spiral/config": "^3.0",
-    "spiral/filters": "^3.10",
-    "spiral/data-grid-bridge": "^3.0",
-    "psr/container": "^1.1 || ^2.0"
-  },
-  "require-dev": {
-    "doctrine/collections": "^2.0",
-    "illuminate/collections": "^9.0",
-    "infection/infection": "^0.26.6",
-    "mockery/mockery": "^1.5",
-    "phpunit/phpunit": "^9.5.20",
-    "spiral/framework": "^3.11.1",
-    "spiral/testing": "^2.4",
-    "spiral/validator": "^1.5",
-    "spiral/nyholm-bridge": "^1.3",
-    "spiral-packages/database-seeder": "^3.1",
-    "vimeo/psalm": "^5.19",
-    "cycle/entity-behavior": "^1.2"
-  },
-  "autoload": {
-    "psr-4": {
-      "Spiral\\Cycle\\": "src"
-    }
-  },
-  "autoload-dev": {
-    "psr-4": {
-      "Spiral\\App\\": "tests/app",
-      "Spiral\\Tests\\": "tests/src"
-    }
-  },
-  "config": {
-    "sort-packages": true,
-    "allow-plugins": {
-      "spiral/composer-publish-plugin": false,
-      "infection/extension-installer": false
+    "authors": [
+        {
+            "name": "Anton Titov (wolfy-j)",
+            "email": "wolfy-j@spiralscout.com"
+        },
+        {
+            "name": "Pavel Buchnev (butschster)",
+            "email": "pavel.buchnev@spiralscout.com"
+        },
+        {
+            "name": "Aleksei Gagarin (roxblnfk)",
+            "email": "alexey.gagarin@spiralscout.com"
+        }
+    ],
+    "funding": [
+        {
+            "type": "github",
+            "url": "https://github.com/sponsors/spiral"
+        }
+    ],
+    "require": {
+        "php": ">=8.1",
+        "cycle/annotated": "^4.0",
+        "cycle/migrations": "^4.0.1",
+        "cycle/orm": "^2.0.2",
+        "cycle/schema-migrations-generator": "^2.1",
+        "cycle/schema-renderer": "^1.2",
+        "cycle/schema-builder": "^2.7",
+        "doctrine/inflector": "^1.4 || ^2.0",
+        "spiral/attributes": "^2.10 || ^3.0",
+        "spiral/reactor": "^3.0",
+        "spiral/scaffolder": "^3.0",
+        "spiral/prototype": "^3.0",
+        "spiral/console": "^3.0",
+        "spiral/core": "^3.0",
+        "spiral/boot": "^3.0",
+        "spiral/auth": "^3.0",
+        "spiral/tokenizer": "^3.0",
+        "spiral/config": "^3.0",
+        "spiral/filters": "^3.10",
+        "spiral/data-grid-bridge": "^3.0",
+        "psr/container": "^1.1 || ^2.0"
+    },
+    "require-dev": {
+        "cycle/entity-behavior": "^1.2",
+        "doctrine/collections": "^2.0",
+        "illuminate/collections": "^9.0",
+        "infection/infection": "^0.26.6",
+        "mockery/mockery": "^1.5",
+        "phpunit/phpunit": "^9.5.20",
+        "spiral-packages/database-seeder": "^3.1",
+        "spiral/code-style": "^2.2.1",
+        "spiral/framework": "^3.11.1",
+        "spiral/nyholm-bridge": "^1.3",
+        "spiral/testing": "^2.4",
+        "spiral/validator": "^1.5",
+        "vimeo/psalm": "^5.19"
+    },
+    "autoload": {
+        "psr-4": {
+            "Spiral\\Cycle\\": "src"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Spiral\\App\\": "tests/app",
+            "Spiral\\Tests\\": "tests/src"
+        }
+    },
+    "config": {
+        "sort-packages": true,
+        "allow-plugins": {
+            "spiral/composer-publish-plugin": false,
+            "infection/extension-installer": false
+        }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true,
+    "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"
     }
-  },
-  "minimum-stability": "dev",
-  "prefer-stable": true
 }

phpunit.xml

@@ -2,6 +2,7 @@
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
          bootstrap="vendor/autoload.php"
+         cacheResultFile="runtime/phpunit/result.cache"
          backupGlobals="false"
          backupStaticAttributes="false"
          colors="true"