Skip to content

Commit 5183cf8

Browse files
Merge pull request #115 from php-http/improve_package
Improve package files
2 parents 19deb66 + bebc05a commit 5183cf8

11 files changed

+105
-26
lines changed

.gitattributes

+15-13
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1-
spec/ export-ignore
2-
tests/ export-ignore
3-
.editorconfig export-ignore
4-
.gitattributes export-ignore
5-
.gitignore export-ignore
6-
.php_cs export-ignore
7-
.scrutinizer.yml export-ignore
8-
.styleci.yml export-ignore
9-
.travis.yml export-ignore
10-
CONTRIBUTING export-ignore
11-
phpspec.yml.ci export-ignore
12-
phpspec.yml.dist export-ignore
13-
phpunit.xml.dist export-ignore
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+
/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

+3
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

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
| Q | A
2+
| ------------ | ---
3+
| Bug? | no|yes
4+
| New Feature? | no|yes
5+
| Version | Specific version or SHA of a commit
6+
7+
8+
#### Actual Behavior
9+
10+
What is the actual behavior?
11+
12+
13+
#### Expected Behavior
14+
15+
What is the behavior you expect?
16+
17+
18+
#### Steps to Reproduce
19+
20+
What are the steps to reproduce this bug? Please add code examples,
21+
screenshots or links to GitHub repositories that reproduce the problem.
22+
23+
24+
#### Possible Solutions
25+
26+
If you have already ideas how to solve the issue, add them here.
27+
(remove this section if not needed)

.github/PULL_REQUEST_TEMPLATE.md

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
| Q | A
2+
| --------------- | ---
3+
| Bug fix? | no|yes
4+
| New feature? | no|yes
5+
| BC breaks? | no|yes
6+
| Deprecations? | no|yes
7+
| 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
9+
| License | MIT
10+
11+
12+
#### What's in this PR?
13+
14+
Explain what the changes in this PR do.
15+
16+
17+
#### Why?
18+
19+
Which problem does the PR fix? (remove this section if you linked an issue above)
20+
21+
22+
#### Example Usage
23+
24+
``` php
25+
// If you added new features, show examples of how to use them here
26+
// (remove this section if not a new feature)
27+
28+
$foo = new Foo();
29+
30+
// Now we can do
31+
$foo->doSomething();
32+
```
33+
34+
35+
#### Checklist
36+
37+
- [ ] Updated CHANGELOG.md to describe BC breaks / deprecations | new feature | bugfix
38+
- [ ] Documentation pull request created (if not simply a bugfix)
39+
40+
41+
#### To Do
42+
43+
- [ ] If the PR is not complete but you want to discuss the approach, list what remains to be done here

.gitignore

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
.puli/
2-
build/
3-
vendor/
4-
composer.lock
5-
phpspec.yml
6-
phpunit.xml
1+
/behat.yml
2+
/build/
3+
/composer.lock
4+
/phpspec.yml
5+
/phpunit.xml
6+
/vendor/

.styleci.yml

+4
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ finder:
55
- "spec"
66
path:
77
- "src"
8+
- "tests"
89

910
enabled:
1011
- short_array_syntax
12+
13+
disabled:
14+
- phpdoc_annotation_without_dot # This is still buggy: https://github.com/symfony/symfony/pull/19198

.travis.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ sudo: false
44

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

99
php:
1010
- 5.4
@@ -28,14 +28,15 @@ matrix:
2828
env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci"
2929

3030
before_install:
31+
- if [[ $COVERAGE != true && $TRAVIS_PHP_VERSION != hhvm ]]; then phpenv config-rm xdebug.ini; fi
3132
- travis_retry composer self-update
3233

3334
install:
34-
- travis_retry composer update ${COMPOSER_FLAGS} --prefer-source --no-interaction
35+
- travis_retry composer update ${COMPOSER_FLAGS} --prefer-dist --no-interaction
3536

3637
script:
3738
- $TEST_COMMAND
3839

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

CONTRIBUTING

-1
This file was deleted.

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ This library is the official successor of the [ivory http adapter](https://githu
3232

3333
## Documentation
3434

35-
Please see the [official documentation](http://docs.httplug.io).
35+
Please see the [official documentation](http://docs.php-http.org).
3636

3737

3838
## Testing

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
},
3131
"scripts": {
3232
"test": "vendor/bin/phpspec run",
33-
"test-ci": "vendor/bin/phpspec run -c phpspec.yml.ci"
33+
"test-ci": "vendor/bin/phpspec run -c phpspec.ci.yml"
3434
},
3535
"extra": {
3636
"branch-alias": {
File renamed without changes.

0 commit comments

Comments
 (0)