Merge pull request #184 from wayofdev/feat/remove-factories

Author: lotyp

composer.json

@@ -50,12 +50,8 @@
         "wayofdev/cs-fixer-config": "^1.1"
     },
     "autoload": {
-        "files": [
-            "src/helpers.php"
-        ],
         "psr-4": {
-            "WayOfDev\\Cycle\\": "src/",
-            "WayOfDev\\Cycle\\Database\\Factories\\": "database/factories/"
+            "WayOfDev\\Cycle\\": "src/"
         }
     },
     "autoload-dev": {

composer.lock

@@ -5,13 +5,10 @@
 namespace WayOfDev\Cycle\Testing\Concerns;
 
 use Cycle\Database\DatabaseProviderInterface;
-use Exception;
 use PHPUnit\Framework\Constraint\Constraint;
 use PHPUnit\Framework\Constraint\LogicalNot as ReverseConstraint;
 use WayOfDev\Cycle\Testing\Constraints\CountInDatabase;
 use WayOfDev\Cycle\Testing\Constraints\HasInDatabase;
-use WayOfDev\Cycle\Testing\Constraints\NotSoftDeletedInDatabase;
-use WayOfDev\Cycle\Testing\Constraints\SoftDeletedInDatabase;
 
 /**
  * @method void assertThat($value, Constraint $constraint, string $message = '')
@@ -27,7 +24,7 @@ trait InteractsWithDatabase
     protected function assertDatabaseHas($table, array $data, $connection = null): static
     {
         $this->assertThat(
-            $this->getTable($table),
+            $table,
             new HasInDatabase(app(DatabaseProviderInterface::class), $data)
         );
 
@@ -46,7 +43,7 @@ protected function assertDatabaseMissing($table, array $data, $connection = null
             new HasInDatabase(app(DatabaseProviderInterface::class), $data)
         );
 
-        $this->assertThat($this->getTable($table), $constraint);
+        $this->assertThat($table, $constraint);
 
         return $this;
     }
@@ -60,7 +57,7 @@ protected function assertDatabaseMissing($table, array $data, $connection = null
     protected function assertDatabaseCount($table, int $count, $connection = null): static
     {
         $this->assertThat(
-            $this->getTable($table),
+            $table,
             new CountInDatabase(app(DatabaseProviderInterface::class), $count)
         );
 
@@ -76,64 +73,10 @@ protected function assertDatabaseCount($table, int $count, $connection = null):
     protected function assertDatabaseEmpty($table, $connection = null): static
     {
         $this->assertThat(
-            $this->getTable($table),
+            $table,
             new CountInDatabase(app(DatabaseProviderInterface::class), 0)
         );
 
         return $this;
     }
-
-    /**
-     * @param string|object $table
-     * @param string|null $connection
-     * @param string|null $deletedAtColumn
-     *
-     * @throws Exception
-     *
-     * @return $this
-     */
-    protected function assertSoftDeleted($table, array $data = [], $connection = null, $deletedAtColumn = 'deleted_at'): static
-    {
-        if ($this->isSoftDeletableModel($table)) {
-            throw new Exception('Eloquent not supported');
-        }
-
-        $this->assertThat(
-            $this->getTable($table),
-            new SoftDeletedInDatabase(app(DatabaseProviderInterface::class), $data, $deletedAtColumn)
-        );
-
-        return $this;
-    }
-
-    /**
-     * @param string|object $table
-     * @param string|null $connection
-     * @param string|null $deletedAtColumn
-     *
-     * @throws Exception
-     *
-     * @return $this
-     */
-    protected function assertNotSoftDeleted($table, array $data = [], $connection = null, $deletedAtColumn = 'deleted_at'): static
-    {
-        if ($this->isSoftDeletableModel($table)) {
-            throw new Exception('Eloquent not supported');
-        }
-
-        $this->assertThat(
-            $this->getTable($table),
-            new NotSoftDeletedInDatabase(app(DatabaseProviderInterface::class), $data, $deletedAtColumn)
-        );
-
-        return $this;
-    }
-
-    /**
-     * @param string|object $table
-     */
-    protected function getTable($table): string
-    {
-        return $table;
-    }
 }

src/Bridge/Laravel/Factories/Factory.php

@@ -27,21 +27,21 @@ public function __construct(DatabaseProviderInterface $database, int $expectedCo
         $this->database = $database->database();
     }
 
-    public function matches(mixed $table): bool
+    public function matches(mixed $other): bool
     {
         /** @var Table $tableInterface */
-        $tableInterface = $this->database->table($table);
+        $tableInterface = $this->database->table($other);
 
         $this->actualCount = $tableInterface->count();
 
         return $this->actualCount === $this->expectedCount;
     }
 
-    public function failureDescription(mixed $table): string
+    public function failureDescription(mixed $other): string
     {
         return sprintf(
             "table [%s] matches expected entries count of %s. Entries found: %s.\n",
-            $table,
+            $other,
             $this->expectedCount,
             $this->actualCount
         );

src/Testing/Concerns/InteractsWithDatabase.php

@@ -29,10 +29,10 @@ public function __construct(DatabaseProviderInterface $database, array $data)
         $this->database = $database->database();
     }
 
-    public function matches(mixed $table): bool
+    public function matches(mixed $other): bool
     {
         /** @var SelectQuery $tableInterface */
-        $tableInterface = $this->database->table($table);
+        $tableInterface = $this->database->table($other);
 
         try {
             $count = $tableInterface->where($this->data)->count();
@@ -46,11 +46,11 @@ public function matches(mixed $table): bool
     /**
      * @throws JsonException
      */
-    public function failureDescription(mixed $table): string
+    public function failureDescription(mixed $other): string
     {
         return sprintf(
             'a row in the table [%s] matches the attributes %s.',
-            $table,
+            $other,
             $this->toString(JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE)
         );
     }