Skip to content

Commit a6feea4

Browse files
shulardshulard
committed
Update package files
Fix #6
1 parent 10a6bf2 commit a6feea4

9 files changed

+60
-143
lines changed

‎.editorconfig

-3
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-
[*.yml*]
12-
indent_size = 2

‎.gitattributes

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
1+
spec/ export-ignore
2+
tests/ export-ignore
13
.editorconfig export-ignore
24
.gitattributes export-ignore
35
.gitignore export-ignore
6+
.php_cs export-ignore
47
.scrutinizer.yml export-ignore
8+
.styleci.yml export-ignore
59
.travis.yml export-ignore
6-
CONTRIBUTING.md export-ignore
7-
CONDUCT.md export-ignore
10+
CONTRIBUTING export-ignore
11+
phpspec.yml.ci export-ignore
12+
phpspec.yml.dist export-ignore
13+
phpunit.xml.dist export-ignore

‎.gitignore

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

‎.php_cs

+11-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
<?php
22

3-
return Symfony\CS\Config\Config::create()
4-
->level(Symfony\CS\FixerInterface::PSR2_LEVEL)
5-
->fixers([])
6-
->finder(
7-
Symfony\CS\Finder\DefaultFinder::create()->in(__DIR__ . '/src')
8-
)
9-
;
3+
/*
4+
* In order to make it work, fabpot/php-cs-fixer and sllh/php-cs-fixer-styleci-bridge must be installed globally
5+
* with composer.
6+
*
7+
* @link https://github.com/Soullivaneuh/php-cs-fixer-styleci-bridge
8+
* @link https://github.com/FriendsOfPHP/PHP-CS-Fixer
9+
*/
10+
11+
use SLLH\StyleCIBridge\ConfigBridge;
12+
13+
return ConfigBridge::create();

‎.scrutinizer.yml

