update webpatser/laravel-uuid to version 3

composer.json

@@ -12,7 +12,7 @@
   "require": {
     "php": ">=7.1",
     "zackkitzmiller/tiny": "^1.2",
-    "webpatser/laravel-uuid": "^2.0",
+    "webpatser/laravel-uuid": "~3.0",
     "enzyme/axiom": "^4.2",
     "enzyme/freckle": "^0.3.0",
     "illuminate/database": "^5.5",

database/migrations/2014_10_12_000000_create_users_table.php

@@ -1,7 +1,7 @@
 <?php
 
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
 
 class CreateUsersTable extends Migration
 {

database/migrations/2014_10_12_100000_create_password_resets_table.php

@@ -1,7 +1,7 @@
 <?php
 
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
 
 class CreatePasswordResetsTable extends Migration
 {

database/migrations/2015_11_07_012716_create_parseabc_tables.php

@@ -1,7 +1,7 @@
 <?php
 
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
 
 class CreateParseabcTables extends Migration
 {

database/migrations/2016_03_06_021725_create_jobs_table.php

@@ -1,7 +1,7 @@
 <?php
 
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
 
 class CreateJobsTable extends Migration
 {

database/migrations/2016_03_06_021806_create_failed_jobs_table.php

@@ -1,7 +1,7 @@
 <?php
 
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
 
 class CreateFailedJobsTable extends Migration
 {

src/Domain/Atoms/EmailAtom.php

@@ -2,6 +2,7 @@
 namespace XaiCorp\AbcParser\Domain\Atoms;
 
 use Enzyme\Axiom\Atoms\AtomInterface;
+use Exception;
 
 class EmailAtom implements AtomInterface
 {
@@ -26,7 +27,7 @@ class EmailAtom implements AtomInterface
     private function validateEmail($value)
     {
         if (!$this->isValid($value)) {
-            throw new \Exception('Not a valid email');
+            throw new Exception('Not a valid email');
         }
     }
 

src/Domain/Core/Person.php

@@ -2,6 +2,7 @@
 namespace XaiCorp\AbcParser\Domain\Core;
 
 use Enzyme\Axiom\Atoms\StringAtom;
+use Exception;
 use Webpatser\Uuid\Uuid;
 use XaiCorp\AbcParser\Domain\Atoms\EmailAtom;
 
@@ -69,7 +70,7 @@ class Person implements EntityInterface
     public function get($attribute)
     {
         if (!$this->has($attribute)) {
-            throw new \Exception('Cannot access attribute on person');
+            throw new Exception('Cannot access attribute on person');
         }
 
         return $this->{$attribute};

src/Domain/Core/Setting.php

@@ -2,8 +2,6 @@
 namespace XaiCorp\AbcParser\Domain\Core;
 
 
-use Enzyme\Axiom\Atoms\StringAtom;
-
 class Setting
 {
     use IdentityTrait;

src/Domain/Core/Tune.php

@@ -1,7 +1,6 @@
 <?php
 namespace XaiCorp\AbcParser\Domain\Core;
 
-use Enzyme\Axiom\Atoms\IntegerAtom;
 use Enzyme\Axiom\Atoms\StringAtom;
 use Webpatser\Uuid\Uuid;
 use XaiCorp\AbcParser\Domain\Atoms\UnsignedIntegerAtom;

src/Domain/Modules/Interpreter/Builder.php

@@ -12,6 +12,7 @@ use XaiCorp\AbcParser\Domain\Core\Transcriber;
 use XaiCorp\AbcParser\Domain\Core\Tune;
 use XaiCorp\AbcParser\Domain\Core\TuneBuilder;
 use XaiCorp\AbcParser\Domain\Core\TuneCollection;
+
 //use XaiCorp\AbcParser\Models\Laravel5\TuneSetting;
 
 class Builder implements TuneBuilder

src/Domain/Modules/Interpreter/DefaultInterpreter.php

@@ -1,8 +1,6 @@
 <?php
 namespace XaiCorp\AbcParser\Domain\Modules\Interpreter;
 
-use Enzyme\Axiom\Atoms\StringAtom;
-use XaiCorp\AbcParser\Domain\Core\Tune;
 use XaiCorp\AbcParser\Domain\Modules\Interpreter\Lexicon\Author;
 use XaiCorp\AbcParser\Domain\Modules\Interpreter\Lexicon\Book;
 use XaiCorp\AbcParser\Domain\Modules\Interpreter\Lexicon\Composer;

src/Domain/Modules/Interpreter/Interpreter.php

@@ -1,7 +1,6 @@
 <?php
 namespace XaiCorp\AbcParser\Domain\Modules\Interpreter;
 
-use XaiCorp\AbcParser\Domain\Core\Tune;
 use XaiCorp\AbcParser\Domain\Core\TuneBuilder;
 use XaiCorp\AbcParser\Domain\Core\TuneCollection;
 

src/Domain/Modules/Interpreter/Lexicon/Author.php

@@ -1,10 +1,8 @@
 <?php
 namespace XaiCorp\AbcParser\Domain\Modules\Interpreter\Lexicon;
 
-use Enzyme\Axiom\Atoms\StringAtom;
+use Closure;
-use XaiCorp\AbcParser\Domain\Atoms\UnsignedIntegerAtom;
 use XaiCorp\AbcParser\Domain\Core\TuneBuilder;
-use XaiCorp\AbcParser\Domain\Modules\Interpreter\Builder;
 use XaiCorp\AbcParser\Domain\Modules\Interpreter\Context;
 
 class Author implements Lex
@@ -27,10 +25,10 @@ class Author implements Lex
      * @return mixed
      * @throws \Enzyme\Axiom\Exceptions\AtomException
      */
-    public function handle(Context $context, \Closure $next)
+    public function handle(Context $context, Closure $next)
     {
         $line = $context->current();
-        list($key, $data) = $this->getKeyDataFromLine($line);
+        [$key, $data] = $this->getKeyDataFromLine($line);
 
         if ($key === 'A') {
             $this->builder->addAuthor($data);

src/Domain/Modules/Interpreter/Lexicon/Book.php

@@ -1,10 +1,9 @@
 <?php
 namespace XaiCorp\AbcParser\Domain\Modules\Interpreter\Lexicon;
 
+use Closure;
 use Enzyme\Axiom\Atoms\StringAtom;
-use XaiCorp\AbcParser\Domain\Atoms\UnsignedIntegerAtom;
 use XaiCorp\AbcParser\Domain\Core\TuneBuilder;
-use XaiCorp\AbcParser\Domain\Modules\Interpreter\Builder;
 use XaiCorp\AbcParser\Domain\Modules\Interpreter\Context;
 
 class Book implements Lex
@@ -27,10 +26,10 @@ class Book implements Lex
      * @return mixed
      * @throws \Enzyme\Axiom\Exceptions\AtomException
      */
-    public function handle(Context $context, \Closure $next)
+    public function handle(Context $context, Closure $next)
     {
         $line = $context->current();
-        list($key, $data) = $this->getKeyDataFromLine($line);
+        [$key, $data] = $this->getKeyDataFromLine($line);
 
         if ($key === 'B') {
             $this->builder->addBook(new StringAtom($data));

src/Domain/Modules/Interpreter/Lexicon/Composer.php

@@ -1,10 +1,8 @@
 <?php
 namespace XaiCorp\AbcParser\Domain\Modules\Interpreter\Lexicon;
 
-use Enzyme\Axiom\Atoms\StringAtom;
+use Closure;
-use XaiCorp\AbcParser\Domain\Atoms\UnsignedIntegerAtom;
 use XaiCorp\AbcParser\Domain\Core\TuneBuilder;
-use XaiCorp\AbcParser\Domain\Modules\Interpreter\Builder;
 use XaiCorp\AbcParser\Domain\Modules\Interpreter\Context;
 
 class Composer implements Lex
@@ -27,10 +25,10 @@ class Composer implements Lex
      * @return mixed
      * @throws \Enzyme\Axiom\Exceptions\AtomException
      */
-    public function handle(Context $context, \Closure $next)
+    public function handle(Context $context, Closure $next)
     {
         $line = $context->current();
-        list($key, $data) = $this->getKeyDataFromLine($line);
+        [$key, $data] = $this->getKeyDataFromLine($line);
 
         if ($key === 'C') {
             $this->builder->addComposer($data);

src/Domain/Modules/Interpreter/Lexicon/Discography.php

@@ -1,10 +1,9 @@
 <?php
 namespace XaiCorp\AbcParser\Domain\Modules\Interpreter\Lexicon;
 
+use Closure;
 use Enzyme\Axiom\Atoms\StringAtom;
-use XaiCorp\AbcParser\Domain\Atoms\UnsignedIntegerAtom;
 use XaiCorp\AbcParser\Domain\Core\TuneBuilder;
-use XaiCorp\AbcParser\Domain\Modules\Interpreter\Builder;
 use XaiCorp\AbcParser\Domain\Modules\Interpreter\Context;
 
 class Discography implements Lex
@@ -27,10 +26,10 @@ class Discography implements Lex
      * @return mixed
      * @throws \Enzyme\Axiom\Exceptions\AtomException
      */
-    public function handle(Context $context, \Closure $next)
+    public function handle(Context $context, Closure $next)
     {
         $line = $context->current();
-        list($key, $data) = $this->getKeyDataFromLine($line);
+        [$key, $data] = $this->getKeyDataFromLine($line);
 
         if ($key === 'D') {
             $this->builder->addDiscography(new StringAtom($data));

src/Domain/Modules/Interpreter/Lexicon/EndOfTune.php

@@ -1,10 +1,8 @@
 <?php
 namespace XaiCorp\AbcParser\Domain\Modules\Interpreter\Lexicon;
 
-use Enzyme\Axiom\Atoms\StringAtom;
+use Closure;
-use XaiCorp\AbcParser\Domain\Atoms\UnsignedIntegerAtom;
 use XaiCorp\AbcParser\Domain\Core\TuneBuilder;
-use XaiCorp\AbcParser\Domain\Modules\Interpreter\Builder;
 use XaiCorp\AbcParser\Domain\Modules\Interpreter\Context;
 
 class EndOfTune implements Lex
@@ -27,7 +25,7 @@ class EndOfTune implements Lex
      * @return mixed
      * @throws \Enzyme\Axiom\Exceptions\AtomException
      */
-    public function handle(Context $context, \Closure $next)
+    public function handle(Context $context, Closure $next)
     {
         $line = $context->current();
 //        list($key, $data) = $this->getKeyDataFromLine($line);

src/Domain/Modules/Interpreter/Lexicon/Filename.php

@@ -1,10 +1,9 @@
 <?php
 namespace XaiCorp\AbcParser\Domain\Modules\Interpreter\Lexicon;
 
+use Closure;
 use Enzyme\Axiom\Atoms\StringAtom;
-use XaiCorp\AbcParser\Domain\Atoms\UnsignedIntegerAtom;
 use XaiCorp\AbcParser\Domain\Core\TuneBuilder;
-use XaiCorp\AbcParser\Domain\Modules\Interpreter\Builder;
 use XaiCorp\AbcParser\Domain\Modules\Interpreter\Context;
 
 class Filename implements Lex
@@ -27,10 +26,10 @@ class Filename implements Lex
      * @return mixed
      * @throws \Enzyme\Axiom\Exceptions\AtomException
      */
-    public function handle(Context $context, \Closure $next)
+    public function handle(Context $context, Closure $next)
     {
         $line = $context->current();
-        list($key, $data) = $this->getKeyDataFromLine($line);
+        [$key, $data] = $this->getKeyDataFromLine($line);
 
         if ($key === 'F'
             && $context->getState() === $context::MODE_TUNE_HEADER

src/Domain/Modules/Interpreter/Lexicon/Group.php

@@ -1,10 +1,9 @@
 <?php
 namespace XaiCorp\AbcParser\Domain\Modules\Interpreter\Lexicon;
 
+use Closure;
 use Enzyme\Axiom\Atoms\StringAtom;
-use XaiCorp\AbcParser\Domain\Atoms\UnsignedIntegerAtom;
 use XaiCorp\AbcParser\Domain\Core\TuneBuilder;
-use XaiCorp\AbcParser\Domain\Modules\Interpreter\Builder;
 use XaiCorp\AbcParser\Domain\Modules\Interpreter\Context;
 
 class Group implements Lex
@@ -27,10 +26,10 @@ class Group implements Lex
      * @return mixed
      * @throws \Enzyme\Axiom\Exceptions\AtomException
      */
-    public function handle(Context $context, \Closure $next)
+    public function handle(Context $context, Closure $next)
     {
         $line = $context->current();
-        list($key, $data) = $this->getKeyDataFromLine($line);
+        [$key, $data] = $this->getKeyDataFromLine($line);
 
         if ($key === 'G') {
             $this->builder->addGroup(new StringAtom($data));

src/Domain/Modules/Interpreter/Lexicon/History.php

@@ -1,10 +1,8 @@
 <?php
 namespace XaiCorp\AbcParser\Domain\Modules\Interpreter\Lexicon;
 
-use Enzyme\Axiom\Atoms\StringAtom;
+use Closure;
-use XaiCorp\AbcParser\Domain\Atoms\UnsignedIntegerAtom;
 use XaiCorp\AbcParser\Domain\Core\TuneBuilder;
-use XaiCorp\AbcParser\Domain\Modules\Interpreter\Builder;
 use XaiCorp\AbcParser\Domain\Modules\Interpreter\Context;
 
 class History implements Lex
@@ -28,10 +26,10 @@ class History implements Lex
      * @throws \Enzyme\Axiom\Exceptions\AtomException
      * @throws \Enzyme\Collection\CollectionException
      */
-    public function handle(Context $context, \Closure $next)
+    public function handle(Context $context, Closure $next)
     {
         $line = $context->current();
-        list($key, $data) = $this->getKeyDataFromLine($line);
+        [$key, $data] = $this->getKeyDataFromLine($line);
 
         if ($key === 'H'
             && $context->isState($context::MODE_TUNE_HEADER)
@@ -56,8 +54,8 @@ class History implements Lex
      */
     private function nextLineNotHistory(Context $context)
     {
-        $nextLine = $context->get($context->key() +1);
+        $nextLine = $context->get($context->key() + 1);
-        list($key, $data) = $this->getKeyDataFromLine($nextLine);
+        [$key, $data] = $this->getKeyDataFromLine($nextLine);
         return $key !== '';
     }
 }

src/Domain/Modules/Interpreter/Lexicon/Index.php

@@ -1,10 +1,9 @@
 <?php
 namespace XaiCorp\AbcParser\Domain\Modules\Interpreter\Lexicon;
 
-use Enzyme\Axiom\Atoms\StringAtom;
+use Closure;
 use XaiCorp\AbcParser\Domain\Atoms\UnsignedIntegerAtom;
 use XaiCorp\AbcParser\Domain\Core\TuneBuilder;
-use XaiCorp\AbcParser\Domain\Modules\Interpreter\Builder;
 use XaiCorp\AbcParser\Domain\Modules\Interpreter\Context;
 
 class Index implements Lex
@@ -21,10 +20,10 @@ class Index implements Lex
         $this->builder = $builder;
     }
 
-    public function handle(Context $context, \Closure $next)
+    public function handle(Context $context, Closure $next)
     {
         $line = $context->current();
-        list($key, $data) = $this->getKeyDataFromLine($line);
+        [$key, $data] = $this->getKeyDataFromLine($line);
 
         if ($key === 'X') {
             $context->setStateInTuneHeader();

src/Domain/Modules/Interpreter/Lexicon/KeySignature.php

@@ -1,10 +1,9 @@
 <?php
 namespace XaiCorp\AbcParser\Domain\Modules\Interpreter\Lexicon;
 
+use Closure;
 use Enzyme\Axiom\Atoms\StringAtom;
-use XaiCorp\AbcParser\Domain\Atoms\UnsignedIntegerAtom;
 use XaiCorp\AbcParser\Domain\Core\TuneBuilder;
-use XaiCorp\AbcParser\Domain\Modules\Interpreter\Builder;
 use XaiCorp\AbcParser\Domain\Modules\Interpreter\Context;
 
 class KeySignature implements Lex
@@ -27,10 +26,10 @@ class KeySignature implements Lex
      * @return mixed
      * @throws \Enzyme\Axiom\Exceptions\AtomException
      */
-    public function handle(Context $context, \Closure $next)
+    public function handle(Context $context, Closure $next)
     {
         $line = $context->current();
-        list($key, $data) = $this->getKeyDataFromLine($line);
+        [$key, $data] = $this->getKeyDataFromLine($line);
 
         if ($context->getState() === $context::MODE_TUNE_HEADER && $key === 'K') {
             $this->builder->setKey(new StringAtom($data));

src/Domain/Modules/Interpreter/Lexicon/Meter.php

@@ -1,10 +1,9 @@
 <?php
 namespace XaiCorp\AbcParser\Domain\Modules\Interpreter\Lexicon;
 
+use Closure;
 use Enzyme\Axiom\Atoms\StringAtom;
-use XaiCorp\AbcParser\Domain\Atoms\UnsignedIntegerAtom;
 use XaiCorp\AbcParser\Domain\Core\TuneBuilder;
-use XaiCorp\AbcParser\Domain\Modules\Interpreter\Builder;
 use XaiCorp\AbcParser\Domain\Modules\Interpreter\Context;
 
 class Meter implements Lex
@@ -27,10 +26,10 @@ class Meter implements Lex
      * @return mixed
      * @throws \Enzyme\Axiom\Exceptions\AtomException
      */
-    public function handle(Context $context, \Closure $next)
+    public function handle(Context $context, Closure $next)
     {
         $line = $context->current();
-        list($key, $data) = $this->getKeyDataFromLine($line);
+        [$key, $data] = $this->getKeyDataFromLine($line);
 
         if ($key === 'M'
             && $context->getState() === $context::MODE_TUNE_HEADER

src/Domain/Modules/Interpreter/Lexicon/MusicLine.php

@@ -1,10 +1,8 @@
 <?php
 namespace XaiCorp\AbcParser\Domain\Modules\Interpreter\Lexicon;
 
-use Enzyme\Axiom\Atoms\StringAtom;
+use Closure;
-use XaiCorp\AbcParser\Domain\Atoms\UnsignedIntegerAtom;
 use XaiCorp\AbcParser\Domain\Core\TuneBuilder;
-use XaiCorp\AbcParser\Domain\Modules\Interpreter\Builder;
 use XaiCorp\AbcParser\Domain\Modules\Interpreter\Context;
 
 class MusicLine implements Lex
@@ -27,10 +25,10 @@ class MusicLine implements Lex
      * @return mixed
      * @throws \Enzyme\Axiom\Exceptions\AtomException
      */
-    public function handle(Context $context, \Closure $next)
+    public function handle(Context $context, Closure $next)
     {
         $line = $context->current();
-        list($key, $data) = $this->getKeyDataFromLine($line);
+        [$key, $data] = $this->getKeyDataFromLine($line);
 
         if ($context->getState() === $context::MODE_TUNE_BODY
             && $key !== 'K'

src/Domain/Modules/Interpreter/Lexicon/NoteLength.php

@@ -1,10 +1,9 @@
 <?php
 namespace XaiCorp\AbcParser\Domain\Modules\Interpreter\Lexicon;
 
+use Closure;
 use Enzyme\Axiom\Atoms\StringAtom;
-use XaiCorp\AbcParser\Domain\Atoms\UnsignedIntegerAtom;
 use XaiCorp\AbcParser\Domain\Core\TuneBuilder;
-use XaiCorp\AbcParser\Domain\Modules\Interpreter\Builder;
 use XaiCorp\AbcParser\Domain\Modules\Interpreter\Context;
 
 class NoteLength implements Lex
@@ -27,10 +26,10 @@ class NoteLength implements Lex
      * @return mixed
      * @throws \Enzyme\Axiom\Exceptions\AtomException
      */
-    public function handle(Context $context, \Closure $next)
+    public function handle(Context $context, Closure $next)
     {
         $line = $context->current();
-        list($key, $data) = $this->getKeyDataFromLine($line);
+        [$key, $data] = $this->getKeyDataFromLine($line);
 
         if ($key === 'L') {
             $this->builder->addNoteLength(new StringAtom($data));

src/Domain/Modules/Interpreter/Lexicon/Notes.php

@@ -1,10 +1,9 @@
 <?php
 namespace XaiCorp\AbcParser\Domain\Modules\Interpreter\Lexicon;
 
+use Closure;
 use Enzyme\Axiom\Atoms\StringAtom;
-use XaiCorp\AbcParser\Domain\Atoms\UnsignedIntegerAtom;
 use XaiCorp\AbcParser\Domain\Core\TuneBuilder;
-use XaiCorp\AbcParser\Domain\Modules\Interpreter\Builder;
 use XaiCorp\AbcParser\Domain\Modules\Interpreter\Context;
 
 class Notes implements Lex
@@ -27,10 +26,10 @@ class Notes implements Lex
      * @return mixed
      * @throws \Enzyme\Axiom\Exceptions\AtomException
      */
-    public function handle(Context $context, \Closure $next)
+    public function handle(Context $context, Closure $next)
     {
         $line = $context->current();
-        list($key, $data) = $this->getKeyDataFromLine($line);
+        [$key, $data] = $this->getKeyDataFromLine($line);
 
         if ($key === 'N') {
             $this->builder->addNote(new StringAtom($data));

src/Domain/Modules/Interpreter/Lexicon/Origin.php

@@ -1,10 +1,9 @@
 <?php
 namespace XaiCorp\AbcParser\Domain\Modules\Interpreter\Lexicon;
 
+use Closure;
 use Enzyme\Axiom\Atoms\StringAtom;
-use XaiCorp\AbcParser\Domain\Atoms\UnsignedIntegerAtom;
 use XaiCorp\AbcParser\Domain\Core\TuneBuilder;
-use XaiCorp\AbcParser\Domain\Modules\Interpreter\Builder;
 use XaiCorp\AbcParser\Domain\Modules\Interpreter\Context;
 
 class Origin implements Lex
@@ -27,10 +26,10 @@ class Origin implements Lex
      * @return mixed
      * @throws \Enzyme\Axiom\Exceptions\AtomException
      */
-    public function handle(Context $context, \Closure $next)
+    public function handle(Context $context, Closure $next)
     {
         $line = $context->current();
-        list($key, $data) = $this->getKeyDataFromLine($line);
+        [$key, $data] = $this->getKeyDataFromLine($line);
 
         if ($key === 'O') {
             $this->builder->addOrigin(new StringAtom($data));

src/Domain/Modules/Interpreter/Lexicon/Parts.php

@@ -1,10 +1,9 @@
 <?php
 namespace XaiCorp\AbcParser\Domain\Modules\Interpreter\Lexicon;
 
+use Closure;
 use Enzyme\Axiom\Atoms\StringAtom;
-use XaiCorp\AbcParser\Domain\Atoms\UnsignedIntegerAtom;
 use XaiCorp\AbcParser\Domain\Core\TuneBuilder;
-use XaiCorp\AbcParser\Domain\Modules\Interpreter\Builder;
 use XaiCorp\AbcParser\Domain\Modules\Interpreter\Context;
 
 class Parts implements Lex
@@ -27,10 +26,10 @@ class Parts implements Lex
      * @return mixed
      * @throws \Enzyme\Axiom\Exceptions\AtomException
      */
-    public function handle(Context $context, \Closure $next)
+    public function handle(Context $context, Closure $next)
     {
         $line = $context->current();
-        list($key, $data) = $this->getKeyDataFromLine($line);
+        [$key, $data] = $this->getKeyDataFromLine($line);
 
         if ($key === 'P'
             && $context->getState() === $context::MODE_TUNE_HEADER

src/Domain/Modules/Interpreter/Lexicon/Rhythm.php

@@ -1,10 +1,9 @@
 <?php
 namespace XaiCorp\AbcParser\Domain\Modules\Interpreter\Lexicon;
 
+use Closure;
 use Enzyme\Axiom\Atoms\StringAtom;
-use XaiCorp\AbcParser\Domain\Atoms\UnsignedIntegerAtom;
 use XaiCorp\AbcParser\Domain\Core\TuneBuilder;
-use XaiCorp\AbcParser\Domain\Modules\Interpreter\Builder;
 use XaiCorp\AbcParser\Domain\Modules\Interpreter\Context;
 
 class Rhythm implements Lex
@@ -27,10 +26,10 @@ class Rhythm implements Lex
      * @return mixed
      * @throws \Enzyme\Axiom\Exceptions\AtomException
      */
-    public function handle(Context $context, \Closure $next)
+    public function handle(Context $context, Closure $next)
     {
         $line = $context->current();
-        list($key, $data) = $this->getKeyDataFromLine($line);
+        [$key, $data] = $this->getKeyDataFromLine($line);
 
         if ($key === 'R'
             && $context->getState() === $context::MODE_TUNE_HEADER

src/Domain/Modules/Interpreter/Lexicon/Source.php

@@ -1,10 +1,9 @@
 <?php
 namespace XaiCorp\AbcParser\Domain\Modules\Interpreter\Lexicon;
 
+use Closure;
 use Enzyme\Axiom\Atoms\StringAtom;
-use XaiCorp\AbcParser\Domain\Atoms\UnsignedIntegerAtom;
 use XaiCorp\AbcParser\Domain\Core\TuneBuilder;
-use XaiCorp\AbcParser\Domain\Modules\Interpreter\Builder;
 use XaiCorp\AbcParser\Domain\Modules\Interpreter\Context;
 
 class Source implements Lex
@@ -27,10 +26,10 @@ class Source implements Lex
      * @return mixed
      * @throws \Enzyme\Axiom\Exceptions\AtomException
      */
-    public function handle(Context $context, \Closure $next)
+    public function handle(Context $context, Closure $next)
     {
         $line = $context->current();
-        list($key, $data) = $this->getKeyDataFromLine($line);
+        [$key, $data] = $this->getKeyDataFromLine($line);
 
         if ($key === 'S'
             && $context->getState() === $context::MODE_TUNE_HEADER

src/Domain/Modules/Interpreter/Lexicon/Tempo.php

@@ -1,10 +1,9 @@
 <?php
 namespace XaiCorp\AbcParser\Domain\Modules\Interpreter\Lexicon;
 
+use Closure;
 use Enzyme\Axiom\Atoms\StringAtom;
-use XaiCorp\AbcParser\Domain\Atoms\UnsignedIntegerAtom;
 use XaiCorp\AbcParser\Domain\Core\TuneBuilder;
-use XaiCorp\AbcParser\Domain\Modules\Interpreter\Builder;
 use XaiCorp\AbcParser\Domain\Modules\Interpreter\Context;
 
 class Tempo implements Lex
@@ -27,10 +26,10 @@ class Tempo implements Lex
      * @return mixed
      * @throws \Enzyme\Axiom\Exceptions\AtomException
      */
-    public function handle(Context $context, \Closure $next)
+    public function handle(Context $context, Closure $next)
     {
         $line = $context->current();
-        list($key, $data) = $this->getKeyDataFromLine($line);
+        [$key, $data] = $this->getKeyDataFromLine($line);
 
         if ($key === 'Q') {
             $this->builder->addTempo(new StringAtom($data));

src/Domain/Modules/Interpreter/Lexicon/Title.php

@@ -1,10 +1,8 @@
 <?php
 namespace XaiCorp\AbcParser\Domain\Modules\Interpreter\Lexicon;
 
-use Enzyme\Axiom\Atoms\StringAtom;
+use Closure;
-use XaiCorp\AbcParser\Domain\Atoms\UnsignedIntegerAtom;
 use XaiCorp\AbcParser\Domain\Core\TuneBuilder;
-use XaiCorp\AbcParser\Domain\Modules\Interpreter\Builder;
 use XaiCorp\AbcParser\Domain\Modules\Interpreter\Context;
 
 class Title implements Lex
@@ -27,10 +25,10 @@ class Title implements Lex
      * @return mixed
      * @throws \Enzyme\Axiom\Exceptions\AtomException
      */
-    public function handle(Context $context, \Closure $next)
+    public function handle(Context $context, Closure $next)
     {
         $line = $context->current();
-        list($key, $data) = $this->getKeyDataFromLine($line);
+        [$key, $data] = $this->getKeyDataFromLine($line);
 
         if ($key === 'T') {
             $this->builder->addTitle($data);

src/Domain/Modules/Interpreter/Lexicon/Transcriber.php

@@ -1,10 +1,9 @@
 <?php
 namespace XaiCorp\AbcParser\Domain\Modules\Interpreter\Lexicon;
 
+use Closure;
 use Enzyme\Axiom\Atoms\StringAtom;
-use XaiCorp\AbcParser\Domain\Atoms\UnsignedIntegerAtom;
 use XaiCorp\AbcParser\Domain\Core\TuneBuilder;
-use XaiCorp\AbcParser\Domain\Modules\Interpreter\Builder;
 use XaiCorp\AbcParser\Domain\Modules\Interpreter\Context;
 
 class Transcriber implements Lex
@@ -27,10 +26,10 @@ class Transcriber implements Lex
      * @return mixed
      * @throws \Enzyme\Axiom\Exceptions\AtomException
      */
-    public function handle(Context $context, \Closure $next)
+    public function handle(Context $context, Closure $next)
     {
         $line = $context->current();
-        list($key, $data) = $this->getKeyDataFromLine($line);
+        [$key, $data] = $this->getKeyDataFromLine($line);
 
         if ($key === 'Z') {
             $this->builder->addTranscriber(new StringAtom($data));

src/Domain/Modules/Interpreter/Lexicon/Words.php

@@ -1,10 +1,9 @@
 <?php
 namespace XaiCorp\AbcParser\Domain\Modules\Interpreter\Lexicon;
 
+use Closure;
 use Enzyme\Axiom\Atoms\StringAtom;
-use XaiCorp\AbcParser\Domain\Atoms\UnsignedIntegerAtom;
 use XaiCorp\AbcParser\Domain\Core\TuneBuilder;
-use XaiCorp\AbcParser\Domain\Modules\Interpreter\Builder;
 use XaiCorp\AbcParser\Domain\Modules\Interpreter\Context;
 
 class Words implements Lex
@@ -27,10 +26,10 @@ class Words implements Lex
      * @return mixed
      * @throws \Enzyme\Axiom\Exceptions\AtomException
      */
-    public function handle(Context $context, \Closure $next)
+    public function handle(Context $context, Closure $next)
     {
         $line = $context->current();
-        list($key, $data) = $this->getKeyDataFromLine($line);
+        [$key, $data] = $this->getKeyDataFromLine($line);
 
         if ($key === 'W') {
             $this->builder->addWords(new StringAtom($data));

src/Traits/ValidationTrait.php

@@ -1,8 +1,8 @@
 <?php
 namespace XaiCorp\AbcParser\Traits;
 
-use Illuminate\Support\MessageBag;
 use Illuminate\Support\Facades\Validator;
+use Illuminate\Support\MessageBag;
 
 Trait ValidationTrait
 {

tests/_bootstrap.php

@@ -1,5 +1,7 @@
 <?php
 // This is global bootstrap for autoloading
 
+use Codeception\Util\Autoload;
+
 include_once 'vendor/autoload.php';
-\Codeception\Util\Autoload::addNamespace('Tests', codecept_root_dir().'tests/unit');
+Autoload::addNamespace('Tests', codecept_root_dir() . 'tests/unit');

tests/_support/Helper/ExtraAsserts.php

@@ -4,9 +4,11 @@ namespace Helper;
 // here you can define custom actions
 // all public methods declared in helper class will be available in $I
 
+use Codeception\Module;
 use Illuminate\Database\Eloquent\Model;
+use PHPUnit_Framework_Assert;
 
-class ExtraAsserts extends \Codeception\Module
+class ExtraAsserts extends Module
 {
 
     /**
@@ -16,21 +18,21 @@ class ExtraAsserts extends \Codeception\Module
      */
     public function assertInstanceOf($expected, $actual, $message = '')
     {
-        \PHPUnit_Framework_Assert::assertInstanceOf($expected, $actual, $message);
+        PHPUnit_Framework_Assert::assertInstanceOf($expected, $actual, $message);
     }
 
     public function assertCanSave(Model $model)
     {
-        \PHPUnit_Framework_Assert::assertTrue($model->save(), json_encode($model->getMessages()));
+        PHPUnit_Framework_Assert::assertTrue($model->save(), json_encode($model->getMessages()));
     }
 
     public function assertCanNotSave(Model $model, $message = '')
     {
-        \PHPUnit_Framework_Assert::assertNotTrue($model->save(), $message);
+        PHPUnit_Framework_Assert::assertNotTrue($model->save(), $message);
     }
 
     public function haveNotFinishedTest()
     {
-        \PHPUnit_Framework_Assert::markTestIncomplete();
+        PHPUnit_Framework_Assert::markTestIncomplete();
     }
 }

tests/_support/Helper/Unit.php

@@ -4,7 +4,9 @@ namespace Helper;
 // here you can define custom actions
 // all public methods declared in helper class will be available in $I
 
-class Unit extends \Codeception\Module
+use Codeception\Module;
+
+class Unit extends Module
 {
 
 }

tests/_support/UnitTester.php

@@ -1,5 +1,8 @@
 <?php
 
+use Codeception\Actor;
+use Codeception\Lib\Friend;
+
 
 /**
  * Inherited Methods
@@ -12,15 +15,15 @@
  * @method void am($role)
  * @method void lookForwardTo($achieveValue)
  * @method void comment($description)
- * @method \Codeception\Lib\Friend haveFriend($name, $actorClass = NULL)
+ * @method Friend haveFriend($name, $actorClass = null)
  *
  * @SuppressWarnings(PHPMD)
-*/
+ */
-class UnitTester extends \Codeception\Actor
+class UnitTester extends Actor
 {
     use _generated\UnitTesterActions;
 
-   /**
+    /**
-    * Define custom actions here
+     * Define custom actions here
-    */
+     */
 }

tests/_support/_generated/AcceptanceTesterActions.php

@@ -5,7 +5,10 @@ namespace _generated;
 // You should not change it manually as it will be overwritten on next build
 // @codingStandardsIgnoreFile
 
-use Codeception\Module\PhpBrowser;
+use Codeception\Step\Action;
+use Codeception\Step\Assertion;
+use Codeception\Step\Condition;
+use Codeception\Step\ConditionalAssertion;
 use Helper\Acceptance;
 
 trait AcceptanceTesterActions
@@ -26,7 +29,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Module\PhpBrowser::setHeader()
      */
     public function setHeader($name, $value) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('setHeader', func_get_args()));
+        return $this->getScenario()->runStep(new Action('setHeader', func_get_args()));
     }
 
 
@@ -40,7 +43,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Module\PhpBrowser::amHttpAuthenticated()
      */
     public function amHttpAuthenticated($username, $password) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Condition('amHttpAuthenticated', func_get_args()));
+        return $this->getScenario()->runStep(new Condition('amHttpAuthenticated', func_get_args()));
     }
 
 
@@ -58,7 +61,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Module\PhpBrowser::amOnUrl()
      */
     public function amOnUrl($url) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Condition('amOnUrl', func_get_args()));
+        return $this->getScenario()->runStep(new Condition('amOnUrl', func_get_args()));
     }
 
 
@@ -86,7 +89,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Module\PhpBrowser::amOnSubdomain()
      */
     public function amOnSubdomain($subdomain) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Condition('amOnSubdomain', func_get_args()));
+        return $this->getScenario()->runStep(new Condition('amOnSubdomain', func_get_args()));
     }
 
 
@@ -113,7 +116,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Module\PhpBrowser::executeInGuzzle()
      */
     public function executeInGuzzle($function) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('executeInGuzzle', func_get_args()));
+        return $this->getScenario()->runStep(new Action('executeInGuzzle', func_get_args()));
     }
 
 
@@ -148,7 +151,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::haveHttpHeader()
      */
     public function haveHttpHeader($name, $value) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('haveHttpHeader', func_get_args()));
+        return $this->getScenario()->runStep(new Action('haveHttpHeader', func_get_args()));
     }
 
 
@@ -173,7 +176,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::deleteHeader()
      */
     public function deleteHeader($name) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('deleteHeader', func_get_args()));
+        return $this->getScenario()->runStep(new Action('deleteHeader', func_get_args()));
     }
 
 
@@ -194,7 +197,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::amOnPage()
      */
     public function amOnPage($page) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Condition('amOnPage', func_get_args()));
+        return $this->getScenario()->runStep(new Condition('amOnPage', func_get_args()));
     }
 
 
@@ -233,7 +236,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::click()
      */
     public function click($link, $context = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('click', func_get_args()));
+        return $this->getScenario()->runStep(new Action('click', func_get_args()));
     }
 
 
@@ -273,7 +276,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::see()
      */
     public function canSee($text, $selector = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('see', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('see', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -310,7 +313,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::see()
      */
     public function see($text, $selector = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('see', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('see', func_get_args()));
     }
 
 
@@ -348,7 +351,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSee()
      */
     public function cantSee($text, $selector = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSee', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('dontSee', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -383,7 +386,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSee()
      */
     public function dontSee($text, $selector = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSee', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('dontSee', func_get_args()));
     }
 
 
@@ -403,7 +406,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeInSource()
      */
     public function canSeeInSource($raw) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInSource', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('seeInSource', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -420,7 +423,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeInSource()
      */
     public function seeInSource($raw) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInSource', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('seeInSource', func_get_args()));
     }
 
 
@@ -440,7 +443,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSeeInSource()
      */
     public function cantSeeInSource($raw) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInSource', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('dontSeeInSource', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -457,7 +460,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSeeInSource()
      */
     public function dontSeeInSource($raw) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInSource', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('dontSeeInSource', func_get_args()));
     }
 
 
@@ -480,7 +483,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeLink()
      */
     public function canSeeLink($text, $url = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeLink', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('seeLink', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -500,7 +503,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeLink()
      */
     public function seeLink($text, $url = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeLink', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('seeLink', func_get_args()));
     }
 
 
@@ -523,7 +526,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSeeLink()
      */
     public function cantSeeLink($text, $url = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeLink', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('dontSeeLink', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -543,7 +546,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSeeLink()
      */
     public function dontSeeLink($text, $url = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeLink', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('dontSeeLink', func_get_args()));
     }
 
 
@@ -566,7 +569,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeInCurrentUrl()
      */
     public function canSeeInCurrentUrl($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInCurrentUrl', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('seeInCurrentUrl', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -586,7 +589,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeInCurrentUrl()
      */
     public function seeInCurrentUrl($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInCurrentUrl', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('seeInCurrentUrl', func_get_args()));
     }
 
 
@@ -606,7 +609,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSeeInCurrentUrl()
      */
     public function cantSeeInCurrentUrl($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInCurrentUrl', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('dontSeeInCurrentUrl', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -623,7 +626,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSeeInCurrentUrl()
      */
     public function dontSeeInCurrentUrl($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInCurrentUrl', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('dontSeeInCurrentUrl', func_get_args()));
     }
 
 
@@ -645,7 +648,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeCurrentUrlEquals()
      */
     public function canSeeCurrentUrlEquals($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCurrentUrlEquals', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('seeCurrentUrlEquals', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -664,7 +667,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeCurrentUrlEquals()
      */
     public function seeCurrentUrlEquals($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCurrentUrlEquals', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('seeCurrentUrlEquals', func_get_args()));
     }
 
 
@@ -686,7 +689,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSeeCurrentUrlEquals()
      */
     public function cantSeeCurrentUrlEquals($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCurrentUrlEquals', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('dontSeeCurrentUrlEquals', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -705,7 +708,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSeeCurrentUrlEquals()
      */
     public function dontSeeCurrentUrlEquals($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeCurrentUrlEquals', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('dontSeeCurrentUrlEquals', func_get_args()));
     }
 
 
@@ -726,7 +729,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeCurrentUrlMatches()
      */
     public function canSeeCurrentUrlMatches($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCurrentUrlMatches', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('seeCurrentUrlMatches', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -744,7 +747,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeCurrentUrlMatches()
      */
     public function seeCurrentUrlMatches($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCurrentUrlMatches', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('seeCurrentUrlMatches', func_get_args()));
     }
 
 
@@ -765,7 +768,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSeeCurrentUrlMatches()
      */
     public function cantSeeCurrentUrlMatches($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCurrentUrlMatches', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('dontSeeCurrentUrlMatches', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -783,7 +786,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSeeCurrentUrlMatches()
      */
     public function dontSeeCurrentUrlMatches($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeCurrentUrlMatches', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('dontSeeCurrentUrlMatches', func_get_args()));
     }
 
 
@@ -806,7 +809,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::grabFromCurrentUrl()
      */
     public function grabFromCurrentUrl($uri = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabFromCurrentUrl', func_get_args()));
+        return $this->getScenario()->runStep(new Action('grabFromCurrentUrl', func_get_args()));
     }
 
 
@@ -828,7 +831,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeCheckboxIsChecked()
      */
     public function canSeeCheckboxIsChecked($checkbox) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCheckboxIsChecked', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('seeCheckboxIsChecked', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -847,7 +850,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeCheckboxIsChecked()
      */
     public function seeCheckboxIsChecked($checkbox) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCheckboxIsChecked', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('seeCheckboxIsChecked', func_get_args()));
     }
 
 
@@ -868,7 +871,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSeeCheckboxIsChecked()
      */
     public function cantSeeCheckboxIsChecked($checkbox) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCheckboxIsChecked', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('dontSeeCheckboxIsChecked', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -886,7 +889,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSeeCheckboxIsChecked()
      */
     public function dontSeeCheckboxIsChecked($checkbox) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeCheckboxIsChecked', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('dontSeeCheckboxIsChecked', func_get_args()));
     }
 
 
@@ -913,7 +916,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeInField()
      */
     public function canSeeInField($field, $value) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInField', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('seeInField', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -937,7 +940,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeInField()
      */
     public function seeInField($field, $value) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInField', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('seeInField', func_get_args()));
     }
 
 
@@ -964,7 +967,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSeeInField()
      */
     public function cantSeeInField($field, $value) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInField', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('dontSeeInField', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -988,7 +991,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSeeInField()
      */
     public function dontSeeInField($field, $value) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInField', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('dontSeeInField', func_get_args()));
     }
 
 
@@ -1058,7 +1061,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeInFormFields()
      */
     public function canSeeInFormFields($formSelector, $params) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInFormFields', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('seeInFormFields', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -1125,7 +1128,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeInFormFields()
      */
     public function seeInFormFields($formSelector, $params) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInFormFields', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('seeInFormFields', func_get_args()));
     }
 
 
@@ -1175,7 +1178,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSeeInFormFields()
      */
     public function cantSeeInFormFields($formSelector, $params) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInFormFields', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('dontSeeInFormFields', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -1222,7 +1225,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSeeInFormFields()
      */
     public function dontSeeInFormFields($formSelector, $params) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInFormFields', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('dontSeeInFormFields', func_get_args()));
     }
 
 
@@ -1401,7 +1404,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::submitForm()
      */
     public function submitForm($selector, $params, $button = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('submitForm', func_get_args()));
+        return $this->getScenario()->runStep(new Action('submitForm', func_get_args()));
     }
 
 
@@ -1422,7 +1425,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::fillField()
      */
     public function fillField($field, $value) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('fillField', func_get_args()));
+        return $this->getScenario()->runStep(new Action('fillField', func_get_args()));
     }
 
 
@@ -1461,7 +1464,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::selectOption()
      */
     public function selectOption($select, $option) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('selectOption', func_get_args()));
+        return $this->getScenario()->runStep(new Action('selectOption', func_get_args()));
     }
 
 
@@ -1480,7 +1483,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::checkOption()
      */
     public function checkOption($option) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('checkOption', func_get_args()));
+        return $this->getScenario()->runStep(new Action('checkOption', func_get_args()));
     }
 
 
@@ -1499,7 +1502,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::uncheckOption()
      */
     public function uncheckOption($option) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('uncheckOption', func_get_args()));
+        return $this->getScenario()->runStep(new Action('uncheckOption', func_get_args()));
     }
 
 
@@ -1520,7 +1523,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::attachFile()
      */
     public function attachFile($field, $filename) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('attachFile', func_get_args()));
+        return $this->getScenario()->runStep(new Action('attachFile', func_get_args()));
     }
 
 
@@ -1537,7 +1540,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::sendAjaxGetRequest()
      */
     public function sendAjaxGetRequest($uri, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('sendAjaxGetRequest', func_get_args()));
+        return $this->getScenario()->runStep(new Action('sendAjaxGetRequest', func_get_args()));
     }
 
 
@@ -1565,7 +1568,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::sendAjaxPostRequest()
      */
     public function sendAjaxPostRequest($uri, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('sendAjaxPostRequest', func_get_args()));
+        return $this->getScenario()->runStep(new Action('sendAjaxPostRequest', func_get_args()));
     }
 
 
@@ -1591,7 +1594,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::sendAjaxRequest()
      */
     public function sendAjaxRequest($method, $uri, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('sendAjaxRequest', func_get_args()));
+        return $this->getScenario()->runStep(new Action('sendAjaxRequest', func_get_args()));
     }
 
 
@@ -1616,7 +1619,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::grabTextFrom()
      */
     public function grabTextFrom($cssOrXPathOrRegex) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabTextFrom', func_get_args()));
+        return $this->getScenario()->runStep(new Action('grabTextFrom', func_get_args()));
     }
 
 
@@ -1640,7 +1643,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::grabAttributeFrom()
      */
     public function grabAttributeFrom($cssOrXpath, $attribute) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabAttributeFrom', func_get_args()));
+        return $this->getScenario()->runStep(new Action('grabAttributeFrom', func_get_args()));
     }
 
 
@@ -1672,7 +1675,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::grabMultiple()
      */
     public function grabMultiple($cssOrXpath, $attribute = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabMultiple', func_get_args()));
+        return $this->getScenario()->runStep(new Action('grabMultiple', func_get_args()));
     }
 
 
@@ -1685,7 +1688,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::grabValueFrom()
      */
     public function grabValueFrom($field) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabValueFrom', func_get_args()));
+        return $this->getScenario()->runStep(new Action('grabValueFrom', func_get_args()));
     }
 
 
@@ -1709,7 +1712,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::setCookie()
      */
     public function setCookie($name, $val, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('setCookie', func_get_args()));
+        return $this->getScenario()->runStep(new Action('setCookie', func_get_args()));
     }
 
 
@@ -1726,7 +1729,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::grabCookie()
      */
     public function grabCookie($cookie, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabCookie', func_get_args()));
+        return $this->getScenario()->runStep(new Action('grabCookie', func_get_args()));
     }
 
 
@@ -1741,7 +1744,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::grabPageSource()
      */
     public function grabPageSource() {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabPageSource', func_get_args()));
+        return $this->getScenario()->runStep(new Action('grabPageSource', func_get_args()));
     }
 
 
@@ -1764,7 +1767,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeCookie()
      */
     public function canSeeCookie($cookie, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCookie', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('seeCookie', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -1784,7 +1787,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeCookie()
      */
     public function seeCookie($cookie, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCookie', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('seeCookie', func_get_args()));
     }
 
 
@@ -1802,7 +1805,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSeeCookie()
      */
     public function cantSeeCookie($cookie, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCookie', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('dontSeeCookie', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -1817,7 +1820,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSeeCookie()
      */
     public function dontSeeCookie($cookie, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeCookie', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('dontSeeCookie', func_get_args()));
     }
 
 
@@ -1834,7 +1837,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::resetCookie()
      */
     public function resetCookie($name, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('resetCookie', func_get_args()));
+        return $this->getScenario()->runStep(new Action('resetCookie', func_get_args()));
     }
 
 
@@ -1863,7 +1866,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeElement()
      */
     public function canSeeElement($selector, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeElement', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('seeElement', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -1889,7 +1892,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeElement()
      */
     public function seeElement($selector, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeElement', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('seeElement', func_get_args()));
     }
 
 
@@ -1914,7 +1917,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSeeElement()
      */
     public function cantSeeElement($selector, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeElement', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('dontSeeElement', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -1936,7 +1939,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSeeElement()
      */
     public function dontSeeElement($selector, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeElement', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('dontSeeElement', func_get_args()));
     }
 
 
@@ -1957,7 +1960,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeNumberOfElements()
      */
     public function canSeeNumberOfElements($selector, $expected) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeNumberOfElements', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('seeNumberOfElements', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -1975,7 +1978,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeNumberOfElements()
      */
     public function seeNumberOfElements($selector, $expected) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeNumberOfElements', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('seeNumberOfElements', func_get_args()));
     }
 
 
@@ -1998,7 +2001,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeOptionIsSelected()
      */
     public function canSeeOptionIsSelected($selector, $optionText) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeOptionIsSelected', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('seeOptionIsSelected', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -2018,7 +2021,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeOptionIsSelected()
      */
     public function seeOptionIsSelected($selector, $optionText) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeOptionIsSelected', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('seeOptionIsSelected', func_get_args()));
     }
 
 
@@ -2041,7 +2044,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSeeOptionIsSelected()
      */
     public function cantSeeOptionIsSelected($selector, $optionText) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeOptionIsSelected', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('dontSeeOptionIsSelected', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -2061,7 +2064,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSeeOptionIsSelected()
      */
     public function dontSeeOptionIsSelected($selector, $optionText) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeOptionIsSelected', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('dontSeeOptionIsSelected', func_get_args()));
     }
 
 
@@ -2073,7 +2076,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::seePageNotFound()
      */
     public function canSeePageNotFound() {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seePageNotFound', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('seePageNotFound', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -2082,7 +2085,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::seePageNotFound()
      */
     public function seePageNotFound() {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seePageNotFound', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('seePageNotFound', func_get_args()));
     }
 
 
@@ -2104,7 +2107,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeResponseCodeIs()
      */
     public function canSeeResponseCodeIs($code) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeResponseCodeIs', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('seeResponseCodeIs', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -2123,7 +2126,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeResponseCodeIs()
      */
     public function seeResponseCodeIs($code) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeResponseCodeIs', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('seeResponseCodeIs', func_get_args()));
     }
 
 
@@ -2144,7 +2147,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSeeResponseCodeIs()
      */
     public function cantSeeResponseCodeIs($code) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeResponseCodeIs', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('dontSeeResponseCodeIs', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -2162,7 +2165,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSeeResponseCodeIs()
      */
     public function dontSeeResponseCodeIs($code) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeResponseCodeIs', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('dontSeeResponseCodeIs', func_get_args()));
     }
 
 
@@ -2184,7 +2187,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeInTitle()
      */
     public function canSeeInTitle($title) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInTitle', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('seeInTitle', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -2203,7 +2206,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeInTitle()
      */
     public function seeInTitle($title) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInTitle', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('seeInTitle', func_get_args()));
     }
 
 
@@ -2219,7 +2222,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSeeInTitle()
      */
     public function cantSeeInTitle($title) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInTitle', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('dontSeeInTitle', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -2232,7 +2235,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSeeInTitle()
      */
     public function dontSeeInTitle($title) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInTitle', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('dontSeeInTitle', func_get_args()));
     }
 
 
@@ -2256,7 +2259,7 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::switchToIframe()
      */
     public function switchToIframe($name) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('switchToIframe', func_get_args()));
+        return $this->getScenario()->runStep(new Action('switchToIframe', func_get_args()));
     }
 
 
@@ -2269,6 +2272,6 @@ trait AcceptanceTesterActions
      * @see \Codeception\Lib\InnerBrowser::moveBack()
      */
     public function moveBack($numberOfSteps = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('moveBack', func_get_args()));
+        return $this->getScenario()->runStep(new Action('moveBack', func_get_args()));
     }
 }

tests/_support/_generated/FunctionalTesterActions.php

@@ -5,8 +5,11 @@ namespace _generated;
 // You should not change it manually as it will be overwritten on next build
 // @codingStandardsIgnoreFile
 
+use Codeception\Step\Action;
+use Codeception\Step\Assertion;
+use Codeception\Step\Condition;
+use Codeception\Step\ConditionalAssertion;
 use Helper\Functional;
-use Codeception\Module\Laravel5;
 
 trait FunctionalTesterActions
 {
@@ -25,7 +28,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Module\Laravel5::getApplication()
      */
     public function getApplication() {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('getApplication', func_get_args()));
+        return $this->getScenario()->runStep(new Action('getApplication', func_get_args()));
     }
 
 
@@ -36,7 +39,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Module\Laravel5::setApplication()
      */
     public function setApplication($app) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('setApplication', func_get_args()));
+        return $this->getScenario()->runStep(new Action('setApplication', func_get_args()));
     }
 
 
@@ -53,7 +56,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Module\Laravel5::disableMiddleware()
      */
     public function disableMiddleware() {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('disableMiddleware', func_get_args()));
+        return $this->getScenario()->runStep(new Action('disableMiddleware', func_get_args()));
     }
 
 
@@ -70,7 +73,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Module\Laravel5::disableEvents()
      */
     public function disableEvents() {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('disableEvents', func_get_args()));
+        return $this->getScenario()->runStep(new Action('disableEvents', func_get_args()));
     }
 
 
@@ -92,7 +95,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Module\Laravel5::seeEventTriggered()
      */
     public function canSeeEventTriggered($events) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeEventTriggered', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('seeEventTriggered', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -111,7 +114,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Module\Laravel5::seeEventTriggered()
      */
     public function seeEventTriggered($events) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeEventTriggered', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('seeEventTriggered', func_get_args()));
     }
 
 
@@ -133,7 +136,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Module\Laravel5::dontSeeEventTriggered()
      */
     public function cantSeeEventTriggered($events) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeEventTriggered', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('dontSeeEventTriggered', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -152,7 +155,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Module\Laravel5::dontSeeEventTriggered()
      */
     public function dontSeeEventTriggered($events) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeEventTriggered', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('dontSeeEventTriggered', func_get_args()));
     }
 
 
@@ -172,7 +175,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Module\Laravel5::amOnRoute()
      */
     public function amOnRoute($routeName, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Condition('amOnRoute', func_get_args()));
+        return $this->getScenario()->runStep(new Condition('amOnRoute', func_get_args()));
     }
 
 
@@ -191,7 +194,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Module\Laravel5::seeCurrentRouteIs()
      */
     public function canSeeCurrentRouteIs($routeName) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCurrentRouteIs', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('seeCurrentRouteIs', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -207,7 +210,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Module\Laravel5::seeCurrentRouteIs()
      */
     public function seeCurrentRouteIs($routeName) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCurrentRouteIs', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('seeCurrentRouteIs', func_get_args()));
     }
 
 
@@ -227,7 +230,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Module\Laravel5::amOnAction()
      */
     public function amOnAction($action, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Condition('amOnAction', func_get_args()));
+        return $this->getScenario()->runStep(new Condition('amOnAction', func_get_args()));
     }
 
 
@@ -247,7 +250,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Module\Laravel5::seeCurrentActionIs()
      */
     public function canSeeCurrentActionIs($action) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCurrentActionIs', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('seeCurrentActionIs', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -264,7 +267,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Module\Laravel5::seeCurrentActionIs()
      */
     public function seeCurrentActionIs($action) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCurrentActionIs', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('seeCurrentActionIs', func_get_args()));
     }
 
 
@@ -287,7 +290,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Module\Laravel5::seeInSession()
      */
     public function canSeeInSession($key, $value = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInSession', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('seeInSession', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -307,7 +310,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Module\Laravel5::seeInSession()
      */
     public function seeInSession($key, $value = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInSession', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('seeInSession', func_get_args()));
     }
 
 
@@ -329,7 +332,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Module\Laravel5::seeSessionHasValues()
      */
     public function canSeeSessionHasValues($bindings) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeSessionHasValues', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('seeSessionHasValues', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -348,7 +351,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Module\Laravel5::seeSessionHasValues()
      */
     public function seeSessionHasValues($bindings) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeSessionHasValues', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('seeSessionHasValues', func_get_args()));
     }
 
 
@@ -368,7 +371,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Module\Laravel5::seeFormHasErrors()
      */
     public function canSeeFormHasErrors() {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeFormHasErrors', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('seeFormHasErrors', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -385,7 +388,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Module\Laravel5::seeFormHasErrors()
      */
     public function seeFormHasErrors() {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeFormHasErrors', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('seeFormHasErrors', func_get_args()));
     }
 
 
@@ -405,7 +408,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Module\Laravel5::dontSeeFormErrors()
      */
     public function cantSeeFormErrors() {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeFormErrors', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('dontSeeFormErrors', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -422,7 +425,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Module\Laravel5::dontSeeFormErrors()
      */
     public function dontSeeFormErrors() {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeFormErrors', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('dontSeeFormErrors', func_get_args()));
     }
 
 
@@ -446,7 +449,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Module\Laravel5::seeFormErrorMessages()
      */
     public function canSeeFormErrorMessages($bindings) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeFormErrorMessages', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('seeFormErrorMessages', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -467,7 +470,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Module\Laravel5::seeFormErrorMessages()
      */
     public function seeFormErrorMessages($bindings) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeFormErrorMessages', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('seeFormErrorMessages', func_get_args()));
     }
 
 
@@ -494,7 +497,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Module\Laravel5::seeFormErrorMessage()
      */
     public function canSeeFormErrorMessage($key, $expectedErrorMessage = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeFormErrorMessage', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('seeFormErrorMessage', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -518,7 +521,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Module\Laravel5::seeFormErrorMessage()
      */
     public function seeFormErrorMessage($key, $expectedErrorMessage = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeFormErrorMessage', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('seeFormErrorMessage', func_get_args()));
     }
 
 
@@ -546,7 +549,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Module\Laravel5::amLoggedAs()
      */
     public function amLoggedAs($user, $driver = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Condition('amLoggedAs', func_get_args()));
+        return $this->getScenario()->runStep(new Condition('amLoggedAs', func_get_args()));
     }
 
 
@@ -557,7 +560,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Module\Laravel5::logout()
      */
     public function logout() {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('logout', func_get_args()));
+        return $this->getScenario()->runStep(new Action('logout', func_get_args()));
     }
 
 
@@ -569,7 +572,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Module\Laravel5::seeAuthentication()
      */
     public function canSeeAuthentication() {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeAuthentication', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('seeAuthentication', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -578,7 +581,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Module\Laravel5::seeAuthentication()
      */
     public function seeAuthentication() {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeAuthentication', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('seeAuthentication', func_get_args()));
     }
 
 
@@ -590,7 +593,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Module\Laravel5::dontSeeAuthentication()
      */
     public function cantSeeAuthentication() {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeAuthentication', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('dontSeeAuthentication', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -599,7 +602,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Module\Laravel5::dontSeeAuthentication()
      */
     public function dontSeeAuthentication() {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeAuthentication', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('dontSeeAuthentication', func_get_args()));
     }
 
 
@@ -629,7 +632,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Module\Laravel5::grabService()
      */
     public function grabService($class) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabService', func_get_args()));
+        return $this->getScenario()->runStep(new Action('grabService', func_get_args()));
     }
 
 
@@ -651,7 +654,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Module\Laravel5::haveRecord()
      */
     public function haveRecord($tableName, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('haveRecord', func_get_args()));
+        return $this->getScenario()->runStep(new Action('haveRecord', func_get_args()));
     }
 
 
@@ -673,7 +676,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Module\Laravel5::seeRecord()
      */
     public function canSeeRecord($tableName, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeRecord', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('seeRecord', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -692,7 +695,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Module\Laravel5::seeRecord()
      */
     public function seeRecord($tableName, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeRecord', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('seeRecord', func_get_args()));
     }
 
 
@@ -714,7 +717,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Module\Laravel5::dontSeeRecord()
      */
     public function cantSeeRecord($tableName, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeRecord', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('dontSeeRecord', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -733,7 +736,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Module\Laravel5::dontSeeRecord()
      */
     public function dontSeeRecord($tableName, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeRecord', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('dontSeeRecord', func_get_args()));
     }
 
 
@@ -755,7 +758,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Module\Laravel5::grabRecord()
      */
     public function grabRecord($tableName, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabRecord', func_get_args()));
+        return $this->getScenario()->runStep(new Action('grabRecord', func_get_args()));
     }
 
 
@@ -766,7 +769,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Module\Laravel5::haveModel()
      */
     public function haveModel($model, $attributes = null, $name = null, $times = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('haveModel', func_get_args()));
+        return $this->getScenario()->runStep(new Action('haveModel', func_get_args()));
     }
 
 
@@ -794,7 +797,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Module\Laravel5::createModel()
      */
     public function createModel($model, $attributes = null, $name = null, $times = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('createModel', func_get_args()));
+        return $this->getScenario()->runStep(new Action('createModel', func_get_args()));
     }
 
 
@@ -822,7 +825,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Module\Laravel5::makeModel()
      */
     public function makeModel($model, $attributes = null, $name = null, $times = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('makeModel', func_get_args()));
+        return $this->getScenario()->runStep(new Action('makeModel', func_get_args()));
     }
 
 
@@ -836,7 +839,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::amHttpAuthenticated()
      */
     public function amHttpAuthenticated($username, $password) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Condition('amHttpAuthenticated', func_get_args()));
+        return $this->getScenario()->runStep(new Condition('amHttpAuthenticated', func_get_args()));
     }
 
 
