Skip to content

Commit 08f9a87

Browse files
authored
Merge pull request #3 from Dhii/update
2 parents fbc6f8b + b9bfc87 commit 08f9a87

File tree

9 files changed

+270
-183
lines changed

9 files changed

+270
-183
lines changed

.github/workflows/continuous-integration.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Continuous Integration
2-
on: [push, pull_request]
2+
on: [push]
33
jobs:
44
build:
55
runs-on: ubuntu-latest
@@ -22,7 +22,10 @@ jobs:
2222
run: composer validate
2323

2424
- name: Install dependencies
25-
run: composer update --prefer-dist --no-progress --no-suggest
25+
uses: ramsey/composer-install@v1
26+
with:
27+
dependency-versions: highest
28+
composer-options: "--prefer-dist"
2629

2730
- name: PhpUnit
2831
run: ./vendor/bin/phpunit

.idea/php-project.iml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/php-test-framework.xml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/php.xml

Lines changed: 27 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
55
and this project adheres to [Semantic Versioning](http://semver.org/).
66

77
## [[*next-version*]] - YYYY-MM-DD
8+
### Added
9+
- PHPStorm configuration for PHPCS and Psalm via Docker (#3).
810

911
## [0.1.0-alpha1] - 2021-03-09
1012
Initial version.

README.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,8 @@ allowing inspection of code.
113113
docker-compose run --rm test vendor/bin/psalm
114114
```
115115
116-
Will also be run automatically on CI.
116+
* Will also be run automatically on CI.
117+
* PHPStorm integration config included.
117118
118119
- **PHPCS**
119120
@@ -124,9 +125,9 @@ allowing inspection of code.
124125
docker-compose run --rm test vendor/bin/phpcbf
125126
```
126127
127-
By default, uses [PSR-12][] and some rules from the [Slevomat Coding Standard][].
128-
129-
Will also be run automatically on CI.
128+
* By default, uses [PSR-12][] and some rules from the [Slevomat Coding Standard][].
129+
* Will also be run automatically on CI.
130+
* PHPStorm integration config included.
130131
131132
132133
[Docker Machine]: https://github.com/docker/machine

composer.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,5 @@
2828
"psr-4": {
2929
"Me\\Library\\Test\\Func\\": "tests/functional"
3030
}
31-
},
32-
"extra": {
33-
"branch-alias": {
34-
"dev-initial": "0.1.x-dev"
35-
}
3631
}
3732
}

0 commit comments

Comments
 (0)