Fixed some Doctrine deprecations (#159)

* Fixed some Doctrine deprecations since doctrine/persistence 1.3.x release * doctrine/persistence has to be >= 1.3.0 * Fixed last reference to Doctrine\Common\Persistence namespace * Fixed bad translation
DamienHarper · Dec 23, 2019 · 4ea1709 · 4ea1709
1 parent 6f1fb32
commit 4ea1709
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -44,6 +44,9 @@
     "phpstan/phpstan-symfony": "^0.12",
     "phpstan/phpstan": "^0.12"
   },
+  "conflict": {
+    "doctrine/persistence": "<1.3"
+  },
   "scripts": {
     "test": "php -d pcov.enabled=1 ./vendor/bin/phpunit",
     "csfixer": "vendor/bin/php-cs-fixer fix --config=.php_cs --using-cache=no --verbose",

diff --git a/src/DoctrineAuditBundle/Annotation/AnnotationLoader.php b/src/DoctrineAuditBundle/Annotation/AnnotationLoader.php
@@ -3,9 +3,9 @@
 namespace DH\DoctrineAuditBundle\Annotation;
 
 use Doctrine\Common\Annotations\AnnotationReader;
-use Doctrine\Common\Persistence\Mapping\ClassMetadata;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Mapping\Entity;
+use Doctrine\Persistence\Mapping\ClassMetadata;
 
 class AnnotationLoader
 {

diff --git a/src/DoctrineAuditBundle/Helper/DoctrineHelper.php b/src/DoctrineAuditBundle/Helper/DoctrineHelper.php
@@ -2,7 +2,7 @@
 
 namespace DH\DoctrineAuditBundle\Helper;
 
-use Doctrine\Common\Persistence\Proxy;
+use Doctrine\Persistence\Proxy;
 
 class DoctrineHelper
 {

diff --git a/src/DoctrineAuditBundle/Twig/Extension/TwigExtension.php b/src/DoctrineAuditBundle/Twig/Extension/TwigExtension.php
@@ -2,7 +2,7 @@
 
 namespace DH\DoctrineAuditBundle\Twig\Extension;
 
-use Doctrine\Common\Persistence\ManagerRegistry;
+use Doctrine\Persistence\ManagerRegistry;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFilter;
 

diff --git a/src/DoctrineAuditBundle/translations/messages.en.yaml b/src/DoctrineAuditBundle/translations/messages.en.yaml
@@ -7,7 +7,7 @@ audit:
     table: Table
     activity: Activity
   audit_details:
-    view_audit: Visualizza audit
+    view_audit: View audit
     most_recent: (most recent first)
     entry_title: View all operations within this transaction
     property: Property

diff --git a/tests/DoctrineAuditBundle/Event/CreateSchemaListenerTest.php b/tests/DoctrineAuditBundle/Event/CreateSchemaListenerTest.php
@@ -19,7 +19,7 @@
 final class CreateSchemaListenerTest extends BaseTest
 {
     /**
-     * @throws \Doctrine\Common\Persistence\Mapping\MappingException
+     * @throws \Doctrine\Persistence\Mapping\MappingException
      * @throws \Doctrine\DBAL\DBALException
      * @throws \Doctrine\ORM\ORMException
      * @throws \Doctrine\ORM\Tools\ToolsException