Skip to content

Commit

Permalink
Merge pull request #525 from mimmi20/updates
Browse files Browse the repository at this point in the history
update config for dependebot
  • Loading branch information
mimmi20 authored Aug 19, 2023
2 parents c0c1fff + 630e236 commit 49d178c
Show file tree
Hide file tree
Showing 15 changed files with 64 additions and 31 deletions.
12 changes: 10 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,14 +1,22 @@
; This file is for unifying the coding style for different editors and IDEs.
; More information at http://editorconfig.org

; file-version: 1.0

root = true

[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true
indent_style = space
indent_size = 2
indent_size = 4
trim_trailing_whitespace = true

[{*.php,*.xml}]
[*.{js,ts,json,json5,yml}]
indent_size = 2

[composer.json]
indent_size = 4

[*.md]
Expand Down
6 changes: 6 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
; file-version: 1.0

# text files
* text=auto
*.markdown text eol=lf
*.md text eol=lf
*.js text eol=lf
*.ts text eol=lf
*.css text eol=lf
*.scss text eol=lf
*.json text eol=lf
*.json5 text eol=lf
*.lock text eol=lf
*.html text eol=lf
*.php text eol=lf
Expand Down Expand Up @@ -41,6 +46,7 @@ phpstan.neon export-ignore text eol=lf
phpunit.xml export-ignore text eol=lf
psalm.xml export-ignore text eol=lf
rector.php export-ignore text eol=lf
/test export-ignore
/tests export-ignore
/tools export-ignore
/.github export-ignore
3 changes: 0 additions & 3 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,9 @@ For details, take a look at the following workflow configuration files:

- [`workflows/continuous-integration.yaml`](workflows/continuous-integration.yaml)
- [`workflows/lock-closed-issues.yaml`](workflows/lock-closed-issues.yaml)
- [`workflows/stale.yaml`](workflows/stale.yaml)

## Coding Standards

We are using [`ergebnis/composer-normalize`](https://github.com/ergebnis/composer-normalize) to normalize `composer.json`.

We are using [`friendsofphp/php-cs-fixer`](https://github.com/FriendsOfPHP/PHP-CS-Fixer) and [`squizlabs/php_codesniffer`](https://github.com/squizlabs/PHP_CodeSniffer) to enforce coding standards in PHP files.

Run
Expand Down
8 changes: 4 additions & 4 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#### Steps required to reproduce the problem

1.
2.
3.
1.
2.
3.

#### Expected Result

*
*

#### Actual Result

Expand Down
22 changes: 15 additions & 7 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# https://docs.github.com/en/github/administering-a-repository/configuration-options-for-dependency-updates

# file-version: 1.0

version: 2

updates:
Expand All @@ -18,6 +20,9 @@ updates:
# dependency name)
patterns:
- "*"
update-types:
- "minor"
- "patch"
# exclude-patterns:
# - "gc_ruboconfig"

Expand All @@ -41,13 +46,13 @@ updates:
include: "scope"
prefix: "composer"

# ignore:
# - dependency-name: infection/infection
# versions:
# - ">= 0"
# - dependency-name: phpunit/phpunit
# versions:
# - ">= 0"
# ignore:
# - dependency-name: slevomat/coding-standard
# versions:
# - ">= 0"
# - dependency-name: phpunit/phpunit
# versions:
# - ">= 0"

- package-ecosystem: "github-actions"

Expand All @@ -64,6 +69,9 @@ updates:
# dependency name)
patterns:
- "*"
update-types:
- "minor"
- "patch"
# exclude-patterns:
# - "gc_ruboconfig"

Expand Down
4 changes: 3 additions & 1 deletion .github/labels.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
---
# file-version: 1.0

# Default GitHub labels
- color: "ee0701"
name: "bug"
Expand Down Expand Up @@ -63,7 +65,7 @@
name: "patch"
description: "Patch"

# other Labels to mimmi20/template
# other Labels
#- color: 5319e7
# name: "new useragents"
# description: ""
5 changes: 4 additions & 1 deletion .github/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
---
# file-version: 1.0

template: |
## What’s Changed
Expand Down Expand Up @@ -74,7 +77,7 @@ categories:
- title: "**📦 Documentation:**"
labels:
- "documentation"
# other Labels to mimmi20/template
# other Labels
#- title: "**📦 new Useragents:**"
# labels:
# - "new useragents"
Expand Down
12 changes: 10 additions & 2 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# https://help.github.com/en/categories/automating-your-workflow-with-github-actions

# file-version: 1.0

name: "Continuous Integration"

on:
Expand Down Expand Up @@ -34,7 +36,9 @@ jobs:
# name: "Check composer dependencies"
#
# runs-on: "${{ matrix.operating-system }}"
#
# timeout-minutes: 10
#
# continue-on-error: false
#
# needs: "ci"
Expand Down Expand Up @@ -88,7 +92,9 @@ jobs:
# needs: "ci"
#
# runs-on: "${{ matrix.operating-system }}"
#
# timeout-minutes: 10
#
# continue-on-error: false
#
# strategy:
Expand Down Expand Up @@ -135,15 +141,17 @@ jobs:
# composer-options: "--optimize-autoloader --prefer-dist --prefer-stable -v"
#
# - name: "Run unit tests with phpunit/phpunit"
# run: "vendor/bin/phpunit -c phpunit.xml --no-coverage"
# run: "vendor/bin/phpunit -c phpunit.xml --no-coverage --display-warnings --display-deprecations"
#
# code-coverage:
# name: "Code Coverage with PHPUnit"
#
# needs: "tests"
#
# runs-on: "${{ matrix.operating-system }}"
#
# timeout-minutes: 10
#
# continue-on-error: false
#
# strategy:
Expand Down Expand Up @@ -192,7 +200,7 @@ jobs:
# run: "mkdir -p .build/coverage"
#
# - name: "Collect code coverage with Xdebug and phpunit/phpunit"
# run: "vendor/bin/phpunit -c phpunit.xml --coverage-clover=.build/coverage/clover.xml --coverage-text --coverage-xml=.build/coverage/coverage-xml --log-junit=.build/coverage/phpunit.junit.xml"
# run: "vendor/bin/phpunit -c phpunit.xml --coverage-clover=.build/coverage/clover.xml --coverage-text --coverage-xml=.build/coverage/coverage-xml --log-junit=.build/coverage/phpunit.junit.xml --display-warnings --display-deprecations"
#
# - name: "Upload coverage to Codecov"
# uses: "codecov/[email protected]"
Expand Down
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,13 @@ tests/temp/*.ini
.php-cs-fixer.cache
.phplint-cache
.phpunit.result.cache
.phpcs.cache
infection-*.log
rewrite*.php
.reports/
node_modules/
.build/
package-lock.json
.reports
*.bak
*.txt
4 changes: 0 additions & 4 deletions .mega-linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,12 @@ FILTER_REGEX_EXCLUDE: (vendor/)
ENABLE:
- EDITORCONFIG
- MARKDOWN
- PHP
- YAML
DISABLE:
- SPELL
#- COPYPASTE
DISABLE_LINTERS:
- MARKDOWN_MARKDOWN_TABLE_FORMATTER
- PHP_PSALM
- PHP_PHPCS
- PHP_PHPSTAN
- YAML_V8R
EDITORCONFIG_EDITORCONFIG_CHECKER_FILTER_REGEX_EXCLUDE: "(\\.idea|\\.editorconfig|\\.github|\\.phpunit\\.result\\.cache|LICENSE)"
JSON_PRETTIER_FILTER_REGEX_EXCLUDE: "(composer\\.json)"
Expand Down
2 changes: 1 addition & 1 deletion .php-cs-fixer.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
$header = <<<'EOF'
This file is part of the mimmi20/template package.
Copyright (c) 2020-2021, Thomas Mueller <[email protected]>
Copyright (c) 2020-2023, Thomas Mueller <[email protected]>
For the full copyright and license information, please view the LICENSE
file that was distributed with this source code.
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# The MIT License (MIT)

Copyright (c) 2020-2022 Thomas Müller
Copyright (c) 2020-2023 Thomas Müller

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
documentation files (the _Software_), to deal in the Software without restriction, including without limitation the
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
## Code Status

[![codecov](https://codecov.io/gh/mimmi20/template/branch/master/graph/badge.svg)](https://codecov.io/gh/mimmi20/template)
[![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/mimmi20/template.svg)](http://isitmaintained.com/project/mimmi20/template "Average time to resolve an issue")
[![Percentage of issues still open](http://isitmaintained.com/badge/open/mimmi20/template.svg)](http://isitmaintained.com/project/mimmi20/template "Percentage of issues still open")
[![Average time to resolve an issue](https://isitmaintained.com/badge/resolution/mimmi20/template.svg)](https://isitmaintained.com/project/mimmi20/template "Average time to resolve an issue")
[![Percentage of issues still open](https://isitmaintained.com/badge/open/mimmi20/template.svg)](https://isitmaintained.com/project/mimmi20/template "Percentage of issues still open")
[![Mutation testing badge](https://img.shields.io/endpoint?style=flat&url=https%3A%2F%2Fbadge-api.stryker-mutator.io%2Fgithub.com%2Fmimmi20%2Ftemplate%2Fmaster)](https://dashboard.stryker-mutator.io/reports/github.com/mimmi20/template/master)

## Requirements
Expand Down
2 changes: 1 addition & 1 deletion codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ comment:
behavior: default
require_changes: false # if true: only post the comment if coverage changes
require_base: false # [yes :: must have a base report to post]
require_head: false # [yes :: must have a head report to post]
require_head: false # [yes :: must have a head report to post]
2 changes: 0 additions & 2 deletions rector.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
use Rector\DeadCode\Rector\If_\RemoveDeadInstanceOfRector;
use Rector\DeadCode\Rector\StaticCall\RemoveParentCallWithoutParentRector;
use Rector\Php71\Rector\FuncCall\CountOnNullRector;
use Rector\Php80\Rector\FunctionLike\UnionTypesRector;
use Rector\Php81\Rector\Array_\FirstClassCallableRector;
use Rector\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector;
use Rector\PHPUnit\Set\PHPUnitSetList;
Expand All @@ -39,7 +38,6 @@

$rectorConfig->skip(
[
UnionTypesRector::class,
NullToStrictStringFuncCallArgRector::class,
RemoveDeadInstanceOfRector::class,
FirstClassCallableRector::class,
Expand Down

0 comments on commit 49d178c

Please sign in to comment.