Merge pull request #6 from dmt-software/1.3

dependency cleanup and update
dmt-software · Nov 24, 2020 · f54b417 · f54b417
2 parents 4a0ad61 + 227d8ef
commit f54b417
Show file tree

Hide file tree

Showing 9 changed files with 656 additions and 1,198 deletions.
diff --git a/composer.json b/composer.json
@@ -17,9 +17,7 @@
         "php": "^7.2",
         "dmt-software/jms-soap-serializer": "^2.1",
         "dmt-software/command-bus-validator": "^1.0",
-        "guzzlehttp/guzzle": "^6.3",
-        "doctrine/annotations": "^1.6",
-        "doctrine/cache": "^1.8"
+        "guzzlehttp/guzzle": "^6.3"
     },
     "autoload": {
         "psr-4": {

diff --git a/composer.lock b/composer.lock
diff --git a/src/ClientBuilder.php b/src/ClientBuilder.php
@@ -8,7 +8,6 @@
 use DMT\Soap\Serializer\SoapMessageEventSubscriber;
 use DMT\Soap\Serializer\SoapSerializationVisitorFactory;
 use DMT\VatServiceEu\Handler\CheckVatHandler;
-use Doctrine\Common\Annotations\AnnotationRegistry;
 use JMS\Serializer\EventDispatcher\EventDispatcher;
 use JMS\Serializer\Handler\HandlerRegistry;
 use JMS\Serializer\Naming\IdenticalPropertyNamingStrategy;
@@ -37,7 +36,6 @@ public static function create(): ClientBuilder
      * Build the client.
      *
      * @return Client
-     * @throws \Doctrine\Common\Annotations\AnnotationException
      */
     public function build(): Client
     {
@@ -71,8 +69,6 @@ public function getCheckVatHandler(): CheckVatHandler
      */
     public function getSerializer(): SerializerInterface
     {
-        AnnotationRegistry::registerUniqueLoader('class_exists');
-
         return
             SerializerBuilder::create()
                 ->setSerializationVisitor('soap', new SoapSerializationVisitorFactory())

diff --git a/src/Handler/CheckVatHandler.php b/src/Handler/CheckVatHandler.php
@@ -29,7 +29,8 @@ class CheckVatHandler
     protected $serializer;
 
     /**
-     * CheckVatHander constructor.
+     * CheckVatHandler constructor.
+     *
      * @param Client $httpClient
      * @param SerializerInterface $serializer
      */

diff --git a/src/Response/CheckVatApproxResponse.php b/src/Response/CheckVatApproxResponse.php
@@ -2,6 +2,7 @@
 
 namespace DMT\VatServiceEu\Response;
 
+use DateTime;
 use JMS\Serializer\Annotation as JMS;
 
 /**
@@ -33,7 +34,7 @@ class CheckVatApproxResponse implements ResponseInterface
      * @JMS\Type("DateTime<'Y-m-dP'>")
      * @JMS\XmlElement(cdata=false, namespace="urn:ec.europa.eu:taxud:vies:services:checkVat:types")
      *
-     * @var \DateTime
+     * @var DateTime
      */
     protected $requestDate;
 
@@ -174,17 +175,17 @@ public function setVatNumber(string $vatNumber): void
     }
 
     /**
-     * @return \DateTime
+     * @return DateTime
      */
-    public function getRequestDate(): ?\DateTime
+    public function getRequestDate(): ?DateTime
     {
         return $this->requestDate;
     }
 
     /**
-     * @param \DateTime $requestDate
+     * @param DateTime $requestDate
      */
-    public function setRequestDate(\DateTime $requestDate): void
+    public function setRequestDate(DateTime $requestDate): void
     {
         $this->requestDate = $requestDate;
     }

diff --git a/src/Response/CheckVatResponse.php b/src/Response/CheckVatResponse.php
@@ -2,6 +2,7 @@
 
 namespace DMT\VatServiceEu\Response;
 
+use DateTime;
 use JMS\Serializer\Annotation as JMS;
 
 /**
@@ -33,7 +34,7 @@ class CheckVatResponse implements ResponseInterface
      * @JMS\Type("DateTime<'Y-m-dP'>")
      * @JMS\XmlElement(cdata=false)
      *
-     * @var \DateTime
+     * @var DateTime
      */
     protected $requestDate;
 
@@ -94,17 +95,17 @@ public function setVatNumber(string $vatNumber): void
     }
 
     /**
-     * @return \DateTime
+     * @return DateTime
      */
-    public function getRequestDate(): ?\DateTime
+    public function getRequestDate(): ?DateTime
     {
         return $this->requestDate;
     }
 
     /**
-     * @param \DateTime $requestDate
+     * @param DateTime $requestDate
      */
-    public function setRequestDate(\DateTime $requestDate): void
+    public function setRequestDate(DateTime $requestDate): void
     {
         $this->requestDate = $requestDate;
     }

diff --git a/tests/ClientBuilderTest.php b/tests/ClientBuilderTest.php
@@ -10,9 +10,6 @@
 
 class ClientBuilderTest extends TestCase
 {
-    /**
-     * @throws \Doctrine\Common\Annotations\AnnotationException
-     */
     public function testBuildClient()
     {
         $this->assertInstanceOf(Client::class, ClientBuilder::create()->build());

diff --git a/tests/Request/CheckVatApproxTest.php b/tests/Request/CheckVatApproxTest.php
@@ -5,7 +5,6 @@
 use DMT\CommandBus\Validator\ValidationException;
 use DMT\CommandBus\Validator\ValidationMiddleware;
 use DMT\VatServiceEu\Request\CheckVatApprox;
-use Doctrine\Common\Annotations\AnnotationRegistry;
 use JMS\Serializer\Naming\IdenticalPropertyNamingStrategy;
 use JMS\Serializer\SerializerBuilder;
 use PHPUnit\Framework\TestCase;
@@ -42,7 +41,6 @@ public function testPropertyAccessors()
      *
      * @param CheckVatApprox $checkVat
      * @param string $message
-     * @throws \Doctrine\Common\Annotations\AnnotationException
      */
     public function testValidation(CheckVatApprox $checkVat, string $message)
     {
@@ -66,8 +64,6 @@ function (ConstraintViolation $violation) {
      */
     public function provideViolation()
     {
-        AnnotationRegistry::registerUniqueLoader('class_exists');
-
         $serializer = SerializerBuilder::create()
             ->setPropertyNamingStrategy(new IdenticalPropertyNamingStrategy())
             ->build();

diff --git a/tests/Request/CheckVatTest.php b/tests/Request/CheckVatTest.php
@@ -28,7 +28,6 @@ public function testPropertyAccessors()
      *
      * @param CheckVat $checkVat
      * @param string $message
-     * @throws \Doctrine\Common\Annotations\AnnotationException
      */
     public function testValidation(CheckVat $checkVat, string $message)
     {
@@ -52,8 +51,6 @@ function (ConstraintViolation $violation) {
      */
     public function provideViolation()
     {
-        AnnotationRegistry::registerUniqueLoader('class_exists');
-
         $serializer = SerializerBuilder::create()
             ->setPropertyNamingStrategy(new IdenticalPropertyNamingStrategy())
             ->build();