* Fix Code Quality

* Update README.md

Author: TavoNiievez

README.md

@@ -21,98 +21,102 @@ composer require codeception/verify --dev
 
 ## Usage
 
-Use in any test `verify` function instead of `$this->assert*` methods:
+Use in any test `Verify` function instead of `$this->assert*` methods:
 
 ```php
+use Codeception\Verify\Verify;
+
 $user = User::find(1);
 
-// equal
-verify($user->getName())->equals('davert');
-verify("user have 5 posts", $user->getNumPosts())->equals(5);
-verify($user->getNumPosts())->notEquals(3);
+// equals
+Verify($user->getName())->equals('davert');
+
+Verify($user->getNumPosts())
+    ->equals(5, 'user have 5 posts')
+    ->notEquals(3);
 
 // contains
-verify('first user is admin', $user->getRoles())->contains('admin');
-verify("first user is not banned", $user->getRoles())->notContains('banned');
+Verify::Array($user->getRoles())
+    ->contains('admin', 'first user is admin')
+    ->notContains('banned', 'first user is not banned');
 
-// greater / less
-$rate = $user->getRate();
-verify('first user rate is 7', $rate)->equals(7);
 
-verify($rate)->greaterThan(5);
-verify($rate)->lessThan(10);
-verify($rate)->lessOrEquals(7);
-verify($rate)->greaterOrEquals(5);
+// greater / less
+Verify($user->getRate())
+    ->greaterThan(5)
+    ->lessThan(10)
+    ->equals(7, 'first user rate is 7');
 
 // true / false / null
-verify($user->isAdmin())->true();
-verify($user->isBanned())->false();
-verify($user->invitedBy)->null();
-verify($user->getPosts())->notNull();
+Verify($user->isAdmin())->true();
+Verify($user->isBanned())->false();
+Verify($user->invitedBy)->null();
+Verify($user->getPosts())->notNull();
 
 // empty
-verify($user->getComments())->isEmpty();
-verify($user->getRoles())->notEmpty();
+Verify($user->getComments())->empty();
+Verify($user->getRoles())->notEmpty();
 
 // throws
-verify($callback)->throws();
-verify($callback)->throws(Exception::class);
-verify($callback)->throws(Exception::class, 'exception message');
-verify($callback)->throws(new Exception());
-verify($callback)->throws(new Exception('message'));
+Verify::Callable($callback)
+    ->throws()
+    ->throws(Exception::class)
+    ->throws(Exception::class, 'exception message')
+    ->throws(new Exception())
+    ->throws(new Exception('message'));
 
 // does not throw
-verify($callback)->doesNotThrow();
-verify($callback)->throws(Exception::class);
-verify($callback)->doesNotThrow(new Exception());
+Verify::Callable($callback)
+    ->doesNotThrow()
+    ->throws(Exception::class)
+    ->doesNotThrow(new Exception());
 
 // and many more !
 ```
 
-> ##### :page_facing_up: See Verifiers full list [here.][7]
-
-Shorthands for testing truth/fallacy:
-
-```php
-verify_that($user->isActivated());
-verify_not($user->isBanned());
-```
-
-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.
+> :page_facing_up: **See Verifiers full list [here.][7]**
 
 ## Alternative Syntax
 
-If you follow TDD/BDD you'd rather use `expect` instead of `verify`. Which are just an alias functions:
+If you follow TDD/BDD you'd rather use `Expect` instead of `Verify`. Which are just an alias function:
 
 ```php
-expect("user have 5 posts", $user->getNumPosts())->equals(5);
-expect_that($user->isActive());
-expect_not($user->isBanned());
+Expect($user->getNumPosts())->equals(5, 'user have 5 posts');
 ```
 
 ## Extending
 
-In order to add more assertions you can override `Codeception\Verify` class:
+In order to add more assertions you can extend the abstract class `Verify`:
 
 ```php
-class MyVerify extends \Codeception\Verify {
+use Codeception\Verify\Verify;
+use PHPUnit\Framework\Assert;
+
+class MyVerify extends Verify {
+
+    //you can type $actual to only receive a specific data type
+
+    public function __construct($actual = null)
+    {
+        parent::__construct($actual);
+    }
 
-    public function success()
+    public function success(string $message = '')
     {
+        Assert::assertTrue(true, $message);
     }
 
 }
 ```
 
-Set the class name to `Codeception\Verify::$override` property to `verify` function use it:
+And use it!
 
 ```php
+$myVerify = new MyVerify;
 
-\Codeception\Verify::$override = MyVerify::class;
+$myVerify->success('it works!');
 
-// access overridden class
-verify('it works')->success();
+$myVerify::Mixed('this also')->notEquals('works');
 ```
 
 ## License

composer.json