@@ -857,7 +860,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::amOnPage()
      */
     public function amOnPage($page) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Condition('amOnPage', func_get_args()));
+        return $this->getScenario()->runStep(new Condition('amOnPage', func_get_args()));
     }
 
 
@@ -896,7 +899,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::click()
      */
     public function click($link, $context = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('click', func_get_args()));
+        return $this->getScenario()->runStep(new Action('click', func_get_args()));
     }
 
 
@@ -935,8 +938,9 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::see()
      */
     public function canSee($text, $selector = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('see', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('see', func_get_args()));
     }
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -971,7 +975,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::see()
      */
     public function see($text, $selector = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('see', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('see', func_get_args()));
     }
 
 
@@ -1008,7 +1012,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSee()
      */
     public function cantSee($text, $selector = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSee', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('dontSee', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -1042,7 +1046,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSee()
      */
     public function dontSee($text, $selector = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSee', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('dontSee', func_get_args()));
     }
 
 
@@ -1062,7 +1066,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeInSource()
      */
     public function canSeeInSource($raw) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInSource', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('seeInSource', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -1079,7 +1083,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeInSource()
      */
     public function seeInSource($raw) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInSource', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('seeInSource', func_get_args()));
     }
 
 
@@ -1099,7 +1103,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSeeInSource()
      */
     public function cantSeeInSource($raw) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInSource', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('dontSeeInSource', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -1116,7 +1120,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSeeInSource()
      */
     public function dontSeeInSource($raw) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInSource', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('dontSeeInSource', func_get_args()));
     }
 
 
