Skip to content

Commit b6ae251

Browse files
author
Márk Sági-Kazár
committed
Update package files
1 parent 65754c1 commit b6ae251

13 files changed

+79
-150
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-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +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
10+
CONTRIBUTING export-ignore
11+
phpspec.yml.ci export-ignore
12+
phpspec.yml.dist export-ignore
13+
phpunit.xml.dist export-ignore

.gitignore

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

.php_cs

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

+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

+27-22
Original file line numberDiff line numberDiff line change
@@ -3,40 +3,45 @@ 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+
allow_failures:
26+
- php: hhvm
27+
fast_finish: true
28+
include:
29+
- php: 5.4
30+
env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci"
2731

2832
before_install:
29-
- travis_retry composer self-update
33+
- travis_retry composer self-update
3034

3135
install:
32-
- travis_retry composer update ${COMPOSER_FLAGS} --prefer-source --no-interaction
36+
- travis_retry composer update ${COMPOSER_FLAGS} --prefer-source --no-interaction
3337

34-
before_script: vendor/bin/http_test_server > /dev/null 2>&1 &
38+
before_script:
39+
- vendor/bin/http_test_server > /dev/null 2>&1 &
3540

3641
script:
37-
- $TEST_COMMAND
38-
- ./vendor/bin/phpunit tests/SocketClientFeatureTest.php --printer Http\\Client\\Tests\\FeatureTestListener || echo ""
42+
- $TEST_COMMAND
43+
- ./vendor/bin/phpunit tests/SocketClientFeatureTest.php --printer Http\\Client\\Tests\\FeatureTestListener || echo ""
3944

4045
after_success:
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
46+
- if [[ "$COVERAGE" = true ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi
47+
- if [[ "$COVERAGE" = true ]]; then php ocular.phar code-coverage:upload --format=php-clover build/coverage.xml; fi

CONDUCT.md

-22
This file was deleted.

CONTRIBUTING

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Please see http://docs.php-http.org/en/latest/development/contributing.html

CONTRIBUTING.md

-84
This file was deleted.

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

README.md

+11-8
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ $ composer require php-http/socket-client
2424
* TLS / SSL Encyrption
2525
* Client Certificate (only for php > 5.6)
2626

27+
2728
## Usage
2829

2930
The SocketHttpClient class need a [message factory](https://github.com/php-http/message-factory) in order to work:
@@ -35,27 +36,28 @@ $client = new new Http\Socket\SocketHttpClient($messageFactory, $options);
3536

3637
The `$options` array allow to configure the socket client.
3738

39+
3840
## Options
3941

4042
Here is the list of available options:
4143

4244
* remote_socket: Specify the remote socket where the library should send the request to
43-
45+
4446
Can be a tcp remote : tcp://hostname:port
45-
47+
4648
Can be a unix remote : unix://hostname:port
47-
49+
4850
Do not use a tls / ssl scheme, this is handle by the ssl option.
49-
51+
5052
If not set, the client will try to determine it from the request uri or host header.
51-
53+
5254
* timeout : Timeout in __milliseconds__ for writing request and reading response on the remote
5355
* ssl : Activate or deactivate the ssl / tls encryption
5456
* stream_context_options : Custom options for the context of the stream, same as [PHP stream context options](http://php.net/manual/en/context.php)
55-
57+
5658
As an example someone may want to pass a client certificate when using the ssl, a valid configuration for this
5759
use case would be:
58-
60+
5961
```php
6062
$options = [
6163
'stream_context_options' => [
@@ -71,6 +73,7 @@ Here is the list of available options:
7173
* write_buffer_size : When sending the request we need to bufferize the body, this option specify the size of this buffer, default is 8192,
7274
if you are sending big file with your client it may be interesting to have a bigger value in order to increase performance.
7375

76+
7477
## Testing
7578

7679
First launch the http server:
@@ -88,7 +91,7 @@ $ composer test
8891

8992
## Contributing
9093

91-
Please see [CONTRIBUTING](CONTRIBUTING.md) and [CONDUCT](CONDUCT.md) for details.
94+
Please see our [contributing guide](http://docs.php-http.org/en/latest/development/contributing.html).
9295

9396

9497
## Security
File renamed without changes.

0 commit comments

Comments
 (0)