Added Deletor trait.

Author: Vassyli

cli-config.php

@@ -9,7 +9,7 @@
 };
 
 $configuration = Setup::createAnnotationMetadataConfiguration(["src/Models"], true);
-$configuration->setQuoteStrategy(new \Doctrine\ORM\Mapping\AnsiQuoteStrategy());
+$configuration->setQuoteStrategy(new AnsiQuoteStrategy());
 
 $entityManager = EntityManager::create(["url" => "sqlite://:memory:"], $configuration);
 

src/Models/Character.php

@@ -3,7 +3,7 @@
 
 namespace LotGD\Core\Models;
 
-use LotGD\Core\Tools\Model\Creator;
+use LotGD\Core\Tools\Model\{Creator, Deletor};
 use Doctrine\ORM\Mapping\Entity;
 
 /**
@@ -14,6 +14,7 @@
  */
 class Character {
     use Creator;
+    use Deletor;
 
     /** @Id @Column(type="integer") @GeneratedValue */
     private $id;
@@ -28,7 +29,7 @@ class Character {
     private $properties;
 
     /** @var array */
-    protected static $fillable = [
+    private static $fillable = [
         "name",
         "maxhealth",
     ];
@@ -65,6 +66,10 @@ protected function generateDisplayName() {
         $this->displayName = $this->name;
     }
 
+    /**
+     * Returns displayName, a combination of title, name and suffix, mixed with colour codes
+     * @return string The displayName
+     */
     public function getDisplayName(): string {
         return $this->displayName;
     }

src/Tools/Model/Creator.php

@@ -11,7 +11,7 @@
 };
 
 /**
- * Provides methods for creating new instances.
+ * Provides methods for creating new entities
  */
 trait Creator {
     /**

src/Tools/Model/Deletor.php

@@ -0,0 +1,25 @@
+<?php
+declare(strict_types=1);
+
+namespace LotGD\Core\Tools\Model;
+
+use Doctrine\ORM\EntityManagerInterface;
+
+use LotGD\Core\Exceptions\{
+    AttributeMissingException,
+    WrongTypeException
+};
+
+/**
+ * Provides methods for deleting entities.
+ */
+trait Deletor {
+    /**
+     * Deletes the entity
+     * @param EntityManagerInterface $em
+     */
+    public function delete(EntityManagerInterface $em) {
+        $em->remove($this);
+        $em->flush();
+    }
+}

tests/Models/CharacterModelTest.php

@@ -41,7 +41,9 @@ public function testCreation() {
 
         $entities = $this->getEntityManager()->getRepository(Character::class)
                         ->findAll();
-        $this->assertEquals(count($entities), count($characters));
+        $this->assertCount(count($characters), $entities);
+        
+        return $entities;
     }
 
     /**
@@ -63,4 +65,20 @@ public function testCreationTypes() {
             $char = Character::create($faultyCharacterData);
         }
     }
+    
+    /**
+     * @depends testCreation
+     */
+    public function testDeletion(array $characters) {
+        foreach($characters as $character) {
+            $character->save($this->getEntityManager());
+        }
+        
+        $character = $this->getEntityManager()->getRepository(Character::class)->find(1);
+        $character->delete($this->getEntityManager());
+        
+        $entities = $this->getEntityManager()->getRepository(Character::class)
+                        ->findAll();
+        $this->assertCount(1, $entities);
+    }
 }