Allow upgrades of doctrine/annotations

Author: PrinsFrank

composer.json

@@ -25,6 +25,6 @@
         "php": "^7.1|^8.0",
         "guzzlehttp/guzzle": "^6.2.3|^7.0.0",
         "jms/serializer": "^1.6.2|^3.12.0",
-        "doctrine/annotations": "^1.9"
+        "doctrine/annotations": "^1.9|^2.0"
     }
 }

composer.lock

@@ -30,7 +30,6 @@
 use Eversign\OAuthTokenRequest;
 use Eversign\Business;
 use Eversign\Config;
-use Doctrine\Common\Annotations\AnnotationRegistry;
 use JMS\Serializer\SerializerBuilder;
 
 class Client {
@@ -72,9 +71,6 @@ class Client {
       */
      public function __construct($accessKey = null, $businessId = 0, $apiBaseUrl = null, int $apiRequestTimeout = Config::GUZZLE_TIMEOUT)
      {
-        if (!class_exists('Doctrine\Common\Annotations\AnnotationRegistry', false) && class_exists('Doctrine\Common\Annotations\AnnotationRegistry')) {
-            AnnotationRegistry::registerLoader('class_exists');
-        }
         $this->accessKey = $accessKey;
 
         if($businessId != 0) {

sdk/Eversign/Client.php

@@ -29,8 +29,6 @@
 use JMS\Serializer\Annotation\Type;
 use JMS\Serializer\SerializerBuilder;
 use Eversign\FormField;
-use Doctrine\Common\Annotations\AnnotationRegistry;
-
 
 /**
  * Documents are used by Signers to create legally Binding electronic signatures
@@ -285,8 +283,6 @@ class Document {
 
 
     public function __construct() {
-        AnnotationRegistry::registerLoader('class_exists');
-
         $this->setSandbox(false);
         $this->setIsDraft(false);
         $this->setUseSignerOrder(false);

sdk/Eversign/Document.php

@@ -29,7 +29,6 @@
 
 use JMS\Serializer\Annotation\Type;
 use JMS\Serializer\SerializerBuilder;
-use Doctrine\Common\Annotations\AnnotationRegistry;
 
 /**
  * An existing template can be used by making an HTTP POST request to the
@@ -146,9 +145,6 @@ class DocumentTemplate {
     private $customRequesterName;
 
     public function __construct($templateId = null) {
-        if (!class_exists('Doctrine\Common\Annotations\AnnotationRegistry', false) && class_exists('Doctrine\Common\Annotations\AnnotationRegistry')) {
-            AnnotationRegistry::registerLoader('class_exists');
-        }
         $this->signers = [];
         $this->recipients = [];
         $this->setSandbox(false);
@@ -240,7 +236,7 @@ public function getFields() {
     public function getEmbeddedSigningEnabled() {
         return !!$this->embeddedSigningEnabled;
     }
-    
+
     public function getCustomRequesterEmail() {
         return $this->customRequesterEmail;
     }

sdk/Eversign/DocumentTemplate.php

@@ -29,7 +29,6 @@
 use JMS\Serializer\Annotation\Type;
 use JMS\Serializer\SerializerBuilder;
 use Eversign\FormField;
-use Doctrine\Common\Annotations\AnnotationRegistry;
 
 
 /**
@@ -61,10 +60,6 @@ class Info {
      */
     private $businessUrl;
 
-    public function __construct() {
-        AnnotationRegistry::registerLoader('class_exists');
-    }
-
     /**
      * Converts the document to a JSON String
      * @return string