@@ -1139,7 +1143,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeLink()
      */
     public function canSeeLink($text, $url = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeLink', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('seeLink', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -1159,7 +1163,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeLink()
      */
     public function seeLink($text, $url = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeLink', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('seeLink', func_get_args()));
     }
 
 
@@ -1182,7 +1186,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSeeLink()
      */
     public function cantSeeLink($text, $url = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeLink', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('dontSeeLink', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -1202,7 +1206,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSeeLink()
      */
     public function dontSeeLink($text, $url = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeLink', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('dontSeeLink', func_get_args()));
     }
 
 
@@ -1225,7 +1229,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeInCurrentUrl()
      */
     public function canSeeInCurrentUrl($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInCurrentUrl', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('seeInCurrentUrl', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -1245,7 +1249,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeInCurrentUrl()
      */
     public function seeInCurrentUrl($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInCurrentUrl', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('seeInCurrentUrl', func_get_args()));
     }
 
 
@@ -1265,7 +1269,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSeeInCurrentUrl()
      */
     public function cantSeeInCurrentUrl($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInCurrentUrl', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('dontSeeInCurrentUrl', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -1282,7 +1286,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSeeInCurrentUrl()
      */
     public function dontSeeInCurrentUrl($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInCurrentUrl', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('dontSeeInCurrentUrl', func_get_args()));
     }
 
 
@@ -1304,7 +1308,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeCurrentUrlEquals()
      */
     public function canSeeCurrentUrlEquals($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCurrentUrlEquals', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('seeCurrentUrlEquals', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -1323,7 +1327,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeCurrentUrlEquals()
      */
     public function seeCurrentUrlEquals($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCurrentUrlEquals', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('seeCurrentUrlEquals', func_get_args()));
     }
 
 
@@ -1345,7 +1349,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSeeCurrentUrlEquals()
      */
     public function cantSeeCurrentUrlEquals($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCurrentUrlEquals', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('dontSeeCurrentUrlEquals', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -1364,7 +1368,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSeeCurrentUrlEquals()
      */
     public function dontSeeCurrentUrlEquals($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeCurrentUrlEquals', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('dontSeeCurrentUrlEquals', func_get_args()));
     }
 
 
@@ -1385,7 +1389,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeCurrentUrlMatches()
      */
     public function canSeeCurrentUrlMatches($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCurrentUrlMatches', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('seeCurrentUrlMatches', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -1403,7 +1407,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeCurrentUrlMatches()
      */
     public function seeCurrentUrlMatches($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCurrentUrlMatches', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('seeCurrentUrlMatches', func_get_args()));
     }
 
 
@@ -1424,7 +1428,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSeeCurrentUrlMatches()
      */
     public function cantSeeCurrentUrlMatches($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCurrentUrlMatches', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('dontSeeCurrentUrlMatches', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -1442,7 +1446,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSeeCurrentUrlMatches()
      */
     public function dontSeeCurrentUrlMatches($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeCurrentUrlMatches', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('dontSeeCurrentUrlMatches', func_get_args()));
     }
 
 
@@ -1465,7 +1469,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::grabFromCurrentUrl()
      */
     public function grabFromCurrentUrl($uri = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabFromCurrentUrl', func_get_args()));
+        return $this->getScenario()->runStep(new Action('grabFromCurrentUrl', func_get_args()));
     }
 
 
@@ -1487,7 +1491,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeCheckboxIsChecked()
      */
     public function canSeeCheckboxIsChecked($checkbox) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCheckboxIsChecked', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('seeCheckboxIsChecked', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -1506,7 +1510,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeCheckboxIsChecked()
      */
     public function seeCheckboxIsChecked($checkbox) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCheckboxIsChecked', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('seeCheckboxIsChecked', func_get_args()));
     }
 
 
@@ -1527,7 +1531,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSeeCheckboxIsChecked()
      */
     public function cantSeeCheckboxIsChecked($checkbox) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCheckboxIsChecked', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('dontSeeCheckboxIsChecked', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -1545,7 +1549,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSeeCheckboxIsChecked()
      */
     public function dontSeeCheckboxIsChecked($checkbox) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeCheckboxIsChecked', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('dontSeeCheckboxIsChecked', func_get_args()));
     }
 
 
@@ -1572,7 +1576,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeInField()
      */
     public function canSeeInField($field, $value) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInField', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('seeInField', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -1596,7 +1600,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeInField()
      */
     public function seeInField($field, $value) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInField', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('seeInField', func_get_args()));
     }
 
 
@@ -1623,7 +1627,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSeeInField()
      */
     public function cantSeeInField($field, $value) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInField', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('dontSeeInField', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -1647,7 +1651,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSeeInField()
      */
     public function dontSeeInField($field, $value) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInField', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('dontSeeInField', func_get_args()));
     }
 
 
@@ -1717,7 +1721,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeInFormFields()
      */
     public function canSeeInFormFields($formSelector, $params) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInFormFields', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('seeInFormFields', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -1784,7 +1788,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeInFormFields()
      */
     public function seeInFormFields($formSelector, $params) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInFormFields', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('seeInFormFields', func_get_args()));
     }
 
 
@@ -1834,7 +1838,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSeeInFormFields()
      */
     public function cantSeeInFormFields($formSelector, $params) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInFormFields', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('dontSeeInFormFields', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -1881,7 +1885,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSeeInFormFields()
      */
     public function dontSeeInFormFields($formSelector, $params) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInFormFields', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('dontSeeInFormFields', func_get_args()));
     }
 
 
@@ -2060,7 +2064,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::submitForm()
      */
     public function submitForm($selector, $params, $button = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('submitForm', func_get_args()));
+        return $this->getScenario()->runStep(new Action('submitForm', func_get_args()));
     }
 
 
@@ -2081,7 +2085,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::fillField()
      */
     public function fillField($field, $value) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('fillField', func_get_args()));
