Update package, license, dependencies

Márk Sági-Kazár · Márk Sági-Kazár · commit 5a1c05bb6538 · 2016-01-13T11:54:24.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,4 +1,4 @@
 .editorconfig    export-ignore
 .gitattributes   export-ignore
 .gitignore       export-ignore
-CONTRIBUTING.md  export-ignore
+CONTRIBUTING     export-ignore
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
+.puli/
 build/
 vendor/
 composer.lock
+puli.json
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,14 @@
 # Change Log
 
 
+## 0.2.0 - 2016-01-13
+
+### Changed
+
+- Updated to latest HTTPlug version
+- Updated package files
+
+
 ## 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
@@ -32,16 +32,9 @@ $ vendor/bin/http_test_server
 Run tests.
 
 
-## Testing
-
-``` bash
-$ phpunit
-```
-
-
 ## Contributing
 
-Please see [CONTRIBUTING](CONTRIBUTING.md) for details.
+Please see our [contributing guide](http://docs.php-http.org/en/latest/development/contributing.html).
 
 
 ## Security
diff --git a/composer.json b/composer.json
@@ -8,6 +8,10 @@
         {
             "name": "Eric GELOEN",
             "email": "geloen.eric@gmail.com"
+        },
+        {
+            "name": "Márk Sági-Kazár",
+            "email": "mark.sagikazar@gmail.com"
         }
     ],
     "require": {
@@ -31,9 +35,9 @@
     ],
     "extra": {
         "branch-alias": {
-            "dev-master": "0.2-dev"
+            "dev-master": "0.3-dev"
         }
     },
     "prefer-stable": true,
-    "minimum-stability": "RC"
+    "minimum-stability": "dev"
 }

-Original file line number
+Diff line change
@@ @@ -1,3 +1,5 @@ @@
 +.puli/
 build/
 vendor/
 composer.lock
 +puli.json
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`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`Copyright (c) 2014-2015 Eric GELOEN <[email protected]>`
	`2`	`+Copyright (c) 2015-2016 PHP HTTP Team <[email protected]>`
`2`	`3`
`3`	`4`	`Permission is hereby granted, free of charge, to any person obtaining a copy`
`4`	`5`	`of this software and associated documentation files (the "Software"), to deal`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,10 @@`
`8`	`8`	`{`
`9`	`9`	`"name": "Eric GELOEN",`
`10`	`10`	`"email": "[email protected]"`
	`11`	`+ },`
	`12`	`+ {`
	`13`	`+ "name": "Márk Sági-Kazár",`
	`14`	`+ "email": "[email protected]"`
`11`	`15`	`}`
`12`	`16`	`],`
`13`	`17`	`"require": {`
`@@ -31,9 +35,9 @@`
`31`	`35`	`],`
`32`	`36`	`"extra": {`
`33`	`37`	`"branch-alias": {`
`34`		`- "dev-master": "0.2-dev"`
	`38`	`+ "dev-master": "0.3-dev"`
`35`	`39`	`}`
`36`	`40`	`},`
`37`	`41`	`"prefer-stable": true,`
`38`		`- "minimum-stability": "RC"`
	`42`	`+ "minimum-stability": "dev"`
`39`	`43`	`}`