Skip to content

Commit

Permalink
Merge pull request #3 from Dhii/update
Browse files Browse the repository at this point in the history
  • Loading branch information
XedinUnknown authored Jun 10, 2021
2 parents fbc6f8b + b9bfc87 commit 08f9a87
Show file tree
Hide file tree
Showing 9 changed files with 270 additions and 183 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Continuous Integration
on: [push, pull_request]
on: [push]
jobs:
build:
runs-on: ubuntu-latest
Expand All @@ -22,7 +22,10 @@ jobs:
run: composer validate

- name: Install dependencies
run: composer update --prefer-dist --no-progress --no-suggest
uses: ramsey/composer-install@v1
with:
dependency-versions: highest
composer-options: "--prefer-dist"

- name: PhpUnit
run: ./vendor/bin/phpunit
Expand Down
1 change: 1 addition & 0 deletions .idea/php-project.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .idea/php-test-framework.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

42 changes: 27 additions & 15 deletions .idea/php.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

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

## [0.1.0-alpha1] - 2021-03-09
Initial version.
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,8 @@ allowing inspection of code.
docker-compose run --rm test vendor/bin/psalm
```
Will also be run automatically on CI.
* Will also be run automatically on CI.
* PHPStorm integration config included.
- **PHPCS**
Expand All @@ -124,9 +125,9 @@ allowing inspection of code.
docker-compose run --rm test vendor/bin/phpcbf
```
By default, uses [PSR-12][] and some rules from the [Slevomat Coding Standard][].
Will also be run automatically on CI.
* By default, uses [PSR-12][] and some rules from the [Slevomat Coding Standard][].
* Will also be run automatically on CI.
* PHPStorm integration config included.
[Docker Machine]: https://github.com/docker/machine
Expand Down
5 changes: 0 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,5 @@
"psr-4": {
"Me\\Library\\Test\\Func\\": "tests/functional"
}
},
"extra": {
"branch-alias": {
"dev-initial": "0.1.x-dev"
}
}
}
Loading

0 comments on commit 08f9a87

Please sign in to comment.