Merge branch '4.x' into fix/jti-parent-columns-duplication

# Conflicts:
#	tests/Annotated/Fixtures/Fixtures16/Person.php
#	tests/Annotated/Functional/Driver/Common/BaseTestCase.php
#	tests/Annotated/Functional/Driver/Common/InheritanceTestCase.php
#	tests/docker-compose.yml

Author: roxblnfk

.editorconfig

@@ -0,0 +1,21 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+
+[*.{yml, yaml, sh, conf, neon*}]
+indent_size = 2
+
+[*.http]
+end_of_line = crlf
+
+[*.md]
+trim_trailing_whitespace = false
+
+[Makefile]
+indent_style = tab

.gitattributes

@@ -1,5 +1,6 @@
-/.github        export-ignore
-/.editorconfig  export-ignore
-/.gitattributes export-ignore
-/.gitignore     export-ignore
-/tests          export-ignore
+/.*      export-ignore
+/tests   export-ignore
+/*.xml   export-ignore
+/*.yml   export-ignore
+/*.lock  export-ignore
+/*.dist  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/main.yml

@@ -7,41 +7,33 @@ jobs:
     name: Test PHP ${{ matrix.php-version }} with Code Coverage
     runs-on: ubuntu-latest
     strategy:
-      fail-fast: false
       matrix:
-        php-version: ['8.1', '8.2', '8.3']
+        php-version: ['8.1', '8.2', '8.3', '8.4']
     steps:
+      - name: Install ODBC driver.
+        run: |
+          sudo curl https://packages.microsoft.com/config/ubuntu/$(lsb_release -rs)/prod.list | sudo tee /etc/apt/sources.list.d/mssql-release.list
+          sudo ACCEPT_EULA=Y apt-get install -y msodbcsql18
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup DB services
         run: |
           cd tests
-          docker-compose up -d
+          docker compose up -d
           cd ..
       - name: Setup PHP ${{ matrix.php-version }}
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-version }}
           coverage: pcov
           tools: pecl
-          extensions: mbstring, pdo, pdo_sqlite, pdo_pgsql, pdo_sqlsrv-5.11, pdo_mysql
-      - name: Get Composer Cache Directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-      - name: Restore Composer Cache
-        uses: actions/cache@v2
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
-          restore-keys: ${{ runner.os }}-composer-
+          extensions: mbstring, pdo, pdo_sqlite, pdo_pgsql, pdo_sqlsrv, pdo_mysql
 
-      - name: Install dependencies with composer
-        if: matrix.php-version != '8.4'
-        run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
+      - name: Validate composer.json and composer.lock
+        run: composer validate --ansi --strict
 
-      - name: Install dependencies with composer php 8.4
-        if: matrix.php-version == '8.4'
-        run: composer update --ignore-platform-reqs --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
+      - name: Install dependencies with composer
+        uses: ramsey/composer-install@v3
 
       - name: Execute Tests
         run: |

.github/workflows/psalm.yml

@@ -1,7 +1,8 @@
 on:
-  pull_request:
+  pull_request: null
   push:
     branches:
+      - master
       - '*.*'
 
 name: static analysis

.gitignore

@@ -1,9 +1,5 @@
-.idea/
-.env
+/.*/
+!/.github/
+/runtime/
+/vendor/
 composer.lock
-vendor/
-*.db
-clover.xml
-.php_cs.cache
-.phpunit.cache
-build

.idea/icon.svg

@@ -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();

.php-cs-fixer.dist.php

@@ -38,16 +38,19 @@
     ],
     "require": {
         "php": ">=8.1",
-        "cycle/orm": "^2.7",
-        "cycle/schema-builder": "^2.8",
+        "cycle/database": "^2.15",
+        "cycle/orm": "^2.9.2",
+        "cycle/schema-builder": "^2.11.1",
         "spiral/attributes": "^2.8|^3.0",
         "spiral/tokenizer": "^2.8|^3.0",
         "doctrine/inflector": "^2.0"
     },
     "require-dev": {
         "doctrine/annotations": "^1.14.3 || ^2.0.1",
         "phpunit/phpunit": "^10.1",
-        "vimeo/psalm": "^5.11"
+        "vimeo/psalm": "^5.26 || ^6.0",
+        "spiral/code-style": "^2.2",
+        "spiral/dumper": "^3.3"
     },
     "autoload": {
         "psr-4": {
@@ -58,5 +61,12 @@
         "psr-4": {
             "Cycle\\Annotated\\Tests\\": "tests/Annotated/"
         }
+    },
+    "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"
     }
 }