merged with master, removed PHPUnit 5.x support

Author: DavertMik

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013 Codeception PHP Testing Framework
+Copyright (c) 2013-2015 Codeception PHP Testing Framework
 
 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

README.md

@@ -1,16 +1,14 @@
 Verify
 ======
 
-BDD Assertions for PHPUnit and Codeception
+BDD Assertions for [PHPUnit][1] and [Codeception][2]
 
 This is very tiny wrapper for PHPUnit assertions, that are aimed to make tests a bit more readable.
-With BDD assertions influenced by Chai, Jasmine, and RSpec your assertions would be a bit closer to natural language.
+With [BDD][3] assertions influenced by [Chai][4], [Jasmine][5], and [RSpec][6] your assertions would be a bit closer to natural language.
 
 [![Build Status](https://travis-ci.org/Codeception/Verify.png?branch=master)](https://travis-ci.org/Codeception/Verify) [![Latest Stable Version](https://poser.pugx.org/codeception/verify/v/stable.png)](https://packagist.org/packages/codeception/verify)
 
-
-``` php
-<?php
+```php
 $user = User::find(1);
 
 // equal
@@ -33,7 +31,7 @@ verify($rate)->lessOrEquals(8);
 verify($rate)->greaterOrEquals(7);
 verify($rate)->greaterOrEquals(5);
 
-// true/false/null
+// true / false / null
 verify($user->isAdmin())->true();
 verify($user->isBanned())->false();
 verify($user->invitedBy)->null();
@@ -42,42 +40,52 @@ verify($user->getPosts())->notNull();
 // empty
 verify($user->getComments())->isEmpty();
 verify($user->getRoles())->notEmpty();
-?>
 ```
 
 Shorthands for testing truth/fallacy:
 
-``` php
-<?php
+```php
 verify_that($user->isActivated());
 verify_not($user->isBanned());
-?>
 ```
 
-This 2 functions doesn't check for strict true/false matching, rather `empty` function is used.
+These two functions don't check for strict true/false matching, rather `empty` function is used.
 `verify_that` checks that result is not empty value, `verify_not` does the opposite.
 
 ## Alternative Syntax
 
-If you follow TDD/BDD you'd rather use `expect` instead of `verify`. Which is just an alias functions:
+If you follow TDD/BDD you'd rather use `expect` instead of `verify`. Which are just an alias functions:
 
-``` php
+```php
 expect("user have 5 posts", $user->getNumPosts())->equals(5);
 expect_that($user->isActive());
 expect_not($user->isBanned());
 ```
 
-
 ## Installation
 
-With Composer:
+### Installing via Composer
+
+Install composer in a common location or in your project:
 
+```sh
+curl -s http://getcomposer.org/installer | php
 ```
+
+Create the `composer.json` file as follows:
+
+```json
 "require-dev": {
     "codeception/verify": "^1.0"
 }
 ```
 
+Run the composer installer:
+
+```sh
+php composer.phar install
+```
+
 ## Usage
 
 Use in any test `verify` function instead of `$this->assert*` methods.
@@ -106,5 +114,14 @@ Set the class name to `Codeception\Verify::override` property to `verify` functi
 verify('it works')->success();
 ```
 
+## License
+
+Verify is open-sourced software licensed under the [MIT][7] License. © Codeception PHP Testing Framework
 
-**License: MIT**
+[1]: https://phpunit.de/
+[2]: http://codeception.com/
+[3]: https://en.wikipedia.org/wiki/Behavior-driven_development
+[4]: http://chaijs.com/
+[5]: http://jasmine.github.io/
+[6]: http://rspec.info/
+[7]: https://github.com/Codeception/Verify/blob/master/LICENSE

composer.json

@@ -1,6 +1,7 @@
 {
     "name": "codeception/verify",
     "description": "BDD assertion library for PHPUnit",
+    "license": "MIT",
     "authors": [
         {
             "name": "Michael Bodnarchuk",

src/Codeception/Verify.php

@@ -33,19 +33,19 @@ public function setIsFileExpectation($isFileExpectation)
         $this->isFileExpectation = $isFileExpectation;
     }
 
-    public function equals($expected)
+    public function equals($expected, $delta = 0)
     {
         if ( ! $this->isFileExpectation ) {
-            a::assertEquals($expected, $this->actual, $this->description);
+            a::assertEquals($expected, $this->actual, $this->description, $delta);
         } else {
             a::assertFileEquals($expected, $this->actual, $this->description);
         }
     }
 
-    public function notEquals($expected)
+    public function notEquals($expected, $delta = 0)
     {
         if ( ! $this->isFileExpectation ) {
-            a::assertNotEquals($expected, $this->actual, $this->description);
+            a::assertNotEquals($expected, $this->actual, $this->description, $delta);
         } else {
             a::assertFileNotEquals($expected, $this->actual, $this->description);
         }
@@ -143,7 +143,7 @@ public function notInternalType($type)
 
     public function hasAttribute($attribute)
     {
-        if (is_string($attribute)) {
+        if (is_string($this->actual)) {
             a::assertClassHasAttribute($attribute, $this->actual, $this->description);
         } else {
             a::assertObjectHasAttribute($attribute, $this->actual, $this->description);
@@ -152,7 +152,7 @@ public function hasAttribute($attribute)
 
     public function notHasAttribute($attribute)
     {
-        if (is_string($attribute)) {
+        if (is_string($this->actual)) {
             a::assertClassNotHasAttribute($attribute, $this->actual, $this->description);
         } else {
             a::assertObjectNotHasAttribute($attribute, $this->actual, $this->description);

src/Codeception/function.php

@@ -1,4 +1,8 @@
 <?php
+if (!class_exists('PHPUnit_Framework_Assert') && class_exists('PHPUnit\Framework\Assert')) {
+    class_alias('PHPUnit\Framework\Assert', 'PHPUnit_Framework_Assert');
+}
+
 if (!function_exists('verify')) {
     /**
      * @param $description

tests/VerifyTest.php

@@ -11,13 +11,22 @@ protected function setUp()
         $this->xml = new DomDocument;
         $this->xml->loadXML('<foo><bar>Baz</bar><bar>Baz</bar></foo>');
     }
+    
     public function testEquals()
     {
         verify(5)->equals(5);
         verify("hello")->equals("hello");
         verify("user have 5 posts", 5)->equals(5);
-        verify(3)->notEquals(5);
+        verify(3.251)->equals(3.25, 0.01);
+        verify("respects delta", 3.251)->equals(3.25, 0.01);
         verify_file(__FILE__)->equals(__FILE__);
+    }
+
+    public function testNotEquals()
+    {
+        verify(3)->notEquals(5);
+        verify(3.252)->notEquals(3.25, 0.001);
+        verify("respects delta", 3.252, 0.001);
         verify_file(__FILE__)->notEquals(__DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'composer.json');
     }
 
@@ -99,6 +108,10 @@ public function testHasAttribute()
     {
         expect('Exception')->hasAttribute('message');
         expect('Exception')->notHasAttribute('fakeproperty');
+        
+        $testObject = (object) array('existingAttribute' => true);
+        expect($testObject)->hasAttribute('existingAttribute');
+        expect($testObject)->notHasAttribute('fakeproperty');
     }
 
     public function testHasStaticAttribute()