Skip to content

Commit

Permalink
Merge pull request #94 from ergebnis/feature/synchronize
Browse files Browse the repository at this point in the history
Enhancement: Synchronize with ergebnis/php-cs-fixer-config-template
  • Loading branch information
localheinz authored Apr 11, 2020
2 parents a222ff7 + 5444de7 commit 3f553f5
Show file tree
Hide file tree
Showing 18 changed files with 377 additions and 146 deletions.
5 changes: 1 addition & 4 deletions .dependabot/config.yml → .dependabot/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@
version: 1

update_configs:
- automerged_updates:
- match:
dependency_type: "development"
commit_message:
- commit_message:
include_scope: true
prefix: "Build"
default_labels:
Expand Down
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ indent_size = 2
[*.neon]
indent_style = tab

[*.yml]
[*.{yaml,yml}]
indent_size = 2

[Makefile]
Expand Down
11 changes: 8 additions & 3 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@

We are using [GitHub Actions](https://github.com/features/actions) as a continuous integration system.

For details, see [`workflows/continuous-integration.yml`](workflows/continuous-integration.yml).
For details, take a look at the following workflow configuration files:

- [`workflows/integrate.yaml`](workflows/integrate.yaml)
- [`workflows/prune.yaml`](workflows/prune.yaml)
- [`workflows/release.yaml`](workflows/release.yaml)
- [`workflows/renew.yaml`](workflows/renew.yaml)

## Coding Standards

Expand Down Expand Up @@ -40,7 +45,7 @@ $ make static-code-analysis

to run a static code analysis.

We are also using the baseline features of [`phpstan/phpstan`(https://medium.com/@ondrejmirtes/phpstans-baseline-feature-lets-you-hold-new-code-to-a-higher-standard-e77d815a5dff) and [`vimeo/psalm`](https://psalm.dev/docs/running_psalm/dealing_with_code_issues/#using-a-baseline-file).
We are also using the baseline features of [`phpstan/phpstan`](https://medium.com/@ondrejmirtes/phpstans-baseline-feature-lets-you-hold-new-code-to-a-higher-standard-e77d815a5dff) and [`vimeo/psalm`](https://psalm.dev/docs/running_psalm/dealing_with_code_issues/#using-a-baseline-file).

Run

Expand Down Expand Up @@ -84,7 +89,7 @@ Run
$ make
```

to enforce coding standards, run a dependency analysis, run a static code analysis, and run tests!
to enforce coding standards, run a static code analysis, and run tests!

## Help

Expand Down
27 changes: 17 additions & 10 deletions .github/settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,15 @@ branches:
- "Tests (7.4, highest)"
- "Code Coverage (7.4, locked)"
- "Mutation Tests (7.4, locked)"
- "codecov/patch"
- "codecov/project"
strict: false
restrictions:
apps:
- "dependabot-preview"

# https://developer.github.com/v3/repos/branches/#parameters-1

# Note: User, app, and team restrictions are only available for organization-owned repositories.
# Set to null to disable when using this configuration for a repository on a personal account.

apps: []
teams: []
users:
- "ergebnis-bot"
Expand All @@ -46,27 +49,31 @@ branches:

labels:
- name: "bug"
color: "#ee0701"
color: "ee0701"
description: ""

- name: "dependency"
color: "#0366d6"
color: "0366d6"
description: ""

- name: "enhancement"
color: "#0e8a16"
color: "0e8a16"
description: ""

- name: "merge"
color: "6f42c1"
description: ""

- name: "question"
color: "#cc317c"
color: "cc317c"
description: ""

- name: "security"
color: "#ee0701"
color: "ee0701"
description: ""

- name: "stale"
color: "#eeeeee"
color: "eeeeee"
description: ""

# https://developer.github.com/v3/repos/#edit
Expand Down
Loading

0 comments on commit 3f553f5

Please sign in to comment.