Merge pull request #8 from MatanYadaev/improve-pipeline

Improve pipeline

Author: MatanYadaev

.github/CONTRIBUTING.md

@@ -1,23 +1,26 @@
-#name: Check & fix styling
-#
-#on: [push]
-#
-#jobs:
-#  php-cs-fixer:
-#    runs-on: ubuntu-latest
-#
-#    steps:
-#      - name: Checkout code
-#        uses: actions/checkout@v2
-#        with:
-#          ref: ${{ github.head_ref }}
-#
-#      - name: Run PHP CS Fixer
-#        uses: docker://oskarstark/php-cs-fixer-ga
-#        with:
-#          args: --config=.php_cs.dist --allow-risky=yes
-#
-#      - name: Commit changes
-#        uses: stefanzweifel/git-auto-commit-action@v4
-#        with:
-#          commit_message: Fix styling
+name: Lint
+
+on: [push]
+
+jobs:
+  php-cs-fixer:
+    name: PHP CS Fixer
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.0
+          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
+          coverage: none
+
+      - name: Install dependencies
+        run: composer install
+
+      - name: Run PHP CS Fixer
+        run: ./vendor/bin/php-cs-fixer fix --allow-risky=yes --diff --dry-run

.github/FUNDING.yml

@@ -0,0 +1,26 @@
+name: Static code analysis
+
+on: [push]
+
+jobs:
+  phpstan:
+    name: PHPStan
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.0
+          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
+          coverage: none
+
+      - name: Install dependencies
+        run: composer install --prefer-dist --no-interaction
+
+      - name: Run PHPStan
+        run: ./vendor/bin/phpstan analyse --memory-limit=2G --error-format=github

.github/ISSUE_TEMPLATE/config.yml

@@ -1,22 +1,22 @@
 name: Tests
 
-on: [push, pull_request]
+on: [push]
 
 jobs:
   test:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: true
-      matrix:
-        os: [ubuntu-latest, windows-latest]
-        php: [8.0]
-        laravel: [8.*]
-        stability: [prefer-lowest, prefer-stable]
-        include:
-          - laravel: 8.*
-            testbench: 6.*
-
-    name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
+    name: PHP 8.0 - MySQL 8.0
+
+    runs-on: ubuntu-latest
+
+    services:
+      mysql:
+        image: mysql:8.0
+        env:
+          MYSQL_ALLOW_EMPTY_PASSWORD: yes
+          MYSQL_DATABASE: laravel_eloquent_spatial_test
+        ports:
+          - 3306
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
 
     steps:
       - name: Checkout code
@@ -25,19 +25,14 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: ${{ matrix.php }}
+          php-version: 8.0
           extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
           coverage: none
 
-      - name: Setup problem matchers
-        run: |
-          echo "::add-matcher::${{ runner.tool_cache }}/php.json"
-          echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
-
       - name: Install dependencies
-        run: |
-          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
-          composer update --${{ matrix.stability }} --prefer-dist --no-interaction
+        run: composer install --prefer-dist --no-interaction
 
       - name: Execute tests
+        env:
+          DB_PORT: ${{ job.services.mysql.ports['3306'] }}
         run: vendor/bin/phpunit

.github/SECURITY.md

@@ -1,43 +1,13 @@
 <?php
 
-$finder = Symfony\Component\Finder\Finder::create()
-    ->notPath('bootstrap/*')
-    ->notPath('storage/*')
-    ->notPath('resources/view/mail/*')
-    ->in([
-        __DIR__ . '/src',
-        __DIR__ . '/tests',
-    ])
-    ->name('*.php')
-    ->notName('*.blade.php')
-    ->ignoreDotFiles(true)
-    ->ignoreVCS(true);
-
-return PhpCsFixer\Config::create()
+return (new MattAllan\LaravelCodeStyle\Config())
+    ->setFinder(
+        PhpCsFixer\Finder::create()
+            ->in('src')
+            ->in('tests')
+    )
     ->setRules([
-        '@PSR2' => true,
-        'array_syntax' => ['syntax' => 'short'],
-        'ordered_imports' => ['sortAlgorithm' => 'alpha'],
-        'no_unused_imports' => true,
-        'not_operator_with_successor_space' => true,
-        'trailing_comma_in_multiline_array' => true,
-        'phpdoc_scalar' => true,
-        'unary_operator_spaces' => true,
-        'binary_operator_spaces' => true,
-        'blank_line_before_statement' => [
-            'statements' => ['break', 'continue', 'declare', 'return', 'throw', 'try'],
-        ],
-        'phpdoc_single_line_var_spacing' => true,
-        'phpdoc_var_without_name' => true,
-        'class_attributes_separation' => [
-            'elements' => [
-                'method',
-            ],
-        ],
-        'method_argument_space' => [
-            'on_multiline' => 'ensure_fully_multiline',
-            'keep_multiple_spaces_after_comma' => true,
-        ],
-        'single_trait_insert_per_statement' => true,
+        '@Laravel' => true,
+        '@Laravel:risky' => true,
     ])
-    ->setFinder($finder);
+    ->setRiskyAllowed(true);

.github/workflows/php-cs-fixer.yml

@@ -23,10 +23,10 @@
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^2.17",
+        "matt-allan/laravel-code-style": "^0.6.0",
+        "nunomaduro/larastan": "^0.7.0",
         "orchestra/testbench": "^6.0",
-        "phpunit/phpunit": "^9.3",
-        "psalm/plugin-laravel": "^1.4",
-        "vimeo/psalm": "^4.3"
+        "phpunit/phpunit": "^9.3"
     },
     "autoload": {
         "psr-4": {
@@ -43,7 +43,8 @@
         }
     },
     "scripts": {
-        "psalm": "vendor/bin/psalm",
+        "style-fix": "./vendor/bin/php-cs-fixer fix --allow-risky=yes",
+        "phpstan": "vendor/bin/phpstan analyse --memory-limit=2G",
         "test": "vendor/bin/phpunit --colors=always",
         "test-coverage": "vendor/bin/phpunit --coverage-html coverage"
     },