Update package files

Márk Sági-Kazár · Márk Sági-Kazár · commit c553ad7a24ee · 2016-01-13T18:52:52.000+01:00
diff --git a/.editorconfig b/.editorconfig
@@ -7,7 +7,3 @@ trim_trailing_whitespace = true
 insert_final_newline = true
 indent_style = space
 indent_size = 4
-
-[*.yml*]
-indent_style = space
-indent_size = 2
diff --git a/.gitattributes b/.gitattributes
@@ -1,8 +1,13 @@
+spec/            export-ignore
 tests/           export-ignore
 .editorconfig    export-ignore
 .gitattributes   export-ignore
 .gitignore       export-ignore
+.php_cs          export-ignore
 .scrutinizer.yml export-ignore
+.styleci.yml     export-ignore
 .travis.yml      export-ignore
-CONTRIBUTING.md  export-ignore
+CONTRIBUTING     export-ignore
+phpspec.yml.ci   export-ignore
+phpspec.yml.dist export-ignore
 phpunit.xml.dist export-ignore
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
+.puli/
 build/
 vendor/
 composer.lock
+phpspec.yml
 phpunit.xml
-/.puli
diff --git a/.php_cs b/.php_cs
@@ -0,0 +1,13 @@
+<?php
+
+/*
+ * In order to make it work, fabpot/php-cs-fixer and sllh/php-cs-fixer-styleci-bridge must be installed globally
+ * with composer.
+ *
+ * @link https://github.com/Soullivaneuh/php-cs-fixer-styleci-bridge
+ * @link https://github.com/FriendsOfPHP/PHP-CS-Fixer
+ */
+
+use SLLH\StyleCIBridge\ConfigBridge;
+
+return ConfigBridge::create();
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -1,11 +1,8 @@
 filter:
-  paths: [src/*]
+    paths: [src/*]
 checks:
-  php:
-    code_rating: true
-    duplication: true
+    php:
+        code_rating: true
+        duplication: true
 tools:
-  external_code_coverage: true
-  php_code_sniffer:
-    config:
-      standard: "PSR2"
+    external_code_coverage: true
diff --git a/.styleci.yml b/.styleci.yml
@@ -0,0 +1,10 @@
+preset: symfony
+
+finder:
+    exclude:
+        - "spec"
+    path:
+        - "src"
+
+enabled:
+    - short_array_syntax
diff --git a/.travis.yml b/.travis.yml
@@ -3,39 +3,42 @@ language: php
 sudo: false
 
 cache:
-  directories:
-    - $HOME/.composer/cache
+    directories:
+        - $HOME/.composer/cache
 
 php:
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - hhvm
+    - 5.4
+    - 5.5
+    - 5.6
+    - 7.0
+    - hhvm
 
 env:
-  global:
-    - TEST_COMMAND="composer test"
+    global:
+        - TEST_COMMAND="composer test"
+
+branches:
+    except:
+        - /^analysis-.*$/
 
 matrix:
-  allow_failures:
-    - php: hhvm
-  include:
-    - php: 5.4
-      env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci"
+    fast_finish: true
+    include:
+        - php: 5.4
+          env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci"
 
 before_install:
-  - travis_retry composer self-update
+    - travis_retry composer self-update
 
 install:
-  - travis_retry composer update ${COMPOSER_FLAGS} --prefer-source --no-interaction
+    - travis_retry composer update ${COMPOSER_FLAGS} --prefer-source --no-interaction
 
 before_script:
-  - vendor/bin/http_test_server > /dev/null 2>&1 &
+    - vendor/bin/http_test_server > /dev/null 2>&1 &
 
 script:
-  - $TEST_COMMAND
+    - $TEST_COMMAND
 
 after_script:
-  - if [[ "$COVERAGE" = true ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi
-  - if [[ "$COVERAGE" = true ]]; then php ocular.phar code-coverage:upload --format=php-clover build/coverage.xml; fi
+    - if [[ "$COVERAGE" = true ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi
+    - if [[ "$COVERAGE" = true ]]; then php ocular.phar code-coverage:upload --format=php-clover build/coverage.xml; fi
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,14 @@
 # Change Log
 
 
+## UNRELEASED
+
+### Changed
+
+- Updated package files
+- Updated to latest HTTPlug
+
+
 ## 0.1.0 - 2015-06-12
 
 ### Added
diff --git a/CONTRIBUTING b/CONTRIBUTING
@@ -0,0 +1 @@
+Please see http://docs.php-http.org/en/latest/development/contributing.html
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,5 @@
 Copyright (c) 2014-2015 Eric GELOEN <geloen.eric@gmail.com>
+Copyright (c) 2015-2016 PHP HTTP Team <team@php-http.org>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
@@ -27,18 +27,19 @@ Please see the [official documentation](http://php-http.readthedocs.org/en/lates
 ## Testing
 
 ``` bash
-$ phpunit
+$ composer test
 ```
 
 
 ## Contributing
 
-Please see [CONTRIBUTING](CONTRIBUTING.md) for details.
+Please see our [contributing guide](http://docs.php-http.org/en/latest/development/contributing.html).
 
 
 ## Security
 
-If you discover any security related issues, please contact us at [security@php-http.org](mailto:security@php-http.org).
+If you discover any security related issues, please contact us at [security@httplug.io](mailto:security@httplug.io)
+or [security@php-http.org](mailto:security@php-http.org).
 
 
 ## License
diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
     "description": "Guzzle 5 HTTP Adapter",
     "license": "MIT",
     "keywords": ["guzzle", "http"],
-    "homepage": "http://php-http.org",
+    "homepage": "http://httplug.io",
     "authors": [
         {
             "name": "Eric GELOEN",
@@ -16,14 +16,14 @@
     ],
     "require": {
         "php": ">=5.4",
-        "php-http/httplug": "1.0.0-beta",
-        "php-http/discovery": "~0.5",
+        "php-http/httplug": "^1.0",
+        "php-http/discovery": "~0.6.4",
         "guzzlehttp/guzzle": "^5.1"
     },
     "require-dev": {
         "ext-curl": "*",
         "guzzlehttp/ringphp": "^1.1",
-        "php-http/adapter-integration-tests": "dev-master",
+        "php-http/adapter-integration-tests": "^0.2",
         "php-http/client-common": "^0.1.1",
         "guzzlehttp/psr7": "^1.2"
     },

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