Merge branch 'release/0.2.1'

Author: ezzatron

.php_cs

@@ -6,7 +6,9 @@ return Symfony\CS\Config\Config::create()
     ->fixers(
         array(
             '-concat_without_spaces',
-            '-new_with_braces',
+            '-double_arrow_multiline_whitespaces',
+            '-empty_return',
+            '-phpdoc_separation',
             'concat_with_spaces',
             'ordered_use',
         )

.travis.yml

@@ -9,9 +9,10 @@ php:
     - hhvm-nightly
 matrix:
     allow_failures:
+        - php: hhvm
         - php: hhvm-nightly
     fast_finish: true
 install:
     - composer selfupdate --no-interaction
     - composer install --no-interaction --no-progress --ignore-platform-reqs
-script: vendor/bin/phpunit
+script: "ls test/suite | xargs -I % sh -c 'echo; echo Testing % namespace...; echo; phpunit --stop-on-failure test/suite/%'"

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Phony changelog
 
+## 0.2.1 (2015-02-28)
+
+- **[FIXED]** Cardinality checks for `received()` now work as expected ([#54]).
+- **[FIXED]** Methods names are correctly treated as case-insensitive ([#58]).
+- **[FIXED]** Can mock an interface that extends `Traversable` ([#59]).
+- **[FIXED]** Calling of trait constructors ([#61]).
+
+[#54]: https://github.com/eloquent/phony/issues/54
+[#58]: https://github.com/eloquent/phony/issues/58
+[#59]: https://github.com/eloquent/phony/issues/59
+[#61]: https://github.com/eloquent/phony/issues/61
+
 ## 0.2.0 (2014-11-18)
 
 - **[BC BREAK]** Renamed IDs to labels.

CONTRIBUTING.md

@@ -8,25 +8,32 @@ 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
+
 ## Branching and pull requests
 
 As a guideline, please follow this process:
 
- 1. [Fork the repository].
- 2. Create a topic branch for the change:
-    - New features should branch from **develop**.
-    - Bug fixes to existing versions should branch from **master**.
-    - Please ensure the branch is clearly labelled as a feature or fix.
- 3. Make the relevant changes.
- 4. [Squash] commits if necessary.
- 4. Submit a pull request to the **develop** branch.
-
-Please note this is a general guideline only. For more information on the
-branching structure please see the [git-flow cheatsheet].
-
-<!-- References -->
+1. [Fork the repository].
+2. Create a topic branch for the change, branching from **develop**
+(`git checkout -b branch-name develop`).
+3. Make the relevant changes.
+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
-[git-flow cheatsheet]: http://danielkummer.github.com/git-flow-cheatsheet/
-[PSR-2]: https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md
 [Squash]: http://git-scm.com/book/en/Git-Tools-Rewriting-History#Changing-Multiple-Commit-Messages
+
+## Tests
+
+- Run the tests with `vendor/bin/phpunit path/to/tests`, or simply
+  `vendor/bin/phpunit` to run the entire suite.
+- Generate a coverage report with
+  `vendor/bin/phpunit -c phpunit.coverage.xml path/to/tests`, or simply
+  `vendor/bin/phpunit -c phpunit.coverage.xml` to generate coverage for the
+  entire suite. The coverage report will be created at
+  `artifacts/tests/coverage/index.html`.
+- Run the integration tests with `test/integration/run-all`. Each test suite has
+  one passing, and one failing test. This demonstrates *Phony*'s output.
+- Run the benchmarks with `vendor/bin/athletic -p test/benchmarks`. This
+  compares *Phony*'s performance with other mocking frameworks.

LICENSE

@@ -0,0 +1,19 @@
+Copyright © 2015 Erin Millard
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

README.md

@@ -2,7 +2,7 @@
 
 *Mocks, stubs, and spies for PHP.*
 
-[![The most recent stable version is 0.2.0][version-image]][Semantic versioning]
+[![The most recent stable version is 0.2.1][version-image]][Semantic versioning]
 [![Current build status image][build-image]][Current build status]
 [![Current coverage status image][coverage-image]][Current coverage status]
 
@@ -11,23 +11,19 @@
 [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.2.0-yellow.svg "This project uses semantic versioning"
+[version-image]: http://img.shields.io/:semver-0.2.1-yellow.svg "This project uses semantic versioning"
 
 ## Installation and documentation
 
 - Available as [Composer] package [eloquent/phony].
 
-<!--
-- [API documentation] available.
--->
-
-[API documentation]: http://lqnt.co/phony/artifacts/documentation/api/
 [Composer]: http://getcomposer.org/
 [eloquent/phony]: https://packagist.org/packages/eloquent/phony
 
 ## Here be dragons
 
-No documentation exists yet, but check out the [functional tests] for a few
-examples.
+Documentation is coming, you can see [progress on the feature/docs branch]. Also
+check out the [functional tests] for working examples.
 
 [functional tests]: test/suite/FunctionalTest.php
+[progress on the feature/docs branch]: https://github.com/eloquent/phony/blob/feature/docs/doc/index.md

composer.json

@@ -20,6 +20,7 @@
         "athletic/athletic": "~0.1",
         "counterpart/counterpart": "~1",
         "danielstjules/pho": "~1",
+        "eloquent/asplode": "~2",
         "eloquent/fixie": "~0.2.0@dev",
         "hamcrest/hamcrest-php": "~1",
         "icecave/isolator": "~3",
@@ -51,7 +52,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-develop": "0.1.x-dev"
+            "dev-develop": "0.3.x-dev"
         }
     }
 }