File tree Expand file tree Collapse file tree 9 files changed +70
-33
lines changed Expand file tree Collapse file tree 9 files changed +70
-33
lines changed Original file line number Diff line number Diff line change @@ -7,6 +7,3 @@ indent_size = 4
7
7
indent_style = space
8
8
insert_final_newline = true
9
9
trim_trailing_whitespace = true
10
-
11
- [* .md ]
12
- trim_trailing_whitespace = false
Original file line number Diff line number Diff line change 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
Original file line number Diff line number Diff line change
1
+ # Contributing
2
+
3
+ Please see our [ contributing guide] ( http://docs.php-http.org/en/latest/development/contributing.html ) .
Original file line number Diff line number Diff line change 1
1
| Q | A
2
2
| ------------ | ---
3
- | Bug? | no
4
- | New Feature? | no
3
+ | Bug? | no|yes
4
+ | New Feature? | no|yes
5
5
| Version | Specific version or SHA of a commit
6
6
7
7
Original file line number Diff line number Diff line change 5
5
| BC breaks? | no|yes
6
6
| Deprecations? | no|yes
7
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
8
9
| License | MIT
9
10
10
11
11
12
#### What's in this PR?
12
13
13
- Explain the contents of the PR.
14
+ Explain what the changes in this PR do .
14
15
15
16
16
17
#### Why?
@@ -31,11 +32,12 @@ $foo->doSomething();
31
32
```
32
33
33
34
34
- #### BC Breaks/Deprecations
35
+ #### Checklist
35
36
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)
37
39
38
40
39
41
#### To Do
40
42
41
- - [ ] Add tests
43
+ - [ ] If the PR is not complete but you want to discuss the approach, list what remains to be done here
Original file line number Diff line number Diff line change 1
- /build
2
- /vendor
1
+ /.php_cs
2
+ /.php_cs.cache
3
+ /behat.yml
4
+ /build /
3
5
/composer.lock
6
+ /phpspec.yml
4
7
/phpunit.xml
8
+ /vendor /
Original file line number Diff line number Diff line change
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 );
Original file line number Diff line number Diff line change @@ -4,12 +4,12 @@ sudo: false
4
4
5
5
cache :
6
6
directories :
7
- - $HOME/.composer/cache
7
+ - $HOME/.composer/cache/files
8
8
9
9
php :
10
- - 5.6
11
- - 7.0
12
- - hhvm
10
+ - 7.1
11
+ - 7.2
12
+ - 7.3
13
13
14
14
env :
15
15
global :
@@ -22,18 +22,22 @@ branches:
22
22
matrix :
23
23
fast_finish : true
24
24
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
27
29
28
30
before_install :
29
- - travis_retry composer self-update
31
+ - if [[ $COVERAGE != true ]]; then phpenv config-rm xdebug.ini || true; fi
30
32
31
33
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
33
37
34
38
script :
35
39
- $TEST_COMMAND
36
40
37
41
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
Original file line number Diff line number Diff line change 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>
3
2
4
3
Permission is hereby granted, free of charge, to any person obtaining a copy
5
4
of this software and associated documentation files (the "Software"), to deal
You can’t perform that action at this time.
0 commit comments