Skip to content

Commit 6670671

Browse files
authored
Merge pull request #843 from driehle/upstream-workflows
Updated upstream workflows
2 parents 3113016 + 7d2f4d1 commit 6670671

File tree

11 files changed

+97
-23
lines changed

11 files changed

+97
-23
lines changed

.github/workflows/coding-standards.yml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,25 @@ on:
44
pull_request:
55
branches:
66
- "*.x"
7+
paths:
8+
- ".github/workflows/coding-standards.yml"
9+
- "composer.*"
10+
- "src/**"
11+
- "phpcs.xml.dist"
12+
- "tests/**"
713
push:
814
branches:
915
- "*.x"
16+
paths:
17+
- ".github/workflows/coding-standards.yml"
18+
- "composer.*"
19+
- "src/**"
20+
- "phpcs.xml.dist"
21+
- "tests/**"
1022

1123
jobs:
1224
coding-standards:
1325
name: "Coding Standards"
14-
uses: "doctrine/.github/.github/workflows/coding-standards.yml@2.1.0"
26+
uses: "doctrine/.github/.github/workflows/coding-standards.yml@6.0.0"
1527
with:
16-
php-version: '8.3'
28+
php-version: "8.3"

.github/workflows/composer-lint.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,18 @@ on:
55
branches:
66
- "*.x"
77
paths:
8+
- ".github/workflows/composer-lint.yml"
89
- "composer.json"
910
push:
1011
branches:
1112
- "*.x"
1213
paths:
14+
- ".github/workflows/composer-lint.yml"
1315
- "composer.json"
1416

1517
jobs:
1618
composer-lint:
1719
name: "Composer Lint"
18-
uses: "doctrine/.github/.github/workflows/composer-lint.yml@2.1.0"
20+
uses: "doctrine/.github/.github/workflows/composer-lint.yml@6.0.0"
1921
with:
2022
php-version: "8.3"

.github/workflows/continuous-integration.yml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,27 @@ on:
44
pull_request:
55
branches:
66
- "*.x"
7+
paths:
8+
- ".github/workflows/continuous-integration.yml"
9+
- "composer.*"
10+
- "src/**"
11+
- "phpunit.xml.dist"
12+
- "tests/**"
713
push:
814
branches:
915
- "*.x"
16+
paths:
17+
- ".github/workflows/continuous-integration.yml"
18+
- "composer.*"
19+
- "src/**"
20+
- "phpunit.xml.dist"
21+
- "tests/**"
1022

1123
jobs:
1224
phpunit:
1325
name: "PHPUnit"
14-
uses: "doctrine/.github/.github/workflows/continuous-integration.yml@2.1.0"
26+
uses: "doctrine/.github/.github/workflows/continuous-integration.yml@6.0.0"
1527
with:
1628
php-versions: '["8.1", "8.2", "8.3"]'
29+
secrets:
30+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: "Documentation"
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- "*.x"
7+
paths:
8+
- ".github/workflows/documentation.yml"
9+
- "docs/**"
10+
push:
11+
branches:
12+
- "*.x"
13+
paths:
14+
- ".github/workflows/documentation.yml"
15+
- "docs/**"
16+
17+
jobs:
18+
documentation:
19+
name: "Documentation"
20+
uses: "doctrine/.github/.github/workflows/[email protected]"

.github/workflows/phpstan.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: "Static Analysis"
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- "*.x"
7+
paths:
8+
- ".github/workflows/phpstan.yml"
9+
- "composer.*"
10+
- "src/**"
11+
- "phpstan*"
12+
- "tests/**"
13+
push:
14+
branches:
15+
- "*.x"
16+
paths:
17+
- ".github/workflows/phpstan.yml"
18+
- "composer.*"
19+
- "src/**"
20+
- "phpstan*"
21+
- "tests/**"
22+
23+
jobs:
24+
static-analysis:
25+
name: "Static Analysis"
26+
uses: "doctrine/.github/.github/workflows/[email protected]"
27+
with:
28+
php-version: "8.3"

.github/workflows/release-on-milestone-closed.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ on:
88
jobs:
99
release:
1010
name: "Git tag, release & create merge-up PR"
11-
uses: "doctrine/.github/.github/workflows/[email protected]"
12-
with:
13-
use-next-minor-as-default-branch: true
11+
uses: "doctrine/.github/.github/workflows/[email protected]"
1412
secrets:
1513
GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
1614
GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}
1715
ORGANIZATION_ADMIN_TOKEN: ${{ secrets.ORGANIZATION_ADMIN_TOKEN }}
1816
SIGNING_SECRET_KEY: ${{ secrets.SIGNING_SECRET_KEY }}
17+
with:
18+
use-next-minor-as-default-branch: true # defaults to false

.github/workflows/static-analysis.yml

Lines changed: 0 additions & 16 deletions
This file was deleted.

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@
44
/composer.lock
55
/phpcs.xml
66
/phpunit.xml
7+
/output/
78
/vendor/

composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
"laminas/laminas-log": "^2.15.3",
7171
"laminas/laminas-serializer": "^2.13.0",
7272
"laminas/laminas-session": "^2.13.0",
73+
"phpdocumentor/guides-cli": "^1.5.0",
7374
"phpstan/phpstan": "^1.9.2",
7475
"phpstan/phpstan-phpunit": "^1.3.0",
7576
"phpunit/phpunit": "^9.5.27",

docs/en/index.rst

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,14 @@ You can find more details about the features offered by DoctrineModule:
5454
this chapter explains how to use ObjectExists and NoObjectExists
5555
validator, that allow you to easily validate if a given entity exists
5656
or not.
57+
58+
59+
.. toctree::
60+
:caption: Table of Contents
61+
62+
authentication
63+
caching
64+
cli
65+
form-element
66+
paginator
67+
validator

0 commit comments

Comments
 (0)