+        return $this->getScenario()->runStep(new Action('fillField', func_get_args()));
     }
 
 
@@ -2111,7 +2115,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::selectOption()
      */
     public function selectOption($select, $option) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('selectOption', func_get_args()));
+        return $this->getScenario()->runStep(new Action('selectOption', func_get_args()));
     }
 
 
@@ -2130,7 +2134,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::checkOption()
      */
     public function checkOption($option) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('checkOption', func_get_args()));
+        return $this->getScenario()->runStep(new Action('checkOption', func_get_args()));
     }
 
 
@@ -2149,7 +2153,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::uncheckOption()
      */
     public function uncheckOption($option) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('uncheckOption', func_get_args()));
+        return $this->getScenario()->runStep(new Action('uncheckOption', func_get_args()));
     }
 
 
@@ -2170,7 +2174,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::attachFile()
      */
     public function attachFile($field, $filename) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('attachFile', func_get_args()));
+        return $this->getScenario()->runStep(new Action('attachFile', func_get_args()));
     }
 
 
@@ -2187,7 +2191,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::sendAjaxGetRequest()
      */
     public function sendAjaxGetRequest($uri, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('sendAjaxGetRequest', func_get_args()));
+        return $this->getScenario()->runStep(new Action('sendAjaxGetRequest', func_get_args()));
     }
 
 
