Merge pull request #21 from laminas-api-tools/1.9.x-merge-up-into-1.10.x_S1Y9Qm57

Merge release 1.9.1 into 1.10.x

Author: weierophinney

.github/workflows/continuous-integration.yml

@@ -0,0 +1,36 @@
+name: "Continuous Integration"
+
+on:
+  pull_request:
+  push:
+    branches:
+      - '[0-9]+.[0-9]+.x'
+      - 'refs/pull/*'
+    tags:
+
+jobs:
+  matrix:
+    name: Generate job matrix
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.matrix.outputs.matrix }}
+    steps:
+      - name: Gather CI configuration
+        id: matrix
+        uses: laminas/laminas-ci-matrix-action@v1
+
+  qa:
+    name: QA Checks
+    needs: [matrix]
+    runs-on: ${{ matrix.operatingSystem }}
+    strategy:
+      fail-fast: false
+      matrix: ${{ fromJSON(needs.matrix.outputs.matrix) }}
+    steps:
+      - name: ${{ matrix.name }}
+        uses: laminas/laminas-continuous-integration-action@v1
+        with:
+          job: ${{ matrix.job }}
+    services:
+      mongodb:
+        image: mongo:4.4

.gitignore

@@ -1,7 +1,6 @@
 /.phpcs-cache
 /.phpunit.result.cache
 /clover.xml
-/composer.lock
 /coveralls-upload.json
 /phpunit.xml
 /vendor/

.laminas-ci.json

@@ -0,0 +1,7 @@
+{
+    "extensions": [
+        "mongodb",
+        "pdo",
+        "pdo-sqlite"
+    ]
+}

.laminas-ci/pre-run.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+JOB=$3
+PHP_VERSION=$(echo "${JOB}" | jq -r '.php')
+
+if [[ "$PHP_VERSION" =~ 8. ]];then
+    composer require --ignore-platform-req=php --dev --no-interaction --prefer-dist alcaeus/mongo-php-adapter
+else
+    composer require --dev --no-interaction --prefer-dist alcaeus/mongo-php-adapter
+fi
+

.travis.yml

@@ -1,9 +1,7 @@
 Laminas Doctrine QueryBuilder
 ========================
 
-[![Build Status](https://travis-ci.com/laminas-api-tools/api-tools-doctrine-querybuilder.svg)](https://travis-ci.com/laminas-api-tools/api-tools-doctrine-querybuilder)
-[![Coverage Status](https://coveralls.io/repos/github/laminas-api-tools/api-tools-doctrine-querybuilder/badge.svg)](https://coveralls.io/github/laminas-api-tools/api-tools-doctrine-querybuilder)
-[![Total Downloads](https://poser.pugx.org/laminas-api-tools/api-tools-doctrine-querybuilder/downloads)](https://packagist.org/packages/laminas-api-tools/api-tools-doctrine-querybuilder)
+[![Build Status](https://github.com/laminas-api-tools/api-tools-doctrine-querybuilder/actions/workflows/continuous-integration.yml/badge.svg)](https://github.com/laminas-api-tools/api-tools-doctrine-querybuilder/actions/workflows/continuous-integration.yml)
 
 This library provides query builder directives from array parameters. This library was designed
 to apply filters from an HTTP request to give an API fluent filter and order-by dialects.

CHANGELOG.md

@@ -42,9 +42,9 @@
     },
     "require-dev": {
         "doctrine/dbal": "^2.12.1 || ^3.0.0",
-        "doctrine/orm": "^2.7.5",
         "doctrine/doctrine-mongo-odm-module": "^1.0 || ^2.0.2 || ^3.0.2",
         "doctrine/doctrine-orm-module": "^2.1.3",
+        "doctrine/orm": "^2.7.5",
         "laminas-api-tools/api-tools-provider": "^1.2",
         "laminas/laminas-coding-standard": "~2.1.4",
         "laminas/laminas-i18n": "^2.7.3",
@@ -53,7 +53,9 @@
         "laminas/laminas-test": "^2.6.1 || ^3.0.1",
         "phpspec/prophecy-phpunit": "^2.0",
         "phpunit/phpunit": "^9.5.0",
-        "symfony/yaml": "^2.3 || ^3.0 || ^4.0"
+        "psalm/plugin-phpunit": "^0.15",
+        "symfony/yaml": "^2.3 || ^3.0 || ^4.0",
+        "vimeo/psalm": "^4.7"
     },
     "suggest": {
         "doctrine/doctrine-mongo-odm-module": "^1.0 || ^2.0.2 || ^3.0.2, if you wish to use the Doctrine ODM",