Merge branch 'master' into feature/promise

mekras · mekras · commit 799f3bfbbae8 · 2015-12-14T15:59:11.000+03:00
diff --git a/.gitattributes b/.gitattributes
@@ -1,11 +1,13 @@
-tests/           export-ignore
-*.http           eol=crlf
+# Common (from boilerplate)
 .editorconfig    export-ignore
 .gitattributes   export-ignore
 .gitignore       export-ignore
 .scrutinizer.yml export-ignore
 .travis.yml      export-ignore
 CONDUCT.md       export-ignore
 CONTRIBUTING.md  export-ignore
+
+# Project specific
+*.http           eol=crlf
 phpunit.xml.dist export-ignore
-VERSION          export-ignore
+tests/           export-ignore
diff --git a/.php_cs b/.php_cs
@@ -0,0 +1,9 @@
+<?php
+
+return Symfony\CS\Config\Config::create()
+    ->level(Symfony\CS\FixerInterface::PSR2_LEVEL)
+    ->fixers([])
+    ->finder(
+        Symfony\CS\Finder\DefaultFinder::create()->in(__DIR__ . '/src')
+    )
+;
diff --git a/.styleci.yml b/.styleci.yml
@@ -0,0 +1,4 @@
+preset: psr2
+finder:
+    path:
+        - "src"
diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
     },
     "require-dev": {
         "guzzlehttp/psr7": "^1.0",
-        "php-http/adapter-integration-tests": "dev-master",
+        "php-http/adapter-integration-tests": "dev-master#7c681907547e24b26f352bc48444527c28bfc524",
         "php-http/discovery": "^0.3",
         "phpunit/phpunit": "^4.8@stable",
         "zendframework/zend-diactoros": "^1.0"

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +preset: psr2
 +finder:
 +    path:
 +        - "src"