Merge branch 'master' into fix-duplicate-columns-in-relation-sorting

Author: affaron

.gitattributes

@@ -5,7 +5,7 @@
 .editorconfig export-ignore
 .gitattributes export-ignore
 .gitignore export-ignore
-.php_cs export-ignore
 .scrutinizer.yml export-ignore
-.travis.yml export-ignore
-phpunit.xml export-ignore
+.styleci.yml export-ignore
+phpstan.neon.dist export-ignore
+phpunit.xml.dist export-ignore

.github/workflows/tests.yml renamed to .github/workflows/continuous-integration.yml

@@ -1,4 +1,4 @@
-name: tests
+name: "Continuous Integration"
 
 on:
   push:
@@ -7,14 +7,14 @@ on:
     - cron: '0 0 * * *'
 
 jobs:
-  tests:
+  phpunit:
 
     runs-on: ubuntu-latest
 
     strategy:
       fail-fast: true
       matrix:
-        php: [7.3, 7.4, 8.0]
+        php: [8.0, 8.1]
         stability: [prefer-stable]
 
     name: PHP ${{ matrix.php }} - ${{ matrix.stability }}
@@ -39,7 +39,7 @@ jobs:
         with:
           timeout_minutes: 5
           max_attempts: 5
-          command: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress
+          command: COMPOSER_ROOT_VERSION=dev-master composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress
 
       - name: Execute tests
         run: vendor/bin/phpunit --verbose

.github/workflows/static-analysis.yml

@@ -0,0 +1,54 @@
+name: "Static Analysis"
+
+on:
+  push:
+    paths:
+      - .github/workflows/static-analysis.yml
+      - composer.*
+      - phpstan.neon.dist
+      - src/**
+      - tests/**
+
+  pull_request:
+    paths:
+      - .github/workflows/static-analysis.yml
+      - composer.*
+      - phpstan.neon.dist
+      - src/**
+      - tests/**
+
+  schedule:
+    - cron: '0 0 * * *'
+
+jobs:
+  static-analysis-phpstan:
+
+    name: "Static Analysis with PHPStan"
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: true
+      matrix:
+        php: [8.1]
+        stability: [prefer-stable]
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          tools: composer:v2
+          coverage: none
+
+      - name: Install dependencies
+        uses: nick-invision/retry@v1
+        with:
+          timeout_minutes: 5
+          max_attempts: 5
+          command: COMPOSER_ROOT_VERSION=dev-master composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress
+
+      - name: "Run a static analysis with phpstan/phpstan"
+        run: "vendor/bin/phpstan --error-format=checkstyle"

.php_cs

@@ -1,10 +1 @@
 preset: laravel
-
-enabled:
-  - align_double_arrow
-  - align_equals
-  - no_useless_else
-
-disabled:
-  - concat_without_spaces
-  - unalign_equals