Merge branch 'release/0.2.0'

Author: ezzatron

.gitattributes

@@ -1,4 +1,4 @@
-.gitattributes export-ignore
-.gitignore export-ignore
-.travis.* export-ignore
-test export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/.travis.* export-ignore
+/test/ export-ignore

.php_cs

@@ -0,0 +1,14 @@
+<?php
+
+$finder = Symfony\CS\Finder\DefaultFinder::create()->in(__DIR__);
+
+return Symfony\CS\Config\Config::create()
+    ->fixers(
+        array(
+            '-concat_without_spaces',
+            '-new_with_braces',
+            'concat_with_spaces',
+            'ordered_use',
+        )
+    )
+    ->finder($finder);

CHANGELOG.md

@@ -1,5 +1,53 @@
 # Phony changelog
 
+## 0.2.0 (2014-11-18)
+
+- **[BC BREAK]** Renamed IDs to labels.
+- **[NEW]** Verify no interaction ([#27]).
+- **[NEW]** Manual constructor calling ([#36], [#46]).
+- **[NEW]** Setters for labels ([#35]).
+- **[NEW]** [Peridot] integration ([#50]).
+- **[NEW]** [Pho] integration ([#51]).
+- **[NEW]** [SimpleTest] integration ([#20]).
+- **[FIXED]** Trait mocking is now working ([#42], [#49]).
+- **[FIXED]** Stubbing interface bugs ([#53]).
+- **[IMPROVED]** Better assertion messages ([#41]).
+- **[IMPROVED]** Generator spies under HHVM ([#29]).
+- **[IMPROVED]** Better mock definition equality checking ([#47]).
+- **[IMPROVED]** Throw an exception when passing the wrong types to `inOrder()`
+  ([#52]).
+- **[IMPROVED]** Magic 'self' parameter detection ([#48]).
+
+[Peridot]: https://github.com/peridot-php/peridot
+[Pho]: https://github.com/danielstjules/pho
+[SimpleTest]: https://github.com/lox/simpletest
+[#20]: https://github.com/eloquent/phony/issues/20
+[#27]: https://github.com/eloquent/phony/issues/27
+[#29]: https://github.com/eloquent/phony/issues/29
+[#35]: https://github.com/eloquent/phony/issues/35
+[#36]: https://github.com/eloquent/phony/issues/36
+[#41]: https://github.com/eloquent/phony/issues/41
+[#42]: https://github.com/eloquent/phony/issues/42
+[#46]: https://github.com/eloquent/phony/issues/46
+[#47]: https://github.com/eloquent/phony/issues/47
+[#48]: https://github.com/eloquent/phony/issues/48
+[#49]: https://github.com/eloquent/phony/issues/49
+[#50]: https://github.com/eloquent/phony/issues/50
+[#51]: https://github.com/eloquent/phony/issues/51
+[#52]: https://github.com/eloquent/phony/issues/52
+[#53]: https://github.com/eloquent/phony/issues/53
+
+## 0.1.1 (2014-10-26)
+
+- **[IMPROVED]** Performance improvements when repeatedly mocking the same
+  types ([#44]).
+- **[IMPROVED]** Performance improvements when mocking large classes ([#44]).
+- **[IMPROVED]** Improved exception message when mocking an undefined type
+  ([#40]).
+
+[#40]: https://github.com/eloquent/phony/issues/40
+[#44]: https://github.com/eloquent/phony/issues/44
+
 ## 0.1.0 (2014-10-21)
 
 - **[NEW]** Initial implementation.

README.md

@@ -2,7 +2,7 @@
 
 *Mocks, stubs, and spies for PHP.*
 
-[![The most recent stable version is 0.1.0][version-image]][Semantic versioning]
+[![The most recent stable version is 0.2.0][version-image]][Semantic versioning]
 [![Current build status image][build-image]][Current build status]
 [![Current coverage status image][coverage-image]][Current coverage status]
 
@@ -11,7 +11,7 @@
 [coverage-image]: http://img.shields.io/coveralls/eloquent/phony/develop.svg "Current test coverage for the develop branch"
 [Current coverage status]: https://coveralls.io/r/eloquent/phony
 [Semantic versioning]: http://semver.org/
-[version-image]: http://img.shields.io/:semver-0.1.0-yellow.svg "This project uses semantic versioning"
+[version-image]: http://img.shields.io/:semver-0.2.0-yellow.svg "This project uses semantic versioning"
 
 ## Installation and documentation
 

composer.json

@@ -17,9 +17,14 @@
         "sebastian/exporter": "~1"
     },
     "require-dev": {
+        "athletic/athletic": "~0.1",
         "counterpart/counterpart": "~1",
+        "danielstjules/pho": "~1",
+        "eloquent/fixie": "~0.2.0@dev",
         "hamcrest/hamcrest-php": "~1",
+        "icecave/isolator": "~3",
         "mockery/mockery": "~0",
+        "peridot-php/peridot": "~1",
         "phake/phake": "~1",
         "phpspec/prophecy": "~1",
         "phpunit/phpunit": "~4",
@@ -31,7 +36,22 @@
         },
         "files": [
             "src/functions.php",
-            "src/Phpunit/functions.php"
+            "src/Pho/functions.php",
+            "src/Phpunit/functions.php",
+            "src/Simpletest/functions.php"
         ]
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Eloquent\\Phony\\": ["test/src", "test/benchmarks"]
+        },
+        "files": [
+            "test/src/TestClassOldConstructor.php"
+        ]
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-develop": "0.1.x-dev"
+        }
     }
 }