Skip to content

Commit

Permalink
Merge pull request #267 from driehle/feat/upstream-workflows
Browse files Browse the repository at this point in the history
Updated upstream workflows, adding composer-lint
  • Loading branch information
driehle authored Oct 28, 2022
2 parents 25472ca + c2bc527 commit d0a35e2
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/coding-standards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ on:
jobs:
coding-standards:
name: "Coding Standards"
uses: "doctrine/.github/.github/workflows/coding-standards.yml@1.4.1"
uses: "doctrine/.github/.github/workflows/coding-standards.yml@2.1.0"
with:
php-version: '8.1'
20 changes: 20 additions & 0 deletions .github/workflows/composer-lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: "Composer Lint"

on:
pull_request:
branches:
- "*.x"
paths:
- "composer.json"
push:
branches:
- "*.x"
paths:
- "composer.json"

jobs:
composer-lint:
name: "Composer Lint"
uses: "doctrine/.github/.github/workflows/[email protected]"
with:
php-version: "8.1"
2 changes: 1 addition & 1 deletion .github/workflows/release-on-milestone-closed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
release:
name: "Git tag, release & create merge-up PR"
uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@1.4.1"
uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@2.1.0"
with:
use-next-minor-as-default-branch: true
secrets:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ on:
jobs:
static-analysis:
name: "Static Analysis"
uses: "doctrine/.github/.github/workflows/static-analysis.yml@1.4.1"
uses: "doctrine/.github/.github/workflows/static-analysis.yml@2.1.0"
with:
php-version: '8.1'
40 changes: 20 additions & 20 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
{
"name": "doctrine/doctrine-mongo-odm-module",
"description": "Laminas Module which provides Doctrine MongoDB ODM functionality",
"license": "MIT",
"keywords": [
"doctrine",
"laminas",
"mongodb",
"module",
"odm"
],
"homepage": "https://www.doctrine-project.org/",
"license": "MIT",
"authors": [
{
"name": "Kyle Spraggs",
Expand Down Expand Up @@ -44,17 +43,13 @@
"email": "[email protected]"
}
],
"extra": {
"laminas": {
"module": "DoctrineMongoODMModule"
}
},
"homepage": "https://www.doctrine-project.org/",
"require": {
"php": "^7.4 || ~8.0.0 || ~8.1.0",
"ext-mongodb": "*",
"container-interop/container-interop": "^1.2.0",
"doctrine/doctrine-module": "^5.2.1",
"doctrine/doctrine-laminas-hydrator": "^3.0.1",
"doctrine/doctrine-module": "^5.2.1",
"doctrine/event-manager": "^1.1.1",
"doctrine/mongodb-odm": "^2.3.2",
"doctrine/persistence": "^2.4.0",
Expand Down Expand Up @@ -83,8 +78,8 @@
"vimeo/psalm": "^4.22.0"
},
"suggest": {
"laminas/laminas-form": "if you want to use form elements backed by Doctrine",
"laminas/laminas-developer-tools": "laminas-developer-tools if you want to profile operations executed by the ODM during development"
"laminas/laminas-developer-tools": "laminas-developer-tools if you want to profile operations executed by the ODM during development",
"laminas/laminas-form": "if you want to use form elements backed by Doctrine"
},
"autoload": {
"psr-4": {
Expand All @@ -96,6 +91,21 @@
"DoctrineMongoODMModuleTest\\": "tests/"
}
},
"config": {
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true,
"composer/package-versions-deprecated": true
},
"platform": {
"ext-mongodb": "1.8.0"
},
"sort-packages": true
},
"extra": {
"laminas": {
"module": "DoctrineMongoODMModule"
}
},
"scripts": {
"check": [
"@cs-check",
Expand All @@ -109,15 +119,5 @@
"psalm": "psalm --stats",
"test": "phpunit --colors=always",
"test-coverage": "phpunit --colors=always --coverage-clover=coverage.xml"
},
"config": {
"sort-packages": true,
"platform": {
"ext-mongodb": "1.8.0"
},
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true,
"composer/package-versions-deprecated": true
}
}
}

0 comments on commit d0a35e2

Please sign in to comment.