Merge pull request #10 from php-http/package_updates

Update package files

Author: joelwurtz

.editorconfig

@@ -7,6 +7,3 @@ indent_size = 4
 indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
-
-[*.yml*]
-indent_size = 2

.gitattributes

@@ -1,6 +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

.gitignore

@@ -1,4 +1,6 @@
-.puli
+.puli/
 build/
 vendor/
 composer.lock
+phpspec.yml
+phpunit.xml

.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();

.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

.styleci.yml

@@ -0,0 +1,10 @@
+preset: symfony
+
+finder:
+    exclude:
+        - "spec"
+    path:
+        - "src"
+
+enabled:
+    - short_array_syntax

.travis.yml

@@ -3,40 +3,45 @@ 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
-  fast_finish: true
-  include:
-    - php: 5.4
-      env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci"
+    allow_failures:
+        - php: hhvm
+    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 &
+before_script:
+    - vendor/bin/http_test_server > /dev/null 2>&1 &
 
 script:
-  - $TEST_COMMAND
-  - ./vendor/bin/phpunit tests/SocketClientFeatureTest.php --printer Http\\Client\\Tests\\FeatureTestListener || echo ""
+    - $TEST_COMMAND
+    - ./vendor/bin/phpunit tests/SocketClientFeatureTest.php --printer Http\\Client\\Tests\\FeatureTestListener || echo ""
 
 after_success:
-  - 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

CONDUCT.md

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