@@ -2215,7 +2219,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::sendAjaxPostRequest()
      */
     public function sendAjaxPostRequest($uri, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('sendAjaxPostRequest', func_get_args()));
+        return $this->getScenario()->runStep(new Action('sendAjaxPostRequest', func_get_args()));
     }
 
 
@@ -2241,7 +2245,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::sendAjaxRequest()
      */
     public function sendAjaxRequest($method, $uri, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('sendAjaxRequest', func_get_args()));
+        return $this->getScenario()->runStep(new Action('sendAjaxRequest', func_get_args()));
     }
 
 
@@ -2265,7 +2269,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::grabTextFrom()
      */
     public function grabTextFrom($cssOrXPathOrRegex) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabTextFrom', func_get_args()));
+        return $this->getScenario()->runStep(new Action('grabTextFrom', func_get_args()));
     }
 
 
@@ -2289,7 +2293,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::grabAttributeFrom()
      */
     public function grabAttributeFrom($cssOrXpath, $attribute) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabAttributeFrom', func_get_args()));
+        return $this->getScenario()->runStep(new Action('grabAttributeFrom', func_get_args()));
     }
 
 
@@ -2321,7 +2325,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::grabMultiple()
      */
     public function grabMultiple($cssOrXpath, $attribute = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabMultiple', func_get_args()));
+        return $this->getScenario()->runStep(new Action('grabMultiple', func_get_args()));
     }
 
 
