Merge branch 'master' of github.com:elicoten/AspectMock

Author: elicoten

.travis.yml

@@ -1,8 +1,9 @@
 language: php
 
 php:
-  - 5.4
   - 5.5
+  - 5.6
+  - 7.0
 
 before_script:
   - stty cols 160

CHANGELOG.md

@@ -1,35 +1,51 @@
 # Changelog
 
-#### 0.5.2
+#### 0.5.5
+
+* compatible with Symfony3 and PHP7
+
+#### 0.5.4
+
+* Improved namespace handling
+* Added ability to display actually passed parameter in the error message
+* Fixed counting of dynamic class methods (#24)
+* Fixes for functions that have a brace as default on parametersi
+* Replace return with yield when docComments returns Generator
+
+
+#### 0.5.3
+
+* Updated to goaop/framework 0.6.x and codeception 2.1
 
-* updated to goaop/framework 0.6.x and codeception 2.1
 
 #### 0.5.1
 
-* Fixed strict errors for func verifier *2014-10-16*
+* Fixed strict errors for func verifier
 
 
 #### 0.5.0
 
-* test::ns() method removed *2014-10-10*
-* Mocking functions implemented with test::func method *2014-10-10*
-* Fixed mocking functions with arguments passed by reference #34 by @tampe125 *2014-10-09*
-* Fixed passing arguments by reference in InstanceProxy. Thanks to @tampe125. Issue #39 *2014-10-08*
-* Debug mode can be disabled in options with debug => false *2014-10-08*
+* `test::ns` method removed
+* Mocking functions implemented with `test::func` method
+* Fixed mocking functions with arguments passed by reference (#34)
+* Fixed passing arguments by reference in InstanceProxy
+* Debug mode can be disabled in options with `debug => false`
 * Updated to Go\Aop 0.5.0
 
+
 #### 0.5.0-beta 05/14/2014
 
-* moved to Go\Aop 0.5.x-dev
+* Moved to Go\Aop 0.5.x-dev
 
 
 #### 0.4.2 05/09/2014
 
-* depdendency on AspectMock ~0.4.0
+* Depdendency on AspectMock ~0.4.0
+
 
 #### 0.4.1
 
 * RoboFile
-* Verify invocation arguments with closures @gchaincl
-* Verify invocation arguments with closures by @gchaincl
-* better support for traits by @andyfowler
+* Verify invocation arguments with closures
+* Verify invocation arguments with closures
+* Vetter support for traits

README.md

@@ -2,20 +2,19 @@ AspectMock
 ==========
 
 AspectMock is not an ordinary PHP mocking framework.
-With the power of Aspect Oriented programming and the awesome [Go-AOP](https://github.com/lisachenko/go-aop-php) library,
+With the power of Aspect Oriented programming and the awesome [Go-AOP](https://github.com/goaop/framework) library,
 AspectMock allows you to stub and mock practically anything in your PHP code!
 
 **Documentation** | [Test Doubles Builder](https://github.com/Codeception/AspectMock/blob/master/docs/Test.md) | [ClassProxy](https://github.com/Codeception/AspectMock/blob/master/docs/ClassProxy.md) | [InstanceProxy](https://github.com/Codeception/AspectMock/blob/master/docs/InstanceProxy.md) | [FuncProxy](https://github.com/Codeception/AspectMock/blob/master/docs/FuncProxy.md)
 
-**Stability**: alpha
-
 [![Build Status](https://travis-ci.org/Codeception/AspectMock.png?branch=master)](https://travis-ci.org/Codeception/AspectMock)
 [![Latest Stable Version](https://poser.pugx.org/codeception/aspect-mock/v/stable.png)](https://packagist.org/packages/codeception/aspect-mock)
-[![Latest Unstable Version](https://poser.pugx.org/codeception/aspect-mock/v/unstable.png)](https://packagist.org/packages/codeception/aspect-mock)
+[![PHP 7 ready](http://php7ready.timesplinter.ch/Codegyre/Robo/badge.svg)](https://travis-ci.org/Codegyre/Robo)
+
 
 ## Motivation
 
-PHP as a language that was not designed to be testable. Really. 
+PHP is a language that was not designed to be testable. Really. 
 How would you fake the `time()` function to produce the same result for each test call?
 Is there any way to stub a static method of a class? Can you redefine a class method at runtime?
 Dynamic languages like Ruby or JavaScript allow us to do this. 

RoboFile.php

@@ -87,4 +87,4 @@ public function test()
             exit;
         }
     }
-}
+}

VERSION

@@ -1 +1 @@
-0.5.3
+0.5.5

composer.json

@@ -15,7 +15,7 @@
     "require": {
         "php": ">=5.4.0",
         "goaop/framework": "0.6.*",
-        "symfony/finder": "~2.4"
+        "symfony/finder": "~2.4|~3.0"
     },
     "require-dev": {
         "codeception/base": "~2.1",