Merge pull request #311 from ergebnis/feature/synchronize

Enhancement: Synchronize with ergebnis/php-library-template
ergebnis · Jan 6, 2020 · faf3963 · faf3963
2 parents 23b2ba8 + b619a72
commit faf3963
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 10 deletions.
diff --git a/.dependabot/config.yml b/.dependabot/config.yml
@@ -10,10 +10,12 @@ update_configs:
       include_scope: true
       prefix: "Build"
     default_assignees:
+      - "ergebnis-bot"
       - "localheinz"
     default_labels:
       - "dependency"
     default_reviewers:
+      - "ergebnis-bot"
       - "localheinz"
     directory: "/"
     ignored_updates:

diff --git a/.github/settings.yml b/.github/settings.yml
@@ -38,7 +38,8 @@ branches:
         apps:
           - "dependabot-preview"
         teams: []
-        users: []
+        users:
+          - "ergebnis-bot"
 
 # https://developer.github.com/v3/issues/labels/#create-a-label
 # https://developer.github.com/v3/issues/labels/#update-a-label

diff --git a/.github/workflows/continuous-deployment.yml b/.github/workflows/continuous-deployment.yml
@@ -95,7 +95,7 @@ jobs:
         id: "create-release"
         uses: "actions/[email protected]"
         env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          GITHUB_TOKEN: "${{ secrets.ERGEBNIS_BOT_TOKEN }}"
         with:
           draft: false
           prerelease: false
@@ -105,7 +105,7 @@ jobs:
       - name: "Upload composer-normalize.phar"
         uses: "actions/[email protected]"
         env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          GITHUB_TOKEN: "${{ secrets.ERGEBNIS_BOT_TOKEN }}"
         with:
           asset_content_type: "text/plain"
           asset_name: "composer-normalize.phar"
@@ -115,7 +115,7 @@ jobs:
       - name: "Upload composer-normalize.phar.asc"
         uses: "actions/[email protected]"
         env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          GITHUB_TOKEN: "${{ secrets.ERGEBNIS_BOT_TOKEN }}"
         with:
           asset_content_type: "text/plain"
           asset_name: "composer-normalize.phar.asc"

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -177,7 +177,7 @@ jobs:
         run: "mkdir -p .build/psalm"
 
       - name: "Run vimeo/psalm"
-        run: "vendor/bin/psalm --config=psalm.xml --show-info=false"
+        run: "vendor/bin/psalm --config=psalm.xml --shepherd --show-info=false --stats"
 
   tests:
     name: "Tests"
@@ -381,8 +381,8 @@ jobs:
       - "tests"
 
     steps:
-      - name: "Approve"
+      - name: "Approve pull requests created by dependabot that update development dependencies"
         uses: "hmarr/[email protected]"
         if: "(github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]') && github.event_name == 'pull_request' && startsWith(github.event.pull_request.title, 'Build(deps-dev)')"
         with:
-          github-token: "${{ secrets.AUTO_APPROVE_TOKEN }}"
+          github-token: "${{ secrets.ERGEBNIS_BOT_TOKEN }}"
diff --git a/.github/workflows/schema.yml b/.github/workflows/schema.yml
@@ -29,4 +29,4 @@ jobs:
           commit_message: "Enhancement: Update schema.json"
           file_pattern: "resource\\/schema\\.json"
         env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN_LOCALHEINZ }}"
+          GITHUB_TOKEN: "${{ secrets.ERGEBNIS_BOT_TOKEN }}"
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -16,7 +16,7 @@ jobs:
         with:
           days-before-close: 5
           days-before-stale: 60
-          repo-token: "${{ secrets.GITHUB_TOKEN }}"
+          repo-token: "${{ secrets.ERGEBNIS_BOT_TOKEN }}"
           stale-issue-label: 'stale'
           stale-issue-message: >
             This issue has been automatically marked as stale because it has not had

diff --git a/Makefile b/Makefile
@@ -35,7 +35,7 @@ static-code-analysis: vendor ## Runs a static code analysis with phpstan/phpstan
 	mkdir -p .build/phpstan
 	vendor/bin/phpstan analyse --configuration=phpstan.neon
 	mkdir -p .build/psalm
-	vendor/bin/psalm --config=psalm.xml --show-info=false
+	vendor/bin/psalm --config=psalm.xml --show-info=false --stats
 
 .PHONY: static-code-analysis-baseline
 static-code-analysis-baseline: vendor ## Generates a baseline for static code analysis with phpstan/phpstan and vimeo/psalm

diff --git a/README.md b/README.md
@@ -4,6 +4,7 @@
 [![Continuous Integration](https://github.com/ergebnis/composer-normalize/workflows/Continuous%20Integration/badge.svg)](https://github.com/ergebnis/composer-normalize/actions)
 [![Schema](https://github.com/ergebnis/composer-normalize/workflows/Schema/badge.svg)](https://github.com/ergebnis/composer-normalize/actions)
 [![Code Coverage](https://codecov.io/gh/ergebnis/composer-normalize/branch/master/graph/badge.svg)](https://codecov.io/gh/ergebnis/composer-normalize)
+[![Type Coverage](https://shepherd.dev/github/ergebnis/composer-normalize/coverage.svg)](https://shepherd.dev/github/ergebnis/composer-normalize)
 [![Latest Stable Version](https://poser.pugx.org/ergebnis/composer-normalize/v/stable)](https://packagist.org/packages/ergebnis/composer-normalize)
 [![Total Downloads](https://poser.pugx.org/ergebnis/composer-normalize/downloads)](https://packagist.org/packages/ergebnis/composer-normalize)
 

diff --git a/phpstan.neon b/phpstan.neon
@@ -2,6 +2,7 @@ includes:
 	- phpstan-baseline.neon
 
 parameters:
+	checkMissingIterableValueType: false
 	ergebnis:
 		classesAllowedToBeExtended:
 			- Composer\Command\BaseCommand