@@ -2334,7 +2338,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::grabValueFrom()
      */
     public function grabValueFrom($field) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabValueFrom', func_get_args()));
+        return $this->getScenario()->runStep(new Action('grabValueFrom', func_get_args()));
     }
 
 
@@ -2358,7 +2362,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::setCookie()
      */
     public function setCookie($name, $val, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('setCookie', func_get_args()));
+        return $this->getScenario()->runStep(new Action('setCookie', func_get_args()));
     }
 
 
@@ -2375,7 +2379,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::grabCookie()
      */
     public function grabCookie($cookie, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabCookie', func_get_args()));
+        return $this->getScenario()->runStep(new Action('grabCookie', func_get_args()));
     }
 
 
@@ -2398,7 +2402,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeCookie()
      */
     public function canSeeCookie($cookie, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCookie', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('seeCookie', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -2418,7 +2422,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeCookie()
      */
     public function seeCookie($cookie, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCookie', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('seeCookie', func_get_args()));
     }
 
 
@@ -2436,7 +2440,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSeeCookie()
      */
     public function cantSeeCookie($cookie, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCookie', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('dontSeeCookie', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -2451,7 +2455,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSeeCookie()
      */
     public function dontSeeCookie($cookie, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeCookie', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('dontSeeCookie', func_get_args()));
     }
 
 
@@ -2468,7 +2472,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::resetCookie()
      */
     public function resetCookie($name, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('resetCookie', func_get_args()));
+        return $this->getScenario()->runStep(new Action('resetCookie', func_get_args()));
     }
 
 
@@ -2497,7 +2501,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeElement()
      */
     public function canSeeElement($selector, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeElement', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('seeElement', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -2523,7 +2527,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeElement()
      */
     public function seeElement($selector, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeElement', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('seeElement', func_get_args()));
     }
 
 
@@ -2548,7 +2552,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSeeElement()
      */
     public function cantSeeElement($selector, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeElement', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('dontSeeElement', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -2570,7 +2574,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSeeElement()
      */
     public function dontSeeElement($selector, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeElement', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('dontSeeElement', func_get_args()));
     }
 
 
@@ -2593,7 +2597,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeNumberOfElements()
      */
     public function canSeeNumberOfElements($selector, $expected) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeNumberOfElements', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('seeNumberOfElements', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -2613,7 +2617,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeNumberOfElements()
      */
     public function seeNumberOfElements($selector, $expected) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeNumberOfElements', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('seeNumberOfElements', func_get_args()));
     }
 
 
@@ -2636,7 +2640,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeOptionIsSelected()
      */
     public function canSeeOptionIsSelected($selector, $optionText) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeOptionIsSelected', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('seeOptionIsSelected', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -2656,7 +2660,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeOptionIsSelected()
      */
     public function seeOptionIsSelected($selector, $optionText) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeOptionIsSelected', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('seeOptionIsSelected', func_get_args()));
     }
 
 
@@ -2679,7 +2683,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSeeOptionIsSelected()
      */
     public function cantSeeOptionIsSelected($selector, $optionText) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeOptionIsSelected', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('dontSeeOptionIsSelected', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -2699,7 +2703,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSeeOptionIsSelected()
      */
     public function dontSeeOptionIsSelected($selector, $optionText) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeOptionIsSelected', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('dontSeeOptionIsSelected', func_get_args()));
     }
 
 
