Skip to content

Commit 385a496

Browse files
sagikazarmarksagikazarmark
committed
Update package
1 parent d4adb8f commit 385a496

12 files changed

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

‎.gitattributes

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
spec/ export-ignore
2+
tests/ export-ignore
23
.editorconfig export-ignore
34
.gitattributes export-ignore
45
.gitignore export-ignore
6+
.php_cs export-ignore
57
.scrutinizer.yml export-ignore
8+
.styleci.yml export-ignore
69
.travis.yml export-ignore
7-
CONTRIBUTING.md export-ignore
810
CONDUCT.md export-ignore
11+
CONTRIBUTING.md export-ignore
912
phpspec.yml.ci export-ignore
1013
phpspec.yml.dist export-ignore
14+
phpunit.xml.dist export-ignore

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ build/
22
vendor/
33
composer.lock
44
phpspec.yml
5+
phpunit.xml

‎.php_cs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?php
2+
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

Lines changed: 5 additions & 8 deletions
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

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

‎.travis.yml

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,37 +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: 7.0
23-
fast_finish: true
24-
include:
25-
- php: 5.5
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
34+
- travis_retry composer update ${COMPOSER_FLAGS} --prefer-source --no-interaction
3335

3436
script:
35-
- $TEST_COMMAND
37+
- $TEST_COMMAND
3638

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ $ git rebase -i HEAD~3
7575
If your branch conflicts with the master branch, you will need to rebase and repush it with the following commands:
7676

7777
``` bash
78-
$ git remote add upstream [email protected]:php-http/repo-name.git
78+
$ git remote add upstream [email protected]:orga/repo-name.git
7979
$ git pull --rebase upstream master
8080
$ git push -f origin feature-or-bug-fix-description
8181
```

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
[![Quality Score](https://img.shields.io/scrutinizer/g/php-http/discovery.svg?style=flat-square)](https://scrutinizer-ci.com/g/php-http/discovery)
88
[![Total Downloads](https://img.shields.io/packagist/dt/php-http/discovery.svg?style=flat-square)](https://packagist.org/packages/php-http/discovery)
99

10-
**Finds installed Httplug implementations and message factories.**
10+
**Finds installed HTTPlug implementations and PSR-7 message factories.**
1111

1212

1313
## Install

‎composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"name": "php-http/discovery",
3-
"description": "Finds installed clients and message factories",
3+
"description": "Finds installed HTTPlug implementations and PSR-7 message factories",
44
"license": "MIT",
55
"keywords": ["http", "discovery", "client", "adapter", "message", "factory"],
6-
"homepage": "http://php-http.org",
6+
"homepage": "http://httplug.io",
77
"authors": [
88
{
99
"name": "Eric GELOEN",

‎phpspec.yml.ci

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
suites:
2-
discovery_suite:
3-
namespace: Http\Discovery
4-
psr4_prefix: Http\Discovery
2+
discovery_suite:
3+
namespace: Http\Discovery
4+
psr4_prefix: Http\Discovery
55
bootstrap: spec/bootstrap.php
66
formatter.name: pretty
77
extensions:
8-
- PhpSpec\Extension\CodeCoverageExtension
8+
- PhpSpec\Extension\CodeCoverageExtension
99
code_coverage:
10-
format: clover
11-
output: build/coverage.xml
10+
format: clover
11+
output: build/coverage.xml

‎phpspec.yml.dist

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
suites:
2-
discovery_suite:
3-
namespace: Http\Discovery
4-
psr4_prefix: Http\Discovery
2+
discovery_suite:
3+
namespace: Http\Discovery
4+
psr4_prefix: Http\Discovery
55
bootstrap: spec/bootstrap.php
66
formatter.name: pretty

0 commit comments

Comments
 (0)