Skip to content

Commit a64c076

Browse files
committed
update boilerplate from boilerplate repo
1 parent 4306195 commit a64c076

File tree

9 files changed

+70
-33
lines changed

9 files changed

+70
-33
lines changed

.editorconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,3 @@ indent_size = 4
77
indent_style = space
88
insert_final_newline = true
99
trim_trailing_whitespace = true
10-
11-
[*.md]
12-
trim_trailing_whitespace = false

.gitattributes

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
1-
.editorconfig export-ignore
2-
.gitattributes export-ignore
3-
.github/ export-ignore
4-
.gitignore export-ignore
5-
.php_cs export-ignore
6-
.scrutinizer.yml export-ignore
7-
.styleci.yml export-ignore
8-
.travis.yml export-ignore
9-
phpunit.xml.dist export-ignore
10-
tests/ export-ignore
1+
.editorconfig export-ignore
2+
.gitattributes export-ignore
3+
/.github/ export-ignore
4+
.gitignore export-ignore
5+
/.php_cs.dist export-ignore
6+
/.scrutinizer.yml export-ignore
7+
/.styleci.yml export-ignore
8+
/.travis.yml export-ignore
9+
/behat.yml.dist export-ignore
10+
/features/ export-ignore
11+
/phpspec.ci.yml export-ignore
12+
/phpspec.yml.dist export-ignore
13+
/phpunit.xml.dist export-ignore
14+
/spec/ export-ignore
15+
/tests/ export-ignore

.github/CONTRIBUTING.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Contributing
2+
3+
Please see our [contributing guide](http://docs.php-http.org/en/latest/development/contributing.html).

.github/ISSUE_TEMPLATE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
| Q | A
22
| ------------ | ---
3-
| Bug? | no
4-
| New Feature? | no
3+
| Bug? | no|yes
4+
| New Feature? | no|yes
55
| Version | Specific version or SHA of a commit
66

77

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@
55
| BC breaks? | no|yes
66
| Deprecations? | no|yes
77
| Related tickets | fixes #X, partially #Y, mentioned in #Z
8+
| Documentation | if this is a new feature, link to pull request in https://github.com/php-http/documentation that adds relevant documentation
89
| License | MIT
910

1011

1112
#### What's in this PR?
1213

13-
Explain the contents of the PR.
14+
Explain what the changes in this PR do.
1415

1516

1617
#### Why?
@@ -31,11 +32,12 @@ $foo->doSomething();
3132
```
3233

3334

34-
#### BC Breaks/Deprecations
35+
#### Checklist
3536

36-
Describe BC breaks/deprecations here. (remove this section if not needed)
37+
- [ ] Updated CHANGELOG.md to describe BC breaks / deprecations | new feature | bugfix
38+
- [ ] Documentation pull request created (if not simply a bugfix)
3739

3840

3941
#### To Do
4042

41-
- [ ] Add tests
43+
- [ ] If the PR is not complete but you want to discuss the approach, list what remains to be done here

.gitignore

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
/build
2-
/vendor
1+
/.php_cs
2+
/.php_cs.cache
3+
/behat.yml
4+
/build/
35
/composer.lock
6+
/phpspec.yml
47
/phpunit.xml
8+
/vendor/

.php_cs.dist

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?php
2+
3+
/*
4+
* Configuration for friendsofphp/php-cs-fixer
5+
*
6+
* @link https://github.com/FriendsOfPHP/PHP-CS-Fixer
7+
*/
8+
9+
$finder = PhpCsFixer\Finder::create()
10+
->in('src')
11+
->in('tests')
12+
;
13+
return PhpCsFixer\Config::create()
14+
->setRules([
15+
'@PSR2' => true,
16+
'@Symfony' => true,
17+
'array_syntax' => [
18+
'syntax' => 'short',
19+
],
20+
'no_empty_phpdoc' => true,
21+
'no_superfluous_phpdoc_tags' => true,
22+
])
23+
->setFinder($finder);

.travis.yml

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ sudo: false
44

55
cache:
66
directories:
7-
- $HOME/.composer/cache
7+
- $HOME/.composer/cache/files
88

99
php:
10-
- 5.6
11-
- 7.0
12-
- hhvm
10+
- 7.1
11+
- 7.2
12+
- 7.3
1313

1414
env:
1515
global:
@@ -22,18 +22,22 @@ branches:
2222
matrix:
2323
fast_finish: true
2424
include:
25-
- php: 5.6
26-
env: COVERAGE=true TEST_COMMAND="composer test-ci"
25+
- php: 5.5
26+
env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci"
27+
- php: hhvm
28+
dist: trusty
2729

2830
before_install:
29-
- travis_retry composer self-update
31+
- if [[ $COVERAGE != true ]]; then phpenv config-rm xdebug.ini || true; fi
3032

3133
install:
32-
- travis_retry composer update ${COMPOSER_FLAGS} --prefer-source --no-interaction
34+
# To be removed when this issue will be resolved: https://github.com/composer/composer/issues/5355
35+
- if [[ "$COMPOSER_FLAGS" == *"--prefer-lowest"* ]]; then travis_retry composer update --prefer-dist --no-interaction --prefer-stable --quiet; fi
36+
- travis_retry composer update ${COMPOSER_FLAGS} --prefer-dist --no-interaction
3337

3438
script:
3539
- $TEST_COMMAND
3640

3741
after_success:
38-
- if [[ "$COVERAGE" = true ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi
39-
- if [[ "$COVERAGE" = true ]]; then php ocular.phar code-coverage:upload --format=php-clover build/coverage.xml; fi
42+
- if [[ $COVERAGE = true ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi
43+
- if [[ $COVERAGE = true ]]; then php ocular.phar code-coverage:upload --format=php-clover build/coverage.xml; fi

LICENSE

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
Copyright (c) 2016 PHP HTTP Team <team@php-http.org>
2-
Copyright (c) 2016 Jérôme Gamez <jerome@gamez.name>
1+
Copyright (c) PHP HTTP Team <team@php-http.org>
32

43
Permission is hereby granted, free of charge, to any person obtaining a copy
54
of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)