up to installer v3

jeyroik · Jun 5, 2020 · ff0cfa0 · ff0cfa0
1 parent b632b7f
commit ff0cfa0
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 37 deletions.
diff --git a/composer.json b/composer.json
@@ -8,7 +8,8 @@
   "require-dev": {
     "phpunit/phpunit": "^9",
     "vlucas/phpdotenv": "^3.4",
-    "jeyroik/extas-repositories-mongo": "1.*"
+    "jeyroik/extas-repositories-mongo": "1.*",
+    "jeyroik/extas-snuffbox": "0.*"
   },
   "autoload": {
     "psr-4": {

diff --git a/extas.json b/extas.json
@@ -1,6 +1,6 @@
 {
   "name": "extas/workflow-dispatchers",
-
+  "installer_version": 3,
   "workflow_transition_dispatcher_samples": [
     {
       "name": "datetime",

diff --git a/tests/DateTimeTest.php b/tests/DateTimeTest.php
@@ -1,45 +1,37 @@
 <?php
 namespace tests;
 
-use Dotenv\Dotenv;
-use PHPUnit\Framework\TestCase;
-
+use extas\components\repositories\TSnuffRepository;
 use extas\components\conditions\Condition;
 use extas\components\conditions\ConditionEqual;
 use extas\components\conditions\ConditionRepository;
 use extas\components\workflows\transits\TransitResult;
-use extas\interfaces\conditions\IConditionRepository;
-use extas\interfaces\repositories\IRepository;
-use extas\components\SystemContainer;
 use extas\components\workflows\entities\Entity;
 use extas\components\workflows\transitions\dispatchers\DateTime;
 
+use Dotenv\Dotenv;
+use PHPUnit\Framework\TestCase;
+
 /**
  * Class DateTimeTest
  *
  * @author jeyroik@gmail.com
  */
 class DateTimeTest extends TestCase
 {
-    protected ?IRepository $condRepo = null;
+    use TSnuffRepository;
 
     protected function setUp(): void
     {
         parent::setUp();
         $env = Dotenv::create(getcwd() . '/tests/');
         $env->load();
-
-        $this->condRepo = new ConditionRepository();
-
-        SystemContainer::addItem(
-            IConditionRepository::class,
-            ConditionRepository::class
-        );
+        $this->registerSnuffRepos(['conditionRepository' => ConditionRepository::class]);
     }
 
     public function tearDown(): void
     {
-        $this->condRepo->delete([Condition::FIELD__NAME => 'eq']);
+        $this->unregisterSnuffRepos();
     }
 
     public function testConditionFailed()
@@ -51,7 +43,7 @@ public function testConditionFailed()
             'datetime' => time()-100,
             'compare' => '='
         ]);
-        $this->condRepo->create(new Condition([
+        $this->createWithSnuffRepo('conditionRepository', new Condition([
             Condition::FIELD__NAME => 'eq',
             Condition::FIELD__ALIASES => ['eq', '='],
             Condition::FIELD__CLASS => ConditionEqual::class

diff --git a/tests/FieldValueCompareTest.php b/tests/FieldValueCompareTest.php
@@ -1,45 +1,37 @@
 <?php
 namespace tests;
 
-use PHPUnit\Framework\TestCase;
-use Dotenv\Dotenv;
-
+use extas\components\repositories\TSnuffRepository;
 use extas\components\conditions\Condition;
 use extas\components\conditions\ConditionEqual;
 use extas\components\conditions\ConditionRepository;
 use extas\components\workflows\transits\TransitResult;
-use extas\interfaces\conditions\IConditionRepository;
-use extas\interfaces\repositories\IRepository;
-use extas\components\SystemContainer;
 use extas\components\workflows\entities\Entity;
 use extas\components\workflows\transitions\dispatchers\FieldValueCompare;
 
+use PHPUnit\Framework\TestCase;
+use Dotenv\Dotenv;
+
 /**
  * Class FieldValueCompareTest
  *
  * @author jeyroik@gmail.com
  */
 class FieldValueCompareTest extends TestCase
 {
-    protected ?IRepository $condRepo = null;
+    use TSnuffRepository;
 
     protected function setUp(): void
     {
         parent::setUp();
         $env = Dotenv::create(getcwd() . '/tests/');
         $env->load();
-
-        $this->condRepo = new ConditionRepository();
-
-        SystemContainer::addItem(
-            IConditionRepository::class,
-            ConditionRepository::class
-        );
+        $this->registerSnuffRepos(['conditionRepository' => ConditionRepository::class]);
     }
 
     public function tearDown(): void
     {
-        $this->condRepo->delete([Condition::FIELD__NAME => 'eq']);
+        $this->unregisterSnuffRepos();
     }
 
     public function testConditionFailed()
@@ -55,7 +47,7 @@ public function testConditionFailed()
             'field_compare' => '='
         ]);
 
-        $this->condRepo->create(new Condition([
+        $this->createWithSnuffRepo('conditionRepository', new Condition([
             Condition::FIELD__NAME => 'eq',
             Condition::FIELD__ALIASES => ['eq', '='],
             Condition::FIELD__CLASS => ConditionEqual::class

diff --git a/tests/NotifyTest.php b/tests/NotifyTest.php
@@ -1,14 +1,14 @@
 <?php
 namespace tests;
 
-use Dotenv\Dotenv;
 use extas\components\workflows\entities\EntityContext;
-use PHPUnit\Framework\TestCase;
-
 use extas\components\workflows\transitions\dispatchers\Notify;
 use extas\components\workflows\transits\TransitResult;
 use extas\components\workflows\entities\Entity;
 
+use Dotenv\Dotenv;
+use PHPUnit\Framework\TestCase;
+
 /**
  * Class NotifyTest
  *