@@ -2711,7 +2715,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::seePageNotFound()
      */
     public function canSeePageNotFound() {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seePageNotFound', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('seePageNotFound', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -2720,7 +2724,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::seePageNotFound()
      */
     public function seePageNotFound() {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seePageNotFound', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('seePageNotFound', func_get_args()));
     }
 
 
@@ -2736,7 +2740,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeResponseCodeIs()
      */
     public function canSeeResponseCodeIs($code) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeResponseCodeIs', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('seeResponseCodeIs', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -2749,7 +2753,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeResponseCodeIs()
      */
     public function seeResponseCodeIs($code) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeResponseCodeIs', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('seeResponseCodeIs', func_get_args()));
     }
 
 
@@ -2771,7 +2775,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeInTitle()
      */
     public function canSeeInTitle($title) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInTitle', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('seeInTitle', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -2790,7 +2794,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::seeInTitle()
      */
     public function seeInTitle($title) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInTitle', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('seeInTitle', func_get_args()));
     }
 
 
@@ -2806,7 +2810,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSeeInTitle()
      */
     public function cantSeeInTitle($title) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInTitle', func_get_args()));
+        return $this->getScenario()->runStep(new ConditionalAssertion('dontSeeInTitle', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
@@ -2819,7 +2823,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::dontSeeInTitle()
      */
     public function dontSeeInTitle($title) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInTitle', func_get_args()));
+        return $this->getScenario()->runStep(new Assertion('dontSeeInTitle', func_get_args()));
     }
 
 
@@ -2843,7 +2847,7 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::switchToIframe()
      */
     public function switchToIframe($name) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('switchToIframe', func_get_args()));
+        return $this->getScenario()->runStep(new Action('switchToIframe', func_get_args()));
     }
 
 
@@ -2856,6 +2860,6 @@ trait FunctionalTesterActions
      * @see \Codeception\Lib\InnerBrowser::moveBack()
      */
     public function moveBack($numberOfSteps = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('moveBack', func_get_args()));
+        return $this->getScenario()->runStep(new Action('moveBack', func_get_args()));
     }
 }

tests/_support/_generated/UnitTesterActions.php

@@ -5,6 +5,8 @@ namespace _generated;
 // You should not change it manually as it will be overwritten on next build
 // @codingStandardsIgnoreFile
 
+use Codeception\Step\Action;
+
 trait UnitTesterActions
 {
     /**
@@ -39,7 +41,7 @@ trait UnitTesterActions
      * @see \Codeception\Module\Asserts::assertEquals()
      */
     public function assertEquals($expected, $actual, $message = null, $delta = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertEquals', func_get_args()));
+        return $this->getScenario()->runStep(new Action('assertEquals', func_get_args()));
     }
 
 
@@ -69,7 +71,7 @@ trait UnitTesterActions
      * @see \Codeception\Module\Asserts::assertNotEquals()
      */
     public function assertNotEquals($expected, $actual, $message = null, $delta = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotEquals', func_get_args()));
+        return $this->getScenario()->runStep(new Action('assertNotEquals', func_get_args()));
     }
 
 
@@ -84,7 +86,7 @@ trait UnitTesterActions
      * @see \Codeception\Module\Asserts::assertSame()
      */
     public function assertSame($expected, $actual, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertSame', func_get_args()));
+        return $this->getScenario()->runStep(new Action('assertSame', func_get_args()));
     }
 
 
@@ -99,7 +101,7 @@ trait UnitTesterActions
      * @see \Codeception\Module\Asserts::assertNotSame()
      */
     public function assertNotSame($expected, $actual, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotSame', func_get_args()));
+        return $this->getScenario()->runStep(new Action('assertNotSame', func_get_args()));
     }
 
 
@@ -114,7 +116,7 @@ trait UnitTesterActions
      * @see \Codeception\Module\Asserts::assertGreaterThan()
      */
     public function assertGreaterThan($expected, $actual, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertGreaterThan', func_get_args()));
+        return $this->getScenario()->runStep(new Action('assertGreaterThan', func_get_args()));
     }
 
 
@@ -129,7 +131,7 @@ trait UnitTesterActions
      * @see \Codeception\Module\Asserts::assertGreaterThanOrEqual()
      */
     public function assertGreaterThanOrEqual($expected, $actual, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertGreaterThanOrEqual', func_get_args()));
+        return $this->getScenario()->runStep(new Action('assertGreaterThanOrEqual', func_get_args()));
     }
 
 
@@ -144,7 +146,7 @@ trait UnitTesterActions
      * @see \Codeception\Module\Asserts::assertLessThan()
      */
     public function assertLessThan($expected, $actual, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertLessThan', func_get_args()));
+        return $this->getScenario()->runStep(new Action('assertLessThan', func_get_args()));
     }
 
 
@@ -159,7 +161,7 @@ trait UnitTesterActions
      * @see \Codeception\Module\Asserts::assertLessThanOrEqual()
      */
     public function assertLessThanOrEqual($expected, $actual, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertLessThanOrEqual', func_get_args()));
+        return $this->getScenario()->runStep(new Action('assertLessThanOrEqual', func_get_args()));
     }
 
 
@@ -174,7 +176,7 @@ trait UnitTesterActions
      * @see \Codeception\Module\Asserts::assertContains()
      */
     public function assertContains($needle, $haystack, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertContains', func_get_args()));
+        return $this->getScenario()->runStep(new Action('assertContains', func_get_args()));
     }
 
 
@@ -189,7 +191,7 @@ trait UnitTesterActions
      * @see \Codeception\Module\Asserts::assertNotContains()
      */
     public function assertNotContains($needle, $haystack, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotContains', func_get_args()));
+        return $this->getScenario()->runStep(new Action('assertNotContains', func_get_args()));
     }
 
 
@@ -204,7 +206,7 @@ trait UnitTesterActions
      * @see \Codeception\Module\Asserts::assertRegExp()
      */
     public function assertRegExp($pattern, $string, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertRegExp', func_get_args()));
+        return $this->getScenario()->runStep(new Action('assertRegExp', func_get_args()));
     }
 
 
@@ -219,7 +221,7 @@ trait UnitTesterActions
      * @see \Codeception\Module\Asserts::assertNotRegExp()
      */
     public function assertNotRegExp($pattern, $string, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotRegExp', func_get_args()));
+        return $this->getScenario()->runStep(new Action('assertNotRegExp', func_get_args()));
     }
 
 
@@ -234,7 +236,7 @@ trait UnitTesterActions
      * @see \Codeception\Module\Asserts::assertStringStartsWith()
      */
     public function assertStringStartsWith($prefix, $string, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertStringStartsWith', func_get_args()));
+        return $this->getScenario()->runStep(new Action('assertStringStartsWith', func_get_args()));
     }
 
 
@@ -249,7 +251,7 @@ trait UnitTesterActions
      * @see \Codeception\Module\Asserts::assertStringStartsNotWith()
      */
     public function assertStringStartsNotWith($prefix, $string, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertStringStartsNotWith', func_get_args()));
+        return $this->getScenario()->runStep(new Action('assertStringStartsNotWith', func_get_args()));
     }
 
 
@@ -263,7 +265,7 @@ trait UnitTesterActions
      * @see \Codeception\Module\Asserts::assertEmpty()
      */
     public function assertEmpty($actual, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertEmpty', func_get_args()));
+        return $this->getScenario()->runStep(new Action('assertEmpty', func_get_args()));
     }
 
 
@@ -277,7 +279,7 @@ trait UnitTesterActions
      * @see \Codeception\Module\Asserts::assertNotEmpty()
      */
     public function assertNotEmpty($actual, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotEmpty', func_get_args()));
+        return $this->getScenario()->runStep(new Action('assertNotEmpty', func_get_args()));
     }
 
 
@@ -291,7 +293,7 @@ trait UnitTesterActions
      * @see \Codeception\Module\Asserts::assertNull()
      */
     public function assertNull($actual, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNull', func_get_args()));
+        return $this->getScenario()->runStep(new Action('assertNull', func_get_args()));
     }
 
 
@@ -305,7 +307,7 @@ trait UnitTesterActions
      * @see \Codeception\Module\Asserts::assertNotNull()
      */
     public function assertNotNull($actual, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotNull', func_get_args()));
+        return $this->getScenario()->runStep(new Action('assertNotNull', func_get_args()));
     }
 
 
@@ -319,7 +321,7 @@ trait UnitTesterActions
      * @see \Codeception\Module\Asserts::assertTrue()
      */
     public function assertTrue($condition, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertTrue', func_get_args()));
+        return $this->getScenario()->runStep(new Action('assertTrue', func_get_args()));
     }
 
 
@@ -333,7 +335,7 @@ trait UnitTesterActions
      * @see \Codeception\Module\Asserts::assertFalse()
      */
     public function assertFalse($condition, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertFalse', func_get_args()));
+        return $this->getScenario()->runStep(new Action('assertFalse', func_get_args()));
     }
 
 
@@ -347,7 +349,7 @@ trait UnitTesterActions
      * @see \Codeception\Module\Asserts::assertFileExists()
      */
     public function assertFileExists($filename, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertFileExists', func_get_args()));
+        return $this->getScenario()->runStep(new Action('assertFileExists', func_get_args()));
     }
 
 
@@ -361,7 +363,7 @@ trait UnitTesterActions
      * @see \Codeception\Module\Asserts::assertFileNotExists()
      */
     public function assertFileNotExists($filename, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertFileNotExists', func_get_args()));
+        return $this->getScenario()->runStep(new Action('assertFileNotExists', func_get_args()));
     }
 
 
@@ -374,7 +376,7 @@ trait UnitTesterActions
      * @see \Codeception\Module\Asserts::assertGreaterOrEquals()
      */
     public function assertGreaterOrEquals($expected, $actual, $description = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertGreaterOrEquals', func_get_args()));
+        return $this->getScenario()->runStep(new Action('assertGreaterOrEquals', func_get_args()));
     }
 
 
@@ -387,7 +389,7 @@ trait UnitTesterActions
      * @see \Codeception\Module\Asserts::assertLessOrEquals()
      */
     public function assertLessOrEquals($expected, $actual, $description = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertLessOrEquals', func_get_args()));
+        return $this->getScenario()->runStep(new Action('assertLessOrEquals', func_get_args()));
     }
 
 
@@ -399,7 +401,7 @@ trait UnitTesterActions
      * @see \Codeception\Module\Asserts::assertIsEmpty()
      */
     public function assertIsEmpty($actual, $description = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsEmpty', func_get_args()));
+        return $this->getScenario()->runStep(new Action('assertIsEmpty', func_get_args()));
     }
 
 
@@ -412,7 +414,7 @@ trait UnitTesterActions
      * @see \Codeception\Module\Asserts::assertArrayHasKey()
      */
     public function assertArrayHasKey($key, $actual, $description = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertArrayHasKey', func_get_args()));
+        return $this->getScenario()->runStep(new Action('assertArrayHasKey', func_get_args()));
     }
 
 
@@ -425,7 +427,7 @@ trait UnitTesterActions
      * @see \Codeception\Module\Asserts::assertArrayNotHasKey()
      */
     public function assertArrayNotHasKey($key, $actual, $description = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertArrayNotHasKey', func_get_args()));
+        return $this->getScenario()->runStep(new Action('assertArrayNotHasKey', func_get_args()));
     }
 
 
@@ -441,7 +443,7 @@ trait UnitTesterActions
      * @see \Codeception\Module\Asserts::assertArraySubset()
      */
     public function assertArraySubset($subset, $array, $strict = null, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertArraySubset', func_get_args()));
+        return $this->getScenario()->runStep(new Action('assertArraySubset', func_get_args()));
     }
 
 
@@ -454,7 +456,7 @@ trait UnitTesterActions
      * @see \Codeception\Module\Asserts::assertCount()
      */
     public function assertCount($expectedCount, $actual, $description = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertCount', func_get_args()));
+        return $this->getScenario()->runStep(new Action('assertCount', func_get_args()));
     }
 
 
@@ -467,7 +469,7 @@ trait UnitTesterActions
      * @see \Helper\ExtraAsserts::assertInstanceOf()
      */
     public function assertInstanceOf($expected, $actual, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertInstanceOf', func_get_args()));
+        return $this->getScenario()->runStep(new Action('assertInstanceOf', func_get_args()));
     }
 
 
@@ -480,7 +482,7 @@ trait UnitTesterActions
      * @see \Codeception\Module\Asserts::assertNotInstanceOf()
      */
     public function assertNotInstanceOf($class, $actual, $description = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotInstanceOf', func_get_args()));
+        return $this->getScenario()->runStep(new Action('assertNotInstanceOf', func_get_args()));
     }
 
 
@@ -493,7 +495,7 @@ trait UnitTesterActions
      * @see \Codeception\Module\Asserts::assertInternalType()
      */
     public function assertInternalType($type, $actual, $description = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertInternalType', func_get_args()));
+        return $this->getScenario()->runStep(new Action('assertInternalType', func_get_args()));
     }
 
 
@@ -506,7 +508,7 @@ trait UnitTesterActions
      * @see \Codeception\Module\Asserts::fail()
      */
     public function fail($message) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('fail', func_get_args()));
