Skip to content

Remove usage of the Annotation Registry as it's been removed and allow update to doctrine/annotations:^2.0 #81

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PrinsFrank wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove usage of the Annotation Registry as it's been removed and allow update to doctrine/annotations:^2.0 #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
48 changes: 26 additions & 22 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions sdk/Eversign/Client.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
use Eversign\OAuthTokenRequest;
use Eversign\Business;
use Eversign\Config;
use Doctrine\Common\Annotations\AnnotationRegistry;
use JMS\Serializer\SerializerBuilder;

class Client {
Expand Down Expand Up @@ -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) {
Expand Down
4 changes: 0 additions & 4 deletions sdk/Eversign/Document.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -285,8 +283,6 @@ class Document {


public function __construct() {
AnnotationRegistry::registerLoader('class_exists');

$this->setSandbox(false);
$this->setIsDraft(false);
$this->setUseSignerOrder(false);
Expand Down
6 changes: 1 addition & 5 deletions sdk/Eversign/DocumentTemplate.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -240,7 +236,7 @@ public function getFields() {
public function getEmbeddedSigningEnabled() {
return !!$this->embeddedSigningEnabled;
}

public function getCustomRequesterEmail() {
return $this->customRequesterEmail;
}
Expand Down
5 changes: 0 additions & 5 deletions sdk/Eversign/Info.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
use JMS\Serializer\Annotation\Type;
use JMS\Serializer\SerializerBuilder;
use Eversign\FormField;
use Doctrine\Common\Annotations\AnnotationRegistry;


/**
Expand Down Expand Up @@ -61,10 +60,6 @@ class Info {
*/
private $businessUrl;

public function __construct() {
AnnotationRegistry::registerLoader('class_exists');
}

/**
* Converts the document to a JSON String
* @return string
Expand Down