@@ -15,7 +15,7 @@
     "require": {
         "php": "^7.3",
         "ext-dom": "*",
-        "phpunit/phpunit": "^9.0"
+        "phpunit/phpunit": "^9.3"
     },
     "autoload": {
         "files": [

src/Codeception/Exception/InvalidVerifyException.php

@@ -4,7 +4,7 @@
 
 use InvalidArgumentException;
 
-class InvalidVerifyException extends InvalidArgumentException
+final class InvalidVerifyException extends InvalidArgumentException
 {
     public function __construct($verifyName, $actual)
     {

src/Codeception/Verify/Verifiers/VerifyArray.php

@@ -95,7 +95,7 @@ public function count(int $expectedCount, string $message = ''): self
      * @param string $message
      * @return self
      */
-    public function hasKey($key, $message = ''): self
+    public function hasKey($key, string $message = ''): self
     {
         Assert::assertArrayHasKey($key, $this->actual, $message);
         return $this;

src/Codeception/Verify/Verifiers/VerifyCallable.php

@@ -68,7 +68,7 @@ public function doesNotThrow($throws = null, $message = false): self
             call_user_func($this->actual);
         } catch (Throwable $e) {
             if (!$throws) {
-                throw new ExpectationFailedException("exception was not expected to be thrown");
+                throw new ExpectationFailedException('exception was not expected to be thrown');
             }
 
             $actualThrows = get_class($e);
@@ -77,10 +77,11 @@ public function doesNotThrow($throws = null, $message = false): self
             if ($throws !== $actualThrows) {
                 return $this;
             }
-
             if (!$message) {
                 throw new ExpectationFailedException("exception '$throws' was not expected to be thrown");
-            } elseif ($message === $actualMessage) {
+            }
+
+            if ($message === $actualMessage) {
                 throw new ExpectationFailedException("exception '$throws' with message '$message' was not expected to be thrown");
             }
         }

src/Codeception/Verify/Verifiers/VerifyMixed.php

@@ -25,7 +25,7 @@ public function __construct($actual)
      * @param string $message
      * @return self
      */
-    public function empty($message = ''): self
+    public function empty(string $message = ''): self
     {
         Assert::assertEmpty($this->actual, $message);
         return $this;
@@ -248,7 +248,7 @@ public function isNotArray(string $message = ''): self
      * @param string $message
      * @return self
      */
-    public function isNotBool($message = ''): self
+    public function isNotBool(string $message = ''): self
     {
         Assert::assertIsNotBool($this->actual, $message);
         return $this;
@@ -651,7 +651,7 @@ public function true(string $message = ''): self
      * @param string $message
      * @return self
      */
-    public function equals($expected, $message = ''): self
+    public function equals($expected, string $message = ''): self
     {
         Assert::assertEquals($expected, $this->actual, $message);
         return $this;
@@ -664,7 +664,7 @@ public function equals($expected, $message = ''): self
      * @param string $message
      * @return self
      */
-    public function notEquals($expected, $message = ''): self
+    public function notEquals($expected, string $message = ''): self
     {
         Assert::assertNotEquals($expected, $this->actual, $message);
         return $this;

src/Codeception/Verify/Verify.php

@@ -9,6 +9,7 @@
 use Codeception\Verify\Verifiers\VerifyFile;
 use Codeception\Verify\Verifiers\VerifyJsonFile;
 use Codeception\Verify\Verifiers\VerifyJsonString;
+use Codeception\Verify\Verifiers\VerifyMixed;
 use Codeception\Verify\Verifiers\VerifyObject;
 use Codeception\Verify\Verifiers\VerifyString;
 use Codeception\Verify\Verifiers\VerifyXmlFile;
@@ -30,6 +31,15 @@ protected function __construct($actual)
         $this->actual = $actual;
     }
 
+    /**
+     * @param mixed $actual
+     * @return self
+     */
+    public function __invoke($actual): self
+    {
+        return $this($actual);
+    }
+
     public static function File(string $filename): VerifyFile
     {
         return new VerifyFile($filename);
@@ -55,7 +65,7 @@ public static function XmlString(string $xml): VerifyXmlString
         return new VerifyXmlString($xml);
     }
 
-    public static function Object(object $object): VerifyObject
+    public static function BaseObject(object $object): VerifyObject
     {
         return new VerifyObject($object);
     }
@@ -88,4 +98,13 @@ public static function Callable(callable $callable): VerifyCallable
     {
         return new VerifyCallable($callable);
     }
+
+    /**
+     * @param mixed $actual
+     * @return VerifyMixed
+     */
+    public static function Mixed($actual): VerifyMixed
+    {
+        return new VerifyMixed($actual);
+    }
 }

tests/InheritanceTest.php

@@ -1,6 +1,9 @@
 <?php declare(strict_types=1);
 
+include_once __DIR__.'/../src/Codeception/bootstrap.php';
+
 use Codeception\Verify\Verify;
+use PHPUnit\Framework\Assert;
 use PHPUnit\Framework\TestCase;
 
 include __DIR__.'/../vendor/autoload.php';
@@ -9,6 +12,12 @@ final class InheritanceTest extends TestCase
 {
     public function testVerifyCanBeExtended(): void
     {
+        $myVerify = new MyVerify;
+
+        $myVerify->success();
+
+        $myVerify::Mixed('this also')->notEquals('works');
+
         Verify(new MyVerify())->instanceOf(Verify::class);
     }
 }
@@ -20,4 +29,9 @@ public function __construct($actual = null)
     {
         parent::__construct($actual);
     }
+
+    public function success(string $message = '')
+    {
+        Assert::assertTrue(true, $message);
+    }
 }