Merge branch 'release/0.4.0'

Author: ezzatron

.php_cs

@@ -5,11 +5,6 @@ $finder = Symfony\CS\Finder\DefaultFinder::create()
     ->exclude(
         array(
             'artifacts',
-            'assets',
-            'bower_components',
-            'build',
-            'node_modules',
-            'src-web',
             'vendor',
         )
     );

CHANGELOG.md

@@ -1,5 +1,21 @@
 # Phony changelog
 
+## 0.4.0 (2015-10-20)
+
+- **[IMPROVED]** Implemented new 'equal to' matcher ([#70] - thanks [@jmalloc]).
+- **[IMPROVED]** Improved rendering of assertion failure messages ([#71]).
+- **[IMPROVED]** String messages now allowed by `throws()` ([#76]).
+- **[FIXED]** Fixed magic method mocking bug ([#74]).
+- **[FIXED]** Fixed mocking of exceptions under HHVM ([#75]).
+- **[FIXED]** Attempting to stub a final method now throws an exception ([#77]).
+
+[#70]: https://github.com/eloquent/phony/issues/70
+[#71]: https://github.com/eloquent/phony/issues/71
+[#74]: https://github.com/eloquent/phony/issues/74
+[#75]: https://github.com/eloquent/phony/issues/75
+[#76]: https://github.com/eloquent/phony/issues/76
+[#77]: https://github.com/eloquent/phony/issues/77
+
 ## 0.3.0 (2015-07-22)
 
 - **[NEW]** PHP 7 support.
@@ -24,7 +40,6 @@
 [#66]: https://github.com/eloquent/phony/issues/66
 [#67]: https://github.com/eloquent/phony/issues/67
 [#69]: https://github.com/eloquent/phony/issues/69
-[@jmalloc]: https://github.com/jmalloc
 
 ## 0.2.1 (2015-02-28)
 
@@ -56,9 +71,9 @@
   ([#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
+[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
@@ -89,3 +104,5 @@
 ## 0.1.0 (2014-10-21)
 
 - **[NEW]** Initial implementation.
+
+[@jmalloc]: https://github.com/jmalloc

CONTRIBUTING.md

@@ -8,7 +8,7 @@ changes.
 
 All PHP code must adhere to the [PSR-2] standards.
 
-[PSR-2]: https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md
+[psr-2]: https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md
 
 ## Branching and pull requests
 
@@ -21,8 +21,8 @@ As a guideline, please follow this process:
 4. [Squash] commits if necessary (`git rebase -i develop`).
 5. Submit a pull request to the **develop** branch.
 
-[Fork the repository]: https://help.github.com/articles/fork-a-repo
-[Squash]: http://git-scm.com/book/en/Git-Tools-Rewriting-History#Changing-Multiple-Commit-Messages
+[fork the repository]: https://help.github.com/articles/fork-a-repo
+[squash]: http://git-scm.com/book/en/Git-Tools-Rewriting-History#Changing-Multiple-Commit-Messages
 
 ## Tests
 

README.md

@@ -2,22 +2,22 @@
 
 *Mocks, stubs, and spies for PHP.*
 
-[![The most recent stable version is 0.3.0][version-image]][Semantic versioning]
-[![Current build status image][build-image]][Current build status]
-[![Current coverage status image][coverage-image]][Current coverage status]
+[![The most recent stable version is 0.4.0][version-image]][semantic versioning]
+[![Current build status image][build-image]][current build status]
+[![Current coverage status image][coverage-image]][current coverage status]
 
-[build-image]: http://img.shields.io/travis/eloquent/phony/develop.svg "Current build status for the develop branch"
-[Current build status]: https://travis-ci.org/eloquent/phony
-[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.3.0-yellow.svg "This project uses semantic versioning"
+[build-image]: http://img.shields.io/travis/eloquent/phony/develop.svg?style=flat-square "Current build status for the develop branch"
+[current build status]: https://travis-ci.org/eloquent/phony
+[coverage-image]: https://img.shields.io/codecov/c/github/eloquent/phony/develop.svg?style=flat-square "Current test coverage for the develop branch"
+[current coverage status]: https://codecov.io/github/eloquent/phony
+[semantic versioning]: http://semver.org/
+[version-image]: http://img.shields.io/:semver-0.4.0-yellow.svg?style=flat-square "This project uses semantic versioning"
 
 ## Installation and documentation
 
 - Available as [Composer] package [eloquent/phony].
 
-[Composer]: http://getcomposer.org/
+[composer]: http://getcomposer.org/
 [eloquent/phony]: https://packagist.org/packages/eloquent/phony
 
 ## Here be dragons

composer.json

@@ -12,8 +12,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3",
-        "sebastian/comparator": "^1"
+        "php": ">=5.3"
     },
     "require-dev": {
         "athletic/athletic": "^0.1",
@@ -27,7 +26,8 @@
         "phake/phake": "^2",
         "phpspec/prophecy": "^1",
         "phpunit/phpunit": "^4",
-        "simpletest/simpletest": "^1"
+        "sebastian/comparator": "^1",
+        "simpletest/simpletest": "dev-master"
     },
     "autoload": {
         "psr-4": {
@@ -50,7 +50,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-develop": "0.4.x-dev"
+            "dev-develop": "0.5.x-dev"
         }
     }
 }