Merge branch 'master' into feature/triggers

.github/auto_assign.yml

@@ -1,16 +1,19 @@
-# Set to true to add assignees to pull requests
+addReviewers: true
+
+numberOfReviewers: 1
+
+reviewers:
+ - pvsaitpe
+ - zlob
+
 addAssignees: true
 
-# A list of assignees, overrides reviewers if set
 assignees:
  - pvsaintpe
+ - zlob
 
-# A number of assignees to add to the pull request
-# Set to 0 to add all of the assignees.
-# Uses numberOfReviewers if unset.
 numberOfAssignees: 1
 
-# A list of keywords to be skipped the process that add reviewers if pull requests include it
 skipKeywords:
   - wip
   - draft

.github/dependabot.yml

@@ -0,0 +1,14 @@
+version: 2
+
+updates:
+  - package-ecosystem: composer
+    directory: "/"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+    reviewers:
+      - pvsaintpe
+    assignees:
+      - pvsaintpe
+    labels:
+      - type:build

.github/labeler.yml

@@ -1,5 +1,5 @@
 type:build:
-  - ".github/**"
+  - ".github/**/*"
   - ".coveralls.yml"
   - "phpunit.github.xml"
   - ".gitignore"
@@ -8,15 +8,15 @@ type:build:
   - "composer.lock"
 
 type:helpers:
-  - "src/Helpers/*"
+  - "src/Helpers/**/*"
 
 type:indexes:
   - "src/Compilers/Traits/WheresBuilder.php"
   - "src/Compilers/CheckCompiler.php"
   - "src/Compilers/ExcludeCompiler.php"
   - "src/Compilers/UniqueCompiler.php"
-  - "src/Schema/Builders/Indexes/*"
-  - "src/Schema/Builders/Constraints/*"
+  - "src/Schema/Builders/Indexes/**/*"
+  - "src/Schema/Builders/Constraints/**/*"
   - "src/Schema/Builders/WhereBuilderTrait.php"
   - "src/Schema/Definitions/CheckDefinition.php"
   - "src/Schema/Definitions/ExcludeDefinition.php"
@@ -28,13 +28,15 @@ type:routines:
   - "src/Schema/Definitions/Routines/**/*"
 
 type:schema:
-  - "src/Schema/*"
+  - "src/Schema/**/*"
 
 type:compilers:
-  - "src/Compilers/*"
+  - "src/Compilers/**/*"
 
 type:tests:
-  - any: ['tests/**/*', 'phpunit.xml.dist', 'tests.sh']
+  - 'tests/**/*'
+  - 'phpunit.xml.dist'
+  - 'tests.sh'
 
 theme:docs:
   - "README.md"

.github/workflows/auto_approve.yml

@@ -0,0 +1,14 @@
+on: pull_request_review
+name: 'Label approved pull requests'
+jobs:
+  labelWhenApproved:
+    name: 'Label when approved'
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Label when approved'
+        uses: pullreminders/label-when-approved-action@master
+        env:
+          APPROVALS: "1"
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          ADD_LABEL: "approved"
+          REMOVE_LABEL: "awaiting review"

.github/workflows/assigner.yml → .github/workflows/auto_assignee.yml

@@ -1,4 +1,4 @@
-name: 'Auto Assignee'
+name: 'Auto assign assignees or reviewers'
 on: pull_request
 
 jobs:

.github/workflows/labeler.yml → .github/workflows/auto_labeler.yml

@@ -11,3 +11,4 @@ jobs:
         with:
           repo-token: "${{ secrets.GITHUB_TOKEN }}"
           sync-labels: true
+          configuration-path: ".github/labeler.yml"

.github/workflows/auto_merge.yml

@@ -0,0 +1,38 @@
+name: 'Auto merge of approved pull requests with passed checks'
+
+on:
+  pull_request:
+    types:
+      - labeled
+      - unlabeled
+      - synchronize
+      - opened
+      - edited
+      - ready_for_review
+      - reopened
+      - unlocked
+  pull_request_review:
+    types:
+      - submitted
+  check_suite:
+    types:
+      - completed
+  status: {}
+
+jobs:
+  automerge:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Automerge PR'
+        uses: "pascalgn/automerge-action@v0.12.0"
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          MERGE_METHOD: 'squash'
+          MERGE_LABELS: "approved,!work in progress"
+          MERGE_REMOVE_LABELS: "approved"
+          MERGE_COMMIT_MESSAGE: "pull-request-description"
+          MERGE_RETRIES: "6"
+          MERGE_RETRY_SLEEP: "10000"
+          UPDATE_LABELS: ""
+          UPDATE_METHOD: "rebase"
+          MERGE_DELETE_BRANCH: true

.github/workflows/auto_tagging.yml

@@ -0,0 +1,17 @@
+name: Bump version
+on:
+  push:
+    branches:
+      - master
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - name: Bump version and push tag
+        uses: anothrNick/github-tag-action@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          REPO_OWNER: umbrellio
+          WITH_V: false
+          VERBOSE: true

.github/workflows/ci.yml

@@ -66,7 +66,7 @@ jobs:
       fail-fast: false
       matrix:
         exclude_group:
-          - WithoutSchema
+          - WithoutSchema,forPHP8
         experimental:
           - false
         operating_system:
@@ -83,37 +83,37 @@ jobs:
             php_versions: '7.3'
             postgres: '9.6'
             experimental: false