+5-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
filter:
2-
paths: [src/*]
2+
paths: [src/*]
33
checks:
4-
php:
5-
code_rating: true
6-
duplication: true
4+
php:
5+
code_rating: true
6+
duplication: true
77
tools:
8-
external_code_coverage: true
9-
php_code_sniffer:
10-
config:
11-
standard: "PSR2"
8+
external_code_coverage: true

‎.styleci.yml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
preset: symfony
2+
3+
finder:
4+
exclude:
5+
- "spec"
6+
path:
7+
- "src"
8+
9+
enabled:
10+
- short_array_syntax

‎.travis.yml

+22-22
Original file line numberDiff line numberDiff line change
@@ -3,39 +3,39 @@ language: php
33
sudo: false
44

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

99
php:
10-
- 5.4
11-
- 5.5
12-
- 5.6
13-
- 7.0
14-
- hhvm
10+
- 5.4
11+
- 5.5
12+
- 5.6
13+
- 7.0
14+
- hhvm
1515

1616
env:
17-
global:
18-
- TEST_COMMAND="composer test"
17+
global:
18+
- TEST_COMMAND="composer test"
19+
20+
branches:
21+
except:
22+
- /^analysis-.*$/
1923

2024
matrix:
21-
allow_failures:
22-
- php: hhvm
23-
fast_finish: true
24-
include:
25-
- php: 5.4
26-
env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci"
25+
fast_finish: true
26+
include:
27+
- php: 5.4
28+
env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci"
2729

2830
before_install:
29-
- travis_retry composer self-update
31+
- travis_retry composer self-update
3032

3133
install:
32-
- travis_retry composer update ${COMPOSER_FLAGS} --prefer-source --no-interaction
33-
34-
before_script: vendor/bin/http_test_server > /dev/null 2>&1 &
34+
- travis_retry composer update ${COMPOSER_FLAGS} --prefer-source --no-interaction
3535

3636
script:
37-
- $TEST_COMMAND
37+
- $TEST_COMMAND
3838

3939
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
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

‎CONTRIBUTING.md

+1-100
Original file line numberDiff line numberDiff line change
@@ -1,100 +1 @@
1-
# Contributing
2-
3-
If you're here, you would like to contribute to this repository and you're really welcome!
4-
5-
6-
## Bug reports
7-
8-
If you find a bug or a documentation issue, please report it or even better: fix it :). If you report it,
9-
please be as precise as possible. Here is a little list of required information:
10-
11-
- Precise description of the bug
12-
- Details of your environment (for example: OS, PHP version, installed extensions)
13-
- Backtrace which might help identifing the bug
14-
15-
16-
## Security issues
17-
18-
If you discover any security related issues,
19-
please contact us at the [security email address](../../#security) instead of submitting an issue on Github.
20-
This allows us to fix the issue and release a security hotfix without publicly disclosing the vulnerability.
21-
22-
23-
## Feature requests
24-
25-
If you think a feature is missing, please report it or even better: implement it :). If you report it, describe the more
26-
precisely what you would like to see implemented and we will discuss what is the best approach for it. If you can do
27-
some research before submitting it and link the resources to your description, you're awesome! It will allow us to more
28-
easily understood/implement it.
29-
30-
31-
## Sending a Pull Request
32-
33-
If you're here, you are going to fix a bug or implement a feature and you're the best!
34-
To do it, first fork the repository, clone it and create a new branch with the following commands:
35-
36-
``` bash
37-
$ git clone [email protected]:your-name/repo-name.git
38-
$ git checkout -b feature-or-bug-fix-description
39-
```
40-
41-
Then install the dependencies through [Composer](https://getcomposer.org/):
42-
43-
``` bash
44-
$ composer install
45-
```
46-
47-
Write code and tests. When you are ready, run the tests.
48-
(This is usually [PHPUnit](http://phpunit.de/) or [PHPSpec](http://phpspec.net/))
49-
50-
``` bash
51-
$ composer test
52-
```
53-
54-
When you are ready with the code, tested it and documented it, you can commit and push it with the following commands:
55-
56-
``` bash
57-
$ git commit -m "Feature or bug fix description"
58-
$ git push origin feature-or-bug-fix-description
59-
```
60-
61-
**Note:** Please write your commit messages in the imperative and follow the
62-
[guidelines](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html) for clear and concise messages.
63-
64-
Then [create a pull request](https://help.github.com/articles/creating-a-pull-request/) on GitHub.
65-
66-
Please make sure that each individual commit in your pull request is meaningful.
67-
If you had to make multiple intermediate commits while developing,
68-
please squash them before submitting with the following commands
69-
(here, we assume you would like to squash 3 commits in a single one):
70-
71-
``` bash
72-
$ git rebase -i HEAD~3
73-
```
74-
75-
If your branch conflicts with the master branch, you will need to rebase and repush it with the following commands:
76-
77-
``` bash
78-
$ git remote add upstream [email protected]:php-http/repo-name.git
79-
$ git pull --rebase upstream master
80-
$ git push -f origin feature-or-bug-fix-description
81-
```
82-
83-
84-
## Coding standard
85-
86-
This repository follows the [PSR-2 standard](http://www.php-fig.org/psr/psr-2/) and so, if you want to contribute,
87-
you must follow these rules.
88-
89-
90-
## Semver
91-
92-
We are trying to follow [semver](http://semver.org/). When you are making BC breaking changes,
93-
please let us know why you think it is important.
94-
In this case, your patch can only be included in the next major version.
95-
96-
97-
## Code of Conduct
98-
99-
This project is released with a [Contributor Code of Conduct](CONDUCT.md).
100-
By participating in this project you agree to abide by its terms.
1+
Please see http://docs.php-http.org/en/latest/development/contributing.html

‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2015 PHP HTTP Team <[email protected]>
1+
Copyright (c) 2015-2016 PHP HTTP Team <[email protected]>
22

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

0 commit comments

Comments
 (0)