Merge pull request #14 from php-http/sync_boilerplate

Sync package with boilerplate, fixes #12

Author: sagikazarmark

.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,5 +1,12 @@
-.editorconfig   export-ignore
-.gitattributes  export-ignore
-.gitignore      export-ignore
-CONTRIBUTING.md export-ignore
-CONDUCT.md      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
+CONDUCT.md       export-ignore
+CONTRIBUTING.md  export-ignore
+phpspec.yml.ci   export-ignore
+phpspec.yml.dist export-ignore
+phpunit.xml.dist export-ignore

.gitignore

@@ -1,3 +1,5 @@
 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();

.styleci.yml

@@ -0,0 +1,4 @@
+preset: psr2
+finder:
+    path:
+        - "src"

CONTRIBUTING.md

@@ -75,7 +75,7 @@ $ git rebase -i HEAD~3
 If your branch conflicts with the master branch, you will need to rebase and repush it with the following commands:
 
 ``` bash
-$ git remote add upstream [email protected]:php-http/repo-name.git
+$ git remote add upstream [email protected]:orga/repo-name.git
 $ git pull --rebase upstream master
 $ git push -f origin feature-or-bug-fix-description
 ```