-            exclude_group: WithoutSchema
+            exclude_group: WithoutSchema,forPHP8
           - operating_system: 'ubuntu-latest'
             php_versions: '7.3'
             postgres: '13'
-            experimental: true
-            exclude_group: WithoutSchema
+            experimental: false
+            exclude_group: WithoutSchema,forPHP8
           - operating_system: 'ubuntu-latest'
             php_versions: '7.4'
             postgres: '13'
-            experimental: true
-            exclude_group: WithoutSchema
+            experimental: false
+            exclude_group: WithoutSchema,forPHP8
           - operating_system: 'ubuntu-latest'
             php_versions: '8.0'
             postgres: '10'
-            experimental: true
-            exclude_group: WithSchema
+            experimental: false
+            exclude_group: WithoutSchema,forPHP7
           - operating_system: 'ubuntu-latest'
             php_versions: '8.0'
             postgres: '11'
-            experimental: true
-            exclude_group: WithSchema
+            experimental: false
+            exclude_group: WithoutSchema,forPHP7
           - operating_system: 'ubuntu-latest'
             php_versions: '8.0'
             postgres: '12'
-            experimental: true
-            exclude_group: WithSchema
+            experimental: false
+            exclude_group: WithoutSchema,forPHP7
           - operating_system: 'ubuntu-latest'
             php_versions: '8.0'
             postgres: '13'
-            experimental: true
-            exclude_group: WithSchema
+            experimental: false
+            exclude_group: WithoutSchema,forPHP7
     runs-on: '${{ matrix.operating_system }}'
     services:
       postgres:
@@ -126,7 +126,7 @@ jobs:
           - 5432:5432
         # needed because the postgres container does not provide a healthcheck
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
-    name: 'Test / PHP ${{ matrix.php_versions }} with Postgres ${{ matrix.postgres }}'
+    name: 'Test / PHP ${{ matrix.php_versions }} / Postgres ${{ matrix.postgres }}'
     needs:
       - lint
     steps:
@@ -160,6 +160,7 @@ jobs:
           coverage: pcov
           tools: 'phpunit'
       - name: 'Install PHP dependencies with Composer'
+        continue-on-error: ${{ matrix.experimental }}
         run: |
           rm composer.lock
           composer install --prefer-dist --no-progress --no-suggest --optimize-autoloader
@@ -177,11 +178,11 @@ jobs:
         run: './vendor/bin/phpunit --verbose --stderr --configuration phpunit.github.xml --exclude-group ${{ matrix.exclude_group }} --coverage-clover build/logs/clover.xml --coverage-text'
         working-directory: './'
       - name: Upload coverage results to Coveralls
-        continue-on-error: ${{ matrix.experimental }}
+        if: ${{ !matrix.experimental }}
         env:
           COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           COVERALLS_PARALLEL: true
-          COVERALLS_FLAG_NAME: php-${{ matrix.php-versions }}-postgres-${{ matrix.postgres }}
+          COVERALLS_FLAG_NAME: php-${{ matrix.php_versions }}-postgres-${{ matrix.postgres }}
         run: ./vendor/bin/php-coveralls --coverage_clover=build/logs/clover.xml -v
   coverage:
     needs: test

README.md

@@ -4,6 +4,9 @@
 [![Coverage Status](https://coveralls.io/repos/github/umbrellio/laravel-pg-extensions/badge.svg?branch=master)](https://coveralls.io/github/umbrellio/laravel-pg-extensions?branch=master)
 [![Latest Stable Version](https://poser.pugx.org/umbrellio/laravel-pg-extensions/v/stable.png)](https://packagist.org/packages/umbrellio/laravel-pg-extensions)
 [![Total Downloads](https://poser.pugx.org/umbrellio/laravel-pg-extensions/downloads.png)](https://packagist.org/packages/umbrellio/laravel-pg-extensions)
+[![Code Intelligence Status](https://scrutinizer-ci.com/g/umbrellio/laravel-pg-extensions/badges/code-intelligence.svg?b=master)](https://scrutinizer-ci.com/code-intelligence)
+[![Build Status](https://scrutinizer-ci.com/g/umbrellio/laravel-pg-extensions/badges/build.png?b=master)](https://scrutinizer-ci.com/g/umbrellio/laravel-pg-extensions/build-status/master)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/umbrellio/laravel-pg-extensions/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/umbrellio/laravel-pg-extensions/?branch=master)
 
 This project extends Laravel`s database layer to allow use specific Postgres features without raw queries. 
 

composer.json

@@ -3,6 +3,17 @@
   "type": "library",
   "description": "Extensions for Postgres Laravel",
   "minimum-stability": "stable",
+  "license": "MIT",
+  "keywords": [
+    "laravel",
+    "php",
+    "postgres",
+    "postgresql",
+    "extension",
+    "migrations",
+    "schema",
+    "builder"
+  ],
   "authors": [
     {
       "name": "Vitaliy Lazeev",
@@ -13,9 +24,13 @@
       "email": "pvsaintpe@umbrellio.biz"
     }
   ],
+  "suggest": {
+    "umbrellio/laravel-ltree": "Package for working with Postgres LTree extension",
+    "umbrellio/laravel-common-objects": "Package with helpers for common Laravel components"
+  },
   "require": {
     "php": "^7.2|^7.3|^7.4|^8.0",
-    "doctrine/dbal": "^2.9|^3.0",
+    "doctrine/dbal": "2.9.*|^3.0",
     "laravel/framework": "^5.8|^6.0|^7.0|^8.0"
   },
   "require-dev": {