Skip to content

Commit

Permalink
Merge pull request #353 from Lctrs/feat/sync
Browse files Browse the repository at this point in the history
chore(project): sync with template
  • Loading branch information
Lctrs committed Nov 30, 2021
2 parents 76eea5e + d9db6d2 commit f807f0d
Show file tree
Hide file tree
Showing 12 changed files with 25 additions and 335 deletions.
16 changes: 8 additions & 8 deletions .github/CONTRIBUTING.md
Expand Up @@ -21,7 +21,7 @@ We are using [`doctrine/coding-standard`](https://github.com/doctrine-coding-sta
Run

```sh
$ make coding-standards
make coding-standards
```

to automatically fix coding standard violations.
Expand All @@ -33,7 +33,7 @@ We are using [`maglnet/composer-require-checker`](https://github.com/maglnet/Com
Run

```sh
$ make dependency-analysis
make dependency-analysis
```

to run a dependency analysis.
Expand All @@ -45,7 +45,7 @@ We are using [`phpstan/phpstan`](https://github.com/phpstan/phpstan) and [`vimeo
Run

```sh
$ make static-code-analysis
make static-code-analysis
```

to run a static code analysis.
Expand All @@ -55,7 +55,7 @@ We are also using the baseline features of [`phpstan/phpstan`](https://phpstan.o
Run

```sh
$ make static-code-analysis-baseline
make static-code-analysis-baseline
```

to regenerate the baselines in [`../phpstan-baseline.neon`](../phpstan-baseline.neon) and [`../psalm-baseline.xml`](../psalm-baseline.xml).
Expand All @@ -69,7 +69,7 @@ We are using [`phpunit/phpunit`](https://github.com/sebastianbergmann/phpunit) a
Run

```sh
$ make tests
make tests
```

to run all the tests.
Expand All @@ -81,7 +81,7 @@ We are using [`infection/infection`](https://github.com/infection/infection) to
Enable `pcov` or `Xdebug` and run

```sh
$ make mutation-tests
make mutation-tests
```

to run mutation tests.
Expand All @@ -91,7 +91,7 @@ to run mutation tests.
Run

```sh
$ make
make
```

to enforce coding standards, run a dependency analysis, run a static code analysis, and run tests!
Expand All @@ -101,7 +101,7 @@ to enforce coding standards, run a dependency analysis, run a static code analys
:bulb: Run

```sh
$ make help
make help
```

to display a list of available targets with corresponding descriptions.
22 changes: 0 additions & 22 deletions .github/ISSUE_TEMPLATE/bug_report.md

This file was deleted.

8 changes: 0 additions & 8 deletions .github/PULL_REQUEST_TEMPLATE.md

This file was deleted.

2 changes: 1 addition & 1 deletion .github/actions/composer/composer/install/run.sh
Expand Up @@ -21,6 +21,6 @@ if [[ ${dependencies} == "highest" ]]; then
exit $?
fi

echo "::error::The value for the \"dependencies\" input needs to be one of \"lowest\", \"locked\"', \"highest\"' - got \"${dependencies}\" instead."
echo "::error::The value for the \"dependencies\" input needs to be one of \"lowest\", \"locked\", \"highest\" - got \"${dependencies}\" instead."

exit 1
10 changes: 5 additions & 5 deletions .github/settings.yml
Expand Up @@ -14,11 +14,11 @@ branches:
required_approving_review_count: 1
required_status_checks:
contexts:
- "Code Coverage (8.0, locked)"
- "Coding Standards (8.0, locked)"
- "Dependency Analysis (8.0, locked)"
- "Mutation Tests (8.0, locked)"
- "Static Code Analysis (8.0, locked)"
- "Code Coverage (8.1, locked)"
- "Coding Standards (8.1, locked)"
- "Dependency Analysis (8.1, locked)"
- "Mutation Tests (8.1, locked)"
- "Static Code Analysis (8.1, locked)"
- "Tests (7.3, highest)"
- "Tests (7.3, locked)"
- "Tests (7.3, lowest)"
Expand Down
13 changes: 5 additions & 8 deletions .github/workflows/integrate.yaml
Expand Up @@ -20,7 +20,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.0"
- "8.1"

dependencies:
- "locked"
Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.0"
- "8.1"

dependencies:
- "locked"
Expand Down Expand Up @@ -133,7 +133,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.0"
- "8.1"

dependencies:
- "locked"
Expand Down Expand Up @@ -237,9 +237,6 @@ jobs:
with:
dependencies: "${{ matrix.dependencies }}"

- name: "Run auto-review tests with phpunit/phpunit"
run: "vendor/bin/phpunit --configuration=test/AutoReview/phpunit.xml.dist"

- name: "Run unit tests with phpunit/phpunit"
run: "vendor/bin/phpunit --configuration=test/Unit/phpunit.xml.dist"

Expand All @@ -254,7 +251,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.0"
- "8.1"

dependencies:
- "locked"
Expand Down Expand Up @@ -304,7 +301,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.0"
- "8.1"

dependencies:
- "locked"
Expand Down
9 changes: 4 additions & 5 deletions Makefile
Expand Up @@ -15,22 +15,22 @@ coding-standards: vendor ## Normalizes composer.json with ergebnis/composer-norm
vendor/bin/phpcs

.PHONY: dependency-analysis
dependency-analysis: vendor dependency-analysis-vendor ## Runs a dependency analysis with maglnet/composer-require-checker
dependency-analysis: vendor .tools/composer-require-checker/vendor ## Runs a dependency analysis with maglnet/composer-require-checker
.tools/composer-require-checker/vendor/bin/composer-require-checker check --config-file=$(shell pwd)/composer-require-checker.json

dependency-analysis-vendor: .tools/composer-require-checker/composer.json .tools/composer-require-checker/composer.lock
.tools/composer-require-checker/vendor: .tools/composer-require-checker/composer.json .tools/composer-require-checker/composer.lock
composer install --no-interaction --no-progress --working-dir=".tools/composer-require-checker/"

.PHONY: help
help: ## Displays this list of targets with descriptions
@grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[32m%-30s\033[0m %s\n", $$1, $$2}'

.PHONY: mutation-tests
mutation-tests: vendor mutation-tests-vendor ## Runs mutation tests with infection/infection
mutation-tests: vendor .tools/infection/vendor ## Runs mutation tests with infection/infection
mkdir -p .build/infection
.tools/infection/vendor/bin/infection --configuration=infection.json.dist

mutation-tests-vendor: .tools/infection/composer.json .tools/infection/composer.lock
.tools/infection/vendor: .tools/infection/composer.json .tools/infection/composer.lock
composer install --no-interaction --no-progress --working-dir=".tools/infection/"

.PHONY: static-code-analysis
Expand All @@ -51,7 +51,6 @@ static-code-analysis-baseline: vendor ## Generates a baseline for static code an
.PHONY: tests
tests: vendor ## Runs unit tests with phpunit/phpunit and integration tests with codeception/codeception
mkdir -p .build/phpunit
vendor/bin/phpunit --configuration=test/AutoReview/phpunit.xml.dist
vendor/bin/phpunit --configuration=test/Unit/phpunit.xml.dist
mkdir -p .build/codeception
vendor/bin/codecept run --config=codeception.dist.yml --steps
Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -16,7 +16,7 @@
Run

```sh
$ composer require --dev lctrs/psalm-psr-container-plugin
composer require --dev lctrs/psalm-psr-container-plugin
```

## Usage
Expand Down
1 change: 0 additions & 1 deletion composer.json
Expand Up @@ -35,7 +35,6 @@
"doctrine/coding-standard": "^9.0.0",
"ergebnis/composer-normalize": "^2.16.0",
"ergebnis/license": "^1.1.0",
"ergebnis/test-util": "^1.5.0",
"jangregor/phpstan-prophecy": "^0.8.1",
"phpspec/prophecy-phpunit": "^2.0.1",
"phpstan/extension-installer": "^1.1.0",
Expand Down

0 comments on commit f807f0d

Please sign in to comment.