Revert Repository class and interface to avoid BC break

Sylius · Oct 15, 2020 · 250d47a · 250d47a
1 parent c2be2c0
commit 250d47a
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 14 deletions.
diff --git a/src/Repository/DoctrineInvoiceRepository.php b/src/Repository/DoctrineInvoiceRepository.php
@@ -6,25 +6,43 @@
 
 @trigger_error('The "DoctrineInvoiceRepository" class is deprecated since version 1.0.0 Use standardized class located at "src/Doctrine/ORM/" instead.');
 
-use Sylius\Bundle\ResourceBundle\Doctrine\ORM\EntityRepository;
+use Doctrine\Common\Persistence\ObjectRepository;
+use Doctrine\ORM\EntityManagerInterface;
+use Sylius\InvoicingPlugin\Entity\Invoice;
 use Sylius\InvoicingPlugin\Entity\InvoiceInterface;
-use Webmozart\Assert\Assert;
 
-final class DoctrineInvoiceRepository extends EntityRepository implements InvoiceRepository
+final class DoctrineInvoiceRepository implements InvoiceRepository
 {
+ /** @var EntityManagerInterface */
+ private $entityManager;
+
+ /** @var ObjectRepository */
+ private $entityRepository;
+
+ public function __construct(EntityManagerInterface $entityManager)
+ {
+ $this->entityManager = $entityManager;
+ $this->entityRepository = $entityManager->getRepository(Invoice::class);
+ }
+
  public function get(string $invoiceId): InvoiceInterface
  {
- /** @var InvoiceInterface|null $invoice */
- $invoice = $this->find($invoiceId);
- Assert::notNull($invoice);
+ /** @var InvoiceInterface $invoice */
+ $invoice = $this->entityRepository->find($invoiceId);
 
  return $invoice;
  }
 
+ public function add(InvoiceInterface $invoice): void
+ {
+ $this->entityManager->persist($invoice);
+ $this->entityManager->flush();
+ }
+
  public function findOneByOrderNumber(string $orderNumber): ?InvoiceInterface
  {
  /** @var InvoiceInterface|null $invoice */
- $invoice = $this->findOneBy(['orderNumber' => $orderNumber]);
+ $invoice = $this->entityRepository->findOneBy(['orderNumber' => $orderNumber]);
 
  return $invoice;
  }

diff --git a/src/Repository/InvoiceRepository.php b/src/Repository/InvoiceRepository.php
@@ -6,12 +6,13 @@
 
 @trigger_error('The "InvoiceRepository" interface is deprecated since version 1.0.0 Use standardized interface located at "src/Doctrine/ORM/" instead.');
 
-use Sylius\Component\Resource\Repository\RepositoryInterface;
 use Sylius\InvoicingPlugin\Entity\InvoiceInterface;
 
-interface InvoiceRepository extends RepositoryInterface
+interface InvoiceRepository
 {
  public function get(string $invoiceId): InvoiceInterface;
 
  public function findOneByOrderNumber(string $orderNumber): ?InvoiceInterface;
+
+ public function add(InvoiceInterface $invoice): void;
 }
diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
@@ -11,11 +11,7 @@
  <service id="sylius_invoicing_plugin.date_time_provider" class="Sylius\InvoicingPlugin\SystemDateTimeProvider" />
 
  <service id="sylius_invoicing_plugin.custom_repository.invoice" class="Sylius\InvoicingPlugin\Repository\DoctrineInvoiceRepository">
- <deprecated>
- The "%service_id%" service is deprecated since version 0.11.1
- and will be removed in version 1.0.0
- use sylius_invoicing_plugin.repository.invoice service instead
- </deprecated>
+ <deprecated>The "%service_id%" service is deprecated since version 0.11.1 and will be removed in version 1.0.0 use sylius_invoicing_plugin.repository.invoice service instead</deprecated>
  </service>
 
  <service id="sylius_invoicing_plugin.email.invoice_email_sender" class="Sylius\InvoicingPlugin\Email\InvoiceEmailSender">