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 XaiCorp\AbcParser\Domain\Atoms\UnsignedIntegerAtom;
+use Closure;
 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 XaiCorp\AbcParser\Domain\Atoms\UnsignedIntegerAtom;
+use Closure;
 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 XaiCorp\AbcParser\Domain\Atoms\UnsignedIntegerAtom;
+use Closure;
 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 XaiCorp\AbcParser\Domain\Atoms\UnsignedIntegerAtom;
+use Closure;
 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);
-        list($key, $data) = $this->getKeyDataFromLine($nextLine);
+        $nextLine = $context->get($context->key() + 1);
+        [$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 XaiCorp\AbcParser\Domain\Atoms\UnsignedIntegerAtom;
+use Closure;
 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 XaiCorp\AbcParser\Domain\Atoms\UnsignedIntegerAtom;
+use Closure;
 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
@@ -15,7 +18,7 @@ trait AcceptanceTesterActions
      */
     abstract protected function getScenario();
 
-    
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -26,10 +29,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -40,10 +43,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -58,10 +61,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -86,10 +89,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -113,10 +116,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -148,10 +151,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -173,10 +176,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -194,10 +197,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -233,10 +236,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -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,10 +313,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -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,10 +386,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -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,10 +423,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -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,10 +460,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -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,10 +503,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -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,10 +546,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -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,10 +589,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -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,10 +626,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -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,10 +667,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -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,10 +708,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -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,10 +747,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -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,10 +786,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -806,10 +809,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -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,10 +850,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -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,10 +889,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -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,10 +940,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -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,10 +991,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -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,10 +1128,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -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,10 +1225,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1401,10 +1404,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1422,10 +1425,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1461,10 +1464,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1480,10 +1483,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1499,10 +1502,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1520,10 +1523,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1537,10 +1540,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1565,10 +1568,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1591,10 +1594,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1616,10 +1619,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1640,10 +1643,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1672,10 +1675,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1685,10 +1688,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1709,10 +1712,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1726,10 +1729,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1741,10 +1744,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -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,10 +1787,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -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,10 +1820,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1834,10 +1837,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -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,10 +1892,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -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,10 +1939,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -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,10 +1978,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -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,10 +2021,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -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,10 +2064,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -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,10 +2085,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -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,10 +2126,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -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,10 +2165,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -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,10 +2206,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -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,10 +2235,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -2256,10 +2259,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -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/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
 {
     /**
@@ -12,7 +14,7 @@ trait UnitTesterActions
      */
     abstract protected function getScenario();
 
-    
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -39,10 +41,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -69,10 +71,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -84,10 +86,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -99,10 +101,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -114,10 +116,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -129,10 +131,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -144,10 +146,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -159,10 +161,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -174,10 +176,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -189,10 +191,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -204,10 +206,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -219,10 +221,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -234,10 +236,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -249,10 +251,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -263,10 +265,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -277,10 +279,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -291,10 +293,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -305,10 +307,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -319,10 +321,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -333,10 +335,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -347,10 +349,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -361,10 +363,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -374,10 +376,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -387,10 +389,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -399,10 +401,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -412,10 +414,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -425,10 +427,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -441,10 +443,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -454,10 +456,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -467,10 +469,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -480,10 +482,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -493,10 +495,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -506,10 +508,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -540,10 +542,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -551,10 +553,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -562,10 +564,10 @@ 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()));
     }
 
- 
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -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) {
             //
         }
     }