+        return $this->getScenario()->runStep(new Action('fail', func_get_args()));
     }
 
 
@@ -540,7 +542,7 @@ trait UnitTesterActions
      * @see \Codeception\Module\Asserts::expectException()
      */
     public function expectException($exception, $callback) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('expectException', func_get_args()));
+        return $this->getScenario()->runStep(new Action('expectException', func_get_args()));
     }
 
 
@@ -551,7 +553,7 @@ trait UnitTesterActions
      * @see \Helper\ExtraAsserts::assertCanSave()
      */
     public function assertCanSave($model) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertCanSave', func_get_args()));
+        return $this->getScenario()->runStep(new Action('assertCanSave', func_get_args()));
     }
 
 
@@ -562,7 +564,7 @@ trait UnitTesterActions
      * @see \Helper\ExtraAsserts::assertCanNotSave()
      */
     public function assertCanNotSave($model, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertCanNotSave', func_get_args()));
+        return $this->getScenario()->runStep(new Action('assertCanNotSave', func_get_args()));
     }
 
 
@@ -573,6 +575,6 @@ trait UnitTesterActions
      * @see \Helper\ExtraAsserts::haveNotFinishedTest()
      */
     public function haveNotFinishedTest() {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('haveNotFinishedTest', func_get_args()));
+        return $this->getScenario()->runStep(new Action('haveNotFinishedTest', func_get_args()));
     }
 }

tests/unit/AbcParser/Application/PersonFactoryTest.php

@@ -2,11 +2,12 @@
 namespace Tests\Unit\AbcParser\Application;
 
 use Enzyme\Axiom\Atoms\StringAtom;
+use PHPUnit_Framework_TestCase;
 use XaiCorp\AbcParser\Application\PersonFactory;
 use XaiCorp\AbcParser\Domain\Atoms\EmailAtom;
 use XaiCorp\AbcParser\Domain\Core\Person;
 
-class PersonFactoryTest extends \PHPUnit_Framework_TestCase
+class PersonFactoryTest extends PHPUnit_Framework_TestCase
 {
 
     public function testCreate()

tests/unit/AbcParser/Application/UseCases/ExtractTuneFromCollectionTest.php

@@ -1,9 +1,10 @@
 <?php
 
+use Codeception\Test\Unit;
 use XaiCorp\AbcParser\Application\UseCases\ExtractTuneFromCollection;
 use XaiCorp\AbcParser\Application\UseCases\ImportAbcFile;
 
-class ExtractTuneFromCollectionTest extends \Codeception\Test\Unit
+class ExtractTuneFromCollectionTest extends Unit
 {
     /**
      * @param string $filename

tests/unit/AbcParser/Application/UseCases/ImportAbcFileTest.php

@@ -2,11 +2,12 @@
 
 namespace Tests\Unit\AbcParser\Application\UseCases;
 
+use Codeception\Test\Unit;
 use XaiCorp\AbcParser\Application\UseCases\ImportAbcFile;
 use XaiCorp\AbcParser\Domain\Core\TuneCollection;
 use XaiCorp\AbcParser\Domain\Modules\Interpreter\Builder;
 
-class ImportAbcFileTest extends \Codeception\Test\Unit
+class ImportAbcFileTest extends Unit
 {
 
     /**

tests/unit/AbcParser/Domain/Atoms/UnsignedIntegerAtomTest.php

@@ -9,10 +9,10 @@
 namespace Tests\Unit\AbcParser\Domain\Atoms;
 
 use Enzyme\Axiom\Atoms\AtomInterface;
-use Enzyme\Axiom\Exceptions\AtomException;
+use PHPUnit_Framework_TestCase;
 use XaiCorp\AbcParser\Domain\Atoms\UnsignedIntegerAtom;
 
-class UnsignedIntegerAtomTest extends \PHPUnit_Framework_TestCase
+class UnsignedIntegerAtomTest extends PHPUnit_Framework_TestCase
 {
     public function testCreateAtom()
     {

tests/unit/AbcParser/Domain/Core/PersonTest.php

@@ -9,10 +9,11 @@
 namespace Tests\Unit\AbcParser\Domain\Core;
 
 use Enzyme\Axiom\Atoms\StringAtom;
+use PHPUnit_Framework_TestCase;
 use XaiCorp\AbcParser\Domain\Atoms\EmailAtom;
 use XaiCorp\AbcParser\Domain\Core\Person;
 
-class PersonTest extends \PHPUnit_Framework_TestCase
+class PersonTest extends PHPUnit_Framework_TestCase
 {
 
     public function testCreate()

tests/unit/AbcParser/Domain/Core/SettingTest.php

@@ -9,11 +9,12 @@
 namespace Tests\Unit\AbcParser\Domain\Core;
 
 use Enzyme\Axiom\Atoms\StringAtom;
+use PHPUnit_Framework_TestCase;
 use XaiCorp\AbcParser\Domain\Atoms\EmailAtom;
 use XaiCorp\AbcParser\Domain\Core\Setting;
 use XaiCorp\AbcParser\Domain\Core\Transcriber;
 
-class SettingTest extends \PHPUnit_Framework_TestCase
+class SettingTest extends PHPUnit_Framework_TestCase
 {
     public function testCreate()
     {

tests/unit/AbcParser/Domain/Core/TuneAttributeArrayBuilderTest.php

@@ -6,11 +6,12 @@
  * Time: 8:28 AM
  */
 
-use XaiCorp\AbcParser\Domain\Core\TuneAttributeArrayBuilder;
+use Codeception\Test\Unit;
 use XaiCorp\AbcParser\Domain\Atoms\UnsignedIntegerAtom;
 use XaiCorp\AbcParser\Domain\Core\Tune;
+use XaiCorp\AbcParser\Domain\Core\TuneAttributeArrayBuilder;
 
-class TuneAttributeArrayBuilderTest extends \Codeception\Test\Unit
+class TuneAttributeArrayBuilderTest extends Unit
 {
 
     public function testSetIndex()

tests/unit/AbcParser/Domain/Core/TuneTest.php

@@ -9,16 +9,17 @@
 namespace Tests\Unit\AbcParser\Domain\Core;
 
 use Enzyme\Axiom\Atoms\StringAtom;
+use PHPUnit_Framework_TestCase;
 use Webpatser\Uuid\Uuid;
 use XaiCorp\AbcParser\Domain\Atoms\EmailAtom;
 use XaiCorp\AbcParser\Domain\Atoms\UnsignedIntegerAtom;
 use XaiCorp\AbcParser\Domain\Core\Author;
 use XaiCorp\AbcParser\Domain\Core\Composer;
-use XaiCorp\AbcParser\Domain\Core\Tune;
 use XaiCorp\AbcParser\Domain\Core\Setting;
+use XaiCorp\AbcParser\Domain\Core\Tune;
 use XaiCorp\AbcParser\Domain\Core\TuneAttributeArrayBuilder;
 
-class TuneTest extends \PHPUnit_Framework_TestCase
+class TuneTest extends PHPUnit_Framework_TestCase
 {
     public function testCreate()
     {

tests/unit/AbcParser/Domain/Modules/Interpreter/ContextTest.php

@@ -9,9 +9,10 @@
 namespace Tests\Unit\AbcParser\Domain\Modules\Interpreter;
 
 use Enzyme\Axiom\Atoms\StringAtom;
+use PHPUnit_Framework_TestCase;
 use XaiCorp\AbcParser\Domain\Modules\Interpreter\Context;
 
-class ContextTest extends \PHPUnit_Framework_TestCase
+class ContextTest extends PHPUnit_Framework_TestCase
 {
     private function getAbc($filename = '/abc/valid_abc_1.abc')
     {

tests/unit/AbcParser/Domain/Modules/Interpreter/DefaultInterpreterTest.php

@@ -9,17 +9,17 @@
 namespace Tests\Unit\AbcParser\Domain\Modules\Interpreter;
 
 use Enzyme\Axiom\Atoms\StringAtom;
-use Enzyme\Collection\CollectionException;
+use Exception;
+use PHPUnit_Framework_TestCase;
 use XaiCorp\AbcParser\Domain\Atoms\EmailAtom;
 use XaiCorp\AbcParser\Domain\Core\Author;
 use XaiCorp\AbcParser\Domain\Core\Composer;
-use XaiCorp\AbcParser\Domain\Core\Tune;
 use XaiCorp\AbcParser\Domain\Modules\Interpreter\Builder;
 use XaiCorp\AbcParser\Domain\Modules\Interpreter\Context;
 use XaiCorp\AbcParser\Domain\Modules\Interpreter\DefaultInterpreter;
 use XaiCorp\AbcParser\Domain\Modules\Interpreter\Interpreter;
 
-class DefaultInterpreterTest extends \PHPUnit_Framework_TestCase
+class DefaultInterpreterTest extends PHPUnit_Framework_TestCase
 {
     /**
      * @var Interpreter
@@ -49,7 +49,7 @@ class DefaultInterpreterTest extends \PHPUnit_Framework_TestCase
     {
         try {
             return new StringAtom($string);
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             //
         }
     }