Skip to content

Commit

Permalink
Merge pull request #201 from derrabus/bump/ci
Browse files Browse the repository at this point in the history
Bump tools and CI workflows
  • Loading branch information
malarzm authored Aug 1, 2022
2 parents 3725e35 + 8368463 commit 4e544a4
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 12 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/coding-standards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,6 @@ on:
jobs:
coding-standards:
name: "Coding Standards"
uses: "doctrine/.github/.github/workflows/[email protected]"
uses: "doctrine/.github/.github/workflows/[email protected]"
with:
php-version: '8.1'
4 changes: 3 additions & 1 deletion .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,6 @@ jobs:

phpunit:
name: "PHPUnit"
uses: "doctrine/.github/.github/workflows/[email protected]"
uses: "doctrine/.github/.github/workflows/[email protected]"
with:
php-versions: '["7.2", "7.3", "7.4", "8.0", "8.1"]'
3 changes: 1 addition & 2 deletions .github/workflows/release-on-milestone-closed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@ on:
jobs:
release:
name: "Git tag, release & create merge-up PR"
uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@1.1.1"
uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@1.5.1"
secrets:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}
ORGANIZATION_ADMIN_TOKEN: ${{ secrets.ORGANIZATION_ADMIN_TOKEN }}
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,6 @@ on:
jobs:
static-analysis-phpstan:
name: "Static Analysis"
uses: "doctrine/.github/.github/workflows/[email protected]"
uses: "doctrine/.github/.github/workflows/[email protected]"
with:
php-version: "8.1"
17 changes: 11 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
"php": "^7.2 || ^8.0"
},
"require-dev": {
"doctrine/coding-standard": "^8.2",
"phpstan/phpstan": "^0.12",
"phpstan/phpstan-phpunit": "^0.12",
"phpstan/phpstan-strict-rules": "^0.12",
"phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
"vimeo/psalm": "^4.10"
"doctrine/coding-standard": "^9",
"phpstan/phpstan": "^1.8",
"phpstan/phpstan-phpunit": "^1.1",
"phpstan/phpstan-strict-rules": "^1.3",
"phpunit/phpunit": "^8.5 || ^9.5",
"vimeo/psalm": "^4.25"
},
"autoload": {
"psr-4": {
Expand All @@ -32,5 +32,10 @@
"psr-4": {
"Doctrine\\Tests\\Inflector\\": "tests/Doctrine/Tests/Inflector"
}
},
"config": {
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true
}
}
}
2 changes: 2 additions & 0 deletions phpcs.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
<!-- Ignore warnings, show progress of the run and show sniff names -->
<arg value="nps"/>

<config name="php_version" value="70200"/>

<file>lib</file>
<file>tests</file>

Expand Down
2 changes: 1 addition & 1 deletion phpstan.neon.dist
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ parameters:
- lib
- tests

excludes_analyse:
excludePaths:
- %rootDir%/../../../tests/Doctrine/Tests/Common/*
1 change: 1 addition & 0 deletions tests/Doctrine/Tests/Inflector/InflectorFactoryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ public function testCreateUsesEnglishByDefault(): void

/**
* @phpstan-param class-string<LanguageInflectorFactory> $expectedClass
*
* @dataProvider provideLanguages
*/
public function testCreateForLanguageWithCustomLanguage(string $expectedClass, string $language): void
Expand Down

0 comments on commit 4e544a4

Please sign in to comment.