remove MessageInterface

Pushword · Nov 18, 2023 · fa79919 · fa79919
1 parent 51c402d
commit fa79919
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 45 deletions.
diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
         "doctrine/doctrine-bundle": "^2.2.2",
         "doctrine/doctrine-fixtures-bundle": "^3.4",
         "doctrine/doctrine-migrations-bundle": "^3.0",
-        "doctrine/orm": "2.16.3",
+        "doctrine/orm": "^2.17",
         "fortawesome/font-awesome": "^6.1",
         "imagine/imagine": "^1.3",
         "intervention/image": "^2.5",

diff --git a/packages/conversation/src/Admin/ConversationAdmin.php b/packages/conversation/src/Admin/ConversationAdmin.php
@@ -2,7 +2,7 @@
 
 namespace Pushword\Conversation\Admin;
 
-use Pushword\Conversation\Entity\MessageInterface;
+use Pushword\Conversation\Entity\Message;
 use Sonata\AdminBundle\Admin\AbstractAdmin;
 use Sonata\AdminBundle\Datagrid\DatagridMapper;
 use Sonata\AdminBundle\Datagrid\ListMapper;
@@ -13,7 +13,7 @@
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 
 /**
- * @extends AbstractAdmin<MessageInterface>
+ * @extends AbstractAdmin<Message>
  */
 #[AutoconfigureTag('sonata.admin', [
     'model_class' => '%pw.conversation.entity_message%',

diff --git a/packages/conversation/src/Entity/Message.php b/packages/conversation/src/Entity/Message.php
@@ -11,7 +11,7 @@
 use Symfony\Component\Validator\Constraints as Assert;
 
 #[ORM\Entity(repositoryClass: MessageRepository::class)]
-class Message implements MessageInterface, \Stringable
+class Message implements \Stringable
 {
     use HostTrait;
     use IdTrait;

diff --git a/packages/conversation/src/Entity/MessageInterface.php b/packages/conversation/src/Entity/MessageInterface.php
diff --git a/packages/conversation/src/Form/FormTrait.php b/packages/conversation/src/Form/FormTrait.php
@@ -3,7 +3,7 @@
 namespace Pushword\Conversation\Form;
 
 use Doctrine\Bundle\DoctrineBundle\Registry;
-use Pushword\Conversation\Entity\MessageInterface;
+use Pushword\Conversation\Entity\Message;
 use Pushword\Core\Component\App\AppConfig;
 use Pushword\Core\Component\App\AppPool;
 use Symfony\Bundle\FrameworkBundle\Routing\Router;
@@ -59,18 +59,18 @@ trait FormTrait
     protected ?int $messageId = null;
 
     /**
-     * @var class-string<MessageInterface>
+     * @var class-string<Message>
      */
     protected string $messageEntity;
 
-    protected MessageInterface $message;
+    protected Message $message;
 
     protected AppPool $apps;
 
     protected AppConfig $app;
 
     /**
-     * @param class-string<MessageInterface> $messageEntity
+     * @param class-string<Message> $messageEntity
      */
     public function __construct(
         string $messageEntity,

diff --git a/packages/conversation/src/Repository/MessageRepository.php b/packages/conversation/src/Repository/MessageRepository.php
@@ -3,22 +3,22 @@
 namespace Pushword\Conversation\Repository;
 
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
-use Pushword\Conversation\Entity\MessageInterface;
+use Pushword\Conversation\Entity\Message;
 use Symfony\Component\DependencyInjection\Attribute\AutoconfigureTag;
 
 /**
- * @extends ServiceEntityRepository<MessageInterface>
+ * @extends ServiceEntityRepository<Message>
  *
- * @method MessageInterface|null find($id, $lockMode = null, $lockVersion = null)
- * @method MessageInterface|null findOneBy(array $criteria, array $orderBy = null)
- * @method MessageInterface[]    findAll()
- * @method MessageInterface[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
+ * @method Message|null find($id, $lockMode = null, $lockVersion = null)
+ * @method Message|null findOneBy(array $criteria, array $orderBy = null)
+ * @method Message[]    findAll()
+ * @method Message[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
  */
 #[AutoconfigureTag('doctrine.repository_service')]
 class MessageRepository extends ServiceEntityRepository
 {
     /**
-     * @return MessageInterface[]
+     * @return Message[]
      */
     public function getMessagesPublishedByReferring(string $referring, string $orderBy = 'createdAt DESC', int $limit = 0)
     {
@@ -33,6 +33,6 @@ public function getMessagesPublishedByReferring(string $referring, string $order
             $queryBuilder->setMaxResults($limit);
         }
 
-        return $queryBuilder->getQuery()->getResult(); // @phpstan-ignore-line
+        return $queryBuilder->getQuery()->getResult();
     }
 }
diff --git a/packages/conversation/src/Service/NewMessageMailNotifier.php b/packages/conversation/src/Service/NewMessageMailNotifier.php
@@ -4,7 +4,7 @@
 
 use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;
-use Pushword\Conversation\Entity\MessageInterface;
+use Pushword\Conversation\Entity\Message;
 use Pushword\Core\Component\App\AppPool;
 use Pushword\Core\Utils\LastTime;
 use Symfony\Bridge\Twig\Mime\TemplatedEmail;
@@ -26,7 +26,7 @@ class NewMessageMailNotifier
     private readonly string $host;
 
     /**
-     * @param class-string<MessageInterface> $message Entity
+     * @param class-string<Message> $message Entity
      */
     public function __construct(
         private readonly string $message,
@@ -45,7 +45,7 @@ public function __construct(
     }
 
     /**
-     * @return MessageInterface[]
+     * @return Message[]
      */
     protected function getMessagesPostedSince(\DateTimeInterface $datetime)
     {

diff --git a/packages/conversation/src/Twig/AppExtension.php b/packages/conversation/src/Twig/AppExtension.php
@@ -3,7 +3,7 @@
 namespace Pushword\Conversation\Twig;
 
 use Doctrine\ORM\EntityManagerInterface;
-use Pushword\Conversation\Entity\MessageInterface;
+use Pushword\Conversation\Entity\Message;
 use Pushword\Conversation\Repository\MessageRepository;
 use Pushword\Core\Component\App\AppPool;
 use Symfony\Component\Routing\RouterInterface;
@@ -16,7 +16,7 @@ class AppExtension extends AbstractExtension
     private readonly \Pushword\Core\Component\App\AppConfig $app;
 
     /**
-     * @param class-string<MessageInterface> $messageEntity
+     * @param class-string<Message> $messageEntity
      */
     public function __construct(
         private readonly EntityManagerInterface $em,

diff --git a/packages/core/composer.json b/packages/core/composer.json
@@ -13,7 +13,7 @@
         "doctrine/doctrine-bundle": "^2.2.2",
         "doctrine/doctrine-fixtures-bundle": "^3.4",
         "doctrine/doctrine-migrations-bundle": "^3.0",
-        "doctrine/orm": "2.16.3",
+        "doctrine/orm": "^2.17",
         "intervention/image": "^2.5",
         "michelf/php-markdown": "^2",
         "pagerfanta/twig": "^4.1",

diff --git a/packages/skeleton/var/app.db b/packages/skeleton/var/app.db