Fix cs

odan · odan · commit 1b9ac41f079e · 2023-06-07T11:35:16.000+02:00
diff --git a/src/Factory/NovaHttpClientFactory.php b/src/Factory/NovaHttpClientFactory.php
@@ -12,7 +12,7 @@
 use Psr\Http\Message\ResponseInterface;
 
 /**
- * NOVA HTTP Client Factory
+ * NOVA HTTP Client Factory.
  */
 final class NovaHttpClientFactory
 {
@@ -85,8 +85,10 @@ public function createLoggedInHttpClient(): NovaHttpClient
      * Create a guzzle client for the API to use.
      *
      * @param array $settings The settings
-     * @return NovaHttpClient The http client
+     *
      * @throws InvalidArgumentException
+     *
+     * @return NovaHttpClient The http client
      */
     private function createHttpClient(array $settings): NovaHttpClient
     {
diff --git a/src/Method/CheckSwissPassValidityMethod.php b/src/Method/CheckSwissPassValidityMethod.php
@@ -129,7 +129,7 @@ private function createResult(XmlDocument $xml): NovaCheckSwissPassValidityResul
     {
         $result = new NovaCheckSwissPassValidityResult();
         $xml = $xml->withoutNamespaces();
-        //$content = $xml->getXml();
+        // $content = $xml->getXml();
 
         // Find and append all messages
         foreach ($this->novaMessageParser->findNovaMessages($xml) as $message) {
diff --git a/src/Method/NovaPurchaseServicesMethod.php b/src/Method/NovaPurchaseServicesMethod.php
@@ -140,7 +140,7 @@ private function createRequestBody(NovaPurchaseServicesParameter $parameter): st
         $amount = $dom->createElement('ns18:geldBetrag');
         $paymentInformation->appendChild($amount);
 
-        $amount->setAttribute('base:betrag', $parameter->price);
+        $amount->setAttribute('base:betrag', (string)$parameter->price);
         $amount->setAttribute('base:waehrung', $parameter->currency);
 
         return (string)$dom->saveXML();
diff --git a/src/Parameter/NovaPurchaseServicesParameter.php b/src/Parameter/NovaPurchaseServicesParameter.php
@@ -17,9 +17,9 @@ final class NovaPurchaseServicesParameter extends NovaIdentifierParameter
     /**
      * The SBB article price.
      *
-     * @var string
+     * @var float
      */
-    public $price = '';
+    public $price = 0.00;
 
     /**
      * The currency.
diff --git a/src/Parser/NovaApiSoapErrorParser.php b/src/Parser/NovaApiSoapErrorParser.php
@@ -8,7 +8,7 @@
 use OrcaServices\NovaApi\Xml\XmlDocument;
 
 /**
- * Class.
+ * Error parser.
  */
 final class NovaApiSoapErrorParser
 {
@@ -120,7 +120,7 @@ private function getSoapValidationErrors(XmlDocument $xml): NovaApiErrorList
 
         /** @var DOMNode $errorDetail */
         foreach ($errorList as $errorDetail) {
-            $errors = $errors->withError($errorDetail->localName, $errorDetail->nodeValue);
+            $errors = $errors->withError($errorDetail->localName ?? '', $errorDetail->nodeValue ?? '');
         }
 
         return $errors;
diff --git a/src/Parser/NovaMessageParser.php b/src/Parser/NovaMessageParser.php
@@ -62,7 +62,7 @@ private function appendNovaMessages(XmlDocument $xml, array $namespace, array $m
         // Check for action response errors
         $messageNodes = $xml->queryNodes(sprintf('//%smeldungen/%smeldung', $ns1, $ns2));
 
-        if (empty($messageNodes) || $messageNodes->length === 0) {
+        if ($messageNodes->length === 0) {
             return $messages;
         }
 
diff --git a/src/Type/GenderType.php b/src/Type/GenderType.php
@@ -10,20 +10,20 @@ final class GenderType
     /**
      * Men Gender Type.
      */
-    const MEN = 1;
+    public const MEN = 1;
 
     /**
      * Women Gender Type.
      */
-    const WOMEN = 2;
+    public const WOMEN = 2;
 
     /**
      * Reserved for later Gender Type.
      */
-    const RESERVED = 3;
+    public const RESERVED = 3;
 
     /**
      * Unknown Gender Type.
      */
-    const UNKNOWN = 4;
+    public const UNKNOWN = 4;
 }
diff --git a/src/Type/NovaSavReasonType.php b/src/Type/NovaSavReasonType.php
@@ -10,10 +10,10 @@ final class NovaSavReasonType
     /**
      * Return before the 1st day of validity (20 CHF).
      */
-    const RETURN_BEFORE_1VALIDITY = 'RUECKGABE_VOR_1GELTUNGSTAG';
+    public const RETURN_BEFORE_1VALIDITY = 'RUECKGABE_VOR_1GELTUNGSTAG';
 
     /**
      * Partly used (10 CHF).
      */
-    const PARTLY_USED = 'TEILWEISE_BENUTZT';
+    public const PARTLY_USED = 'TEILWEISE_BENUTZT';
 }
diff --git a/src/Xml/XmlDocument.php b/src/Xml/XmlDocument.php
@@ -72,20 +72,6 @@ public static function createFromDom(DOMDocument $dom): self
         return new self(new DOMXPath($dom));
     }
 
-    /**
-     * Add all namespaces automatically.
-     *
-     * @return void
-     */
-    public function registerAllNamespaces()
-    {
-        foreach ($this->xpath->query('//namespace::*') ?: [] as $namespaceNode) {
-            $prefix = str_replace('xmlns:', '', $namespaceNode->nodeName);
-            $namespaceUri = $namespaceNode->nodeValue;
-            $this->xpath->registerNamespace($prefix, $namespaceUri);
-        }
-    }
-
     /**
      * Check if namespace exists.
      *
@@ -114,15 +100,14 @@ public function getNodeValue(string $expression, $contextNode = null): string
     {
         $nodes = $this->queryNodes($expression, $contextNode);
 
-        if (empty($nodes)
-            || $nodes->length === 0
-            || !($nodes->item(0) instanceof DOMElement)
-            || !($nodes->item(0) instanceof DOMNode)
+        if ($nodes->length === 0 ||
+            !($nodes->item(0) instanceof DOMElement) ||
+            !($nodes->item(0) instanceof DOMNode)
         ) {
             throw new InvalidXmlException(sprintf('XML DOM node [%s] not found.', $expression));
         }
 
-        return $nodes->item(0)->nodeValue;
+        return $nodes->item(0)->nodeValue ?? '';
     }
 
     /**
@@ -134,7 +119,7 @@ public function getNodeValue(string $expression, $contextNode = null): string
      *
      * @return string|null The node value
      */
-    private function findSingleNodeValue(string $expression, DOMXPath $xpath, $contextNode = null)
+    private function findSingleNodeValue(string $expression, DOMXPath $xpath, $contextNode = null): ?string
     {
         if ($contextNode === null) {
             $node = $xpath->query($expression);
@@ -161,14 +146,13 @@ private function findSingleNodeValue(string $expression, DOMXPath $xpath, $conte
      *
      * @return string|null The node value
      */
-    public function findNodeValue(string $expression, $contextNode = null)
+    public function findNodeValue(string $expression, $contextNode = null): ?string
     {
         $nodes = $this->queryNodes($expression, $contextNode);
 
-        if (empty($nodes)
-            || $nodes->length === 0
-            || !($nodes->item(0) instanceof DOMElement)
-            || !($nodes->item(0) instanceof DOMNode)
+        if ($nodes->length === 0 ||
+            !($nodes->item(0) instanceof DOMElement) ||
+            !($nodes->item(0) instanceof DOMNode)
         ) {
             return null;
         }
@@ -190,7 +174,7 @@ public function getAttributeValue(string $expression, $contextNode = null): stri
     {
         $nodes = $this->queryNodes($expression, $contextNode);
 
-        if (empty($nodes) || $nodes->length === 0 || !($nodes instanceof DOMNodeList)) {
+        if ($nodes->length === 0) {
             throw new InvalidXmlException(sprintf('XML DOM attribute [%s] not found.', $expression));
         }
 
@@ -199,7 +183,7 @@ public function getAttributeValue(string $expression, $contextNode = null): stri
             throw new InvalidXmlException(sprintf('XML DOM attribute [%s] not found.', $expression));
         }
 
-        return $attribute->nodeValue;
+        return $attribute->nodeValue ?? '';
     }
 
     /**
diff --git a/tests/TestCase/Client/NovaApiClientTest.php b/tests/TestCase/Client/NovaApiClientTest.php
@@ -68,9 +68,12 @@ public function testSearchPartnerByTkid()
         $this->assertSame('max.mustermann@example.com', $partner->email);
         $this->assertSame('Mustermann', $partner->firstName); // should be the lastName
         $this->assertSame('Max', $partner->lastName); // should be the firstName
-        $this->assertSame('1982-03-28 00:00:00', $partner->dateOfBirth->toDateTimeString());
+        $this->assertSame(
+            '1982-03-28 00:00:00',
+            $partner->dateOfBirth ? $partner->dateOfBirth->toDateTimeString() : ''
+        );
         $this->assertSame(1, $partner->genderTypeId);
-        $this->assertSame('2019-09-02 08:13:28', $partner->changedAt->toDateTimeString());
+        $this->assertSame('2019-09-02 08:13:28', $partner->changedAt ? $partner->changedAt->toDateTimeString() : '');
     }
 
     /**
@@ -227,7 +230,7 @@ public function testCreateOffersClass2()
         $parameter = new NovaCreateOffersParameter();
         $this->setIdentifier($parameter);
         $parameter->tkId = '949e2e6a-fdd1-4f07-8784-201e588ae834';
-        $parameter->novaProductNumber = '51648';
+        $parameter->novaProductNumber = 51648;
         $parameter->dateOfBirth = Chronos::createFromDate(1982, 03, 28);
         $parameter->genderTypeId = GenderType::MEN;
         $parameter->travelClass = 2;
diff --git a/tests/TestCase/SAV/SavRefundTest.php b/tests/TestCase/SAV/SavRefundTest.php
@@ -86,7 +86,7 @@ public function testSavFullRefund()
         $parameter->novaOfferId = $createSavOffersResult->offers[0]->novaOfferId;
 
         // Don't set TKID for this process
-        //$parameter->tkId = $savOffers->offers[0]->tkId;
+        // $parameter->tkId = $savOffers->offers[0]->tkId;
 
         $parameter->firstName = 'John';
         $parameter->lastName = 'Doe';
diff --git a/tests/Traits/ContainerTestTrait.php b/tests/Traits/ContainerTestTrait.php
@@ -4,15 +4,13 @@
 
 use DI\Container;
 use DI\ContainerBuilder;
-use Psr\Container\ContainerInterface;
-use UnexpectedValueException;
 
 /**
  * Container Trait.
  */
 trait ContainerTestTrait
 {
-    /** @var ContainerInterface|Container|null */
+    /** @var Container */
     protected $container;
 
     /**
@@ -24,30 +22,4 @@ protected function createContainer()
     {
         $this->container = (new ContainerBuilder())->build();
     }
-
-    /**
-     * Unset the container instance.
-     *
-     * @return void
-     */
-    protected function clearContainer()
-    {
-        $this->container = null;
-    }
-
-    /**
-     * Get container.
-     *
-     * @throws UnexpectedValueException
-     *
-     * @return ContainerInterface|Container The container
-     */
-    protected function getContainer(): ContainerInterface
-    {
-        if ($this->container === null) {
-            throw new UnexpectedValueException('Container must be initialized');
-        }
-
-        return $this->container;
-    }
 }
diff --git a/tests/Traits/NovaClientTestTrait.php b/tests/Traits/NovaClientTestTrait.php
@@ -26,12 +26,12 @@ protected function createNovaApiClient(array $responses): NovaApiClient
         Chronos::setTestNow('2019-09-01 00:00:00');
 
         $settings = $this->getSettings();
-        $this->getContainer()->set(NovaApiConfiguration::class, new NovaApiConfiguration($settings));
+        $this->container->set(NovaApiConfiguration::class, new NovaApiConfiguration($settings));
 
         // To make real http calls, just comment out this line
         $this->mockNovaGuzzleClient($responses);
 
-        return $this->getContainer()->get(NovaApiClient::class);
+        return $this->container->get(NovaApiClient::class);
     }
 
     /**
@@ -51,7 +51,7 @@ protected function mockNovaGuzzleClient(array $responses)
 
         array_unshift($responses, $loginResponse);
 
-        $this->getContainer()->get(NovaHttpClientFactory::class)->setMockedResponses($responses);
+        $this->container->get(NovaHttpClientFactory::class)->setMockedResponses($responses);
     }
 
     /**
diff --git a/tests/Traits/UnitTestTrait.php b/tests/Traits/UnitTestTrait.php
@@ -2,9 +2,7 @@
 
 namespace OrcaServices\NovaApi\Test\Traits;
 
-use DI\Container;
 use InvalidArgumentException;
-use PHPUnit\Framework\MockObject\Builder\InvocationMocker;
 use PHPUnit\Framework\MockObject\MockObject;
 use UnexpectedValueException;
 
@@ -16,23 +14,17 @@ trait UnitTestTrait
     use ContainerTestTrait;
 
     /** {@inheritdoc} */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         date_default_timezone_set('Europe/Zurich');
     }
 
     /** {@inheritdoc} */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->createContainer();
     }
 
-    /** {@inheritdoc} */
-    protected function tearDown()
-    {
-        $this->clearContainer();
-    }
-
     /**
      * Add mock to container.
      *
@@ -44,17 +36,10 @@ protected function tearDown()
      */
     protected function registerMock(string $class): MockObject
     {
-        $container = $this->getContainer();
-
-        if ($container instanceof Container) {
-            $mock = $this->createMockObject($class);
-
-            $container->set($class, $this->createMockObject($class));
-
-            return $mock;
-        }
+        $mock = $this->createMockObject($class);
+        $this->container->set($class, $this->createMockObject($class));
 
-        throw new UnexpectedValueException(sprintf('The class could not be mocked: %s', $class));
+        return $mock;
     }
 
     /**
@@ -76,19 +61,4 @@ protected function createMockObject(string $class): MockObject
             ->disableOriginalConstructor()
             ->getMock();
     }
-
-    /**
-     * Create a mocked class method.
-     *
-     * @param array|callable $method The class and method
-     *
-     * @return InvocationMocker The mocked method
-     */
-    protected function mockMethod($method): InvocationMocker
-    {
-        /** @var MockObject $mock */
-        $mock = $this->getContainer()->get((string)$method[0]);
-
-        return $mock->method((string)$method[1]);
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`use Psr\Http\Message\ResponseInterface;`
`13`	`13`
`14`	`14`	`/**`
`15`		`- * NOVA HTTP Client Factory`
	`15`	`+ * NOVA HTTP Client Factory.`
`16`	`16`	`*/`
`17`	`17`	`final class NovaHttpClientFactory`
`18`	`18`	`{`
`@@ -85,8 +85,10 @@ public function createLoggedInHttpClient(): NovaHttpClient`
`85`	`85`	`* Create a guzzle client for the API to use.`
`86`	`86`	`*`
`87`	`87`	`* @param array $settings The settings`
`88`		`- * @return NovaHttpClient The http client`
	`88`	`+ *`
`89`	`89`	`* @throws InvalidArgumentException`
	`90`	`+ *`
	`91`	`+ * @return NovaHttpClient The http client`
`90`	`92`	`*/`
`91`	`93`	`private function createHttpClient(array $settings): NovaHttpClient`
`92`	`94`	`{`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ private function createResult(XmlDocument $xml): NovaCheckSwissPassValidityResul`
`129`	`129`	`{`
`130`	`130`	`$result = new NovaCheckSwissPassValidityResult();`
`131`	`131`	`$xml = $xml->withoutNamespaces();`
`132`		`- //$content = $xml->getXml();`
	`132`	`+ // $content = $xml->getXml();`
`133`	`133`
`134`	`134`	`// Find and append all messages`
`135`	`135`	`foreach ($this->novaMessageParser->findNovaMessages($xml) as $message) {`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`use OrcaServices\NovaApi\Xml\XmlDocument;`
`9`	`9`
`10`	`10`	`/**`
`11`		`- * Class.`
	`11`	`+ * Error parser.`
`12`	`12`	`*/`
`13`	`13`	`final class NovaApiSoapErrorParser`
`14`	`14`	`{`
`@@ -120,7 +120,7 @@ private function getSoapValidationErrors(XmlDocument $xml): NovaApiErrorList`
`120`	`120`
`121`	`121`	`/** @var DOMNode $errorDetail */`
`122`	`122`	`foreach ($errorList as $errorDetail) {`
`123`		`- $errors = $errors->withError($errorDetail->localName, $errorDetail->nodeValue);`
	`123`	`+ $errors = $errors->withError($errorDetail->localName ?? '', $errorDetail->nodeValue ?? '');`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`return $errors;`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ private function appendNovaMessages(XmlDocument $xml, array $namespace, array $m`
`62`	`62`	`// Check for action response errors`
`63`	`63`	`$messageNodes = $xml->queryNodes(sprintf('//%smeldungen/%smeldung', $ns1, $ns2));`
`64`	`64`
`65`		`- if (empty($messageNodes) \|\| $messageNodes->length === 0) {`
	`65`	`+ if ($messageNodes->length === 0) {`
`66`	`66`	`return $messages;`
`67`	`67`	`}`
`68`	`68`
Original file line number	Diff line number	Diff line change
`@@ -72,20 +72,6 @@ public static function createFromDom(DOMDocument $dom): self`
`72`	`72`	`return new self(new DOMXPath($dom));`
`73`	`73`	`}`
`74`	`74`
`75`		`- /**`
`76`		`- * Add all namespaces automatically.`
`77`		`- *`
`78`		`- * @return void`
`79`		`- */`
`80`		`- public function registerAllNamespaces()`
`81`		`- {`
`82`		`- foreach ($this->xpath->query('//namespace::*') ?: [] as $namespaceNode) {`
`83`		`- $prefix = str_replace('xmlns:', '', $namespaceNode->nodeName);`
`84`		`- $namespaceUri = $namespaceNode->nodeValue;`
`85`		`- $this->xpath->registerNamespace($prefix, $namespaceUri);`
`86`		`- }`
`87`		`- }`
`88`		`-`
`89`	`75`	`/**`
`90`	`76`	`* Check if namespace exists.`
`91`	`77`	`*`
`@@ -114,15 +100,14 @@ public function getNodeValue(string $expression, $contextNode = null): string`
`114`	`100`	`{`
`115`	`101`	`$nodes = $this->queryNodes($expression, $contextNode);`
`116`	`102`
`117`		`- if (empty($nodes)`
`118`		`- \|\| $nodes->length === 0`
`119`		`- \|\| !($nodes->item(0) instanceof DOMElement)`
`120`		`- \|\| !($nodes->item(0) instanceof DOMNode)`
	`103`	`+ if ($nodes->length === 0 \|\|`
	`104`	`+ !($nodes->item(0) instanceof DOMElement) \|\|`
	`105`	`+ !($nodes->item(0) instanceof DOMNode)`
`121`	`106`	`) {`
`122`	`107`	`throw new InvalidXmlException(sprintf('XML DOM node [%s] not found.', $expression));`
`123`	`108`	`}`
`124`	`109`
`125`		`- return $nodes->item(0)->nodeValue;`
	`110`	`+ return $nodes->item(0)->nodeValue ?? '';`
`126`	`111`	`}`
`127`	`112`
`128`	`113`	`/**`
`@@ -134,7 +119,7 @@ public function getNodeValue(string $expression, $contextNode = null): string`
`134`	`119`	`*`
`135`	`120`	`* @return string\|null The node value`
`136`	`121`	`*/`
`137`		`- private function findSingleNodeValue(string $expression, DOMXPath $xpath, $contextNode = null)`
	`122`	`+ private function findSingleNodeValue(string $expression, DOMXPath $xpath, $contextNode = null): ?string`
`138`	`123`	`{`
`139`	`124`	`if ($contextNode === null) {`
`140`	`125`	`$node = $xpath->query($expression);`
`@@ -161,14 +146,13 @@ private function findSingleNodeValue(string $expression, DOMXPath $xpath, $conte`
`161`	`146`	`*`
`162`	`147`	`* @return string\|null The node value`
`163`	`148`	`*/`
`164`		`- public function findNodeValue(string $expression, $contextNode = null)`
	`149`	`+ public function findNodeValue(string $expression, $contextNode = null): ?string`
`165`	`150`	`{`
`166`	`151`	`$nodes = $this->queryNodes($expression, $contextNode);`
`167`	`152`
`168`		`- if (empty($nodes)`
`169`		`- \|\| $nodes->length === 0`
`170`		`- \|\| !($nodes->item(0) instanceof DOMElement)`
`171`		`- \|\| !($nodes->item(0) instanceof DOMNode)`
	`153`	`+ if ($nodes->length === 0 \|\|`
	`154`	`+ !($nodes->item(0) instanceof DOMElement) \|\|`
	`155`	`+ !($nodes->item(0) instanceof DOMNode)`
`172`	`156`	`) {`
`173`	`157`	`return null;`
`174`	`158`	`}`
`@@ -190,7 +174,7 @@ public function getAttributeValue(string $expression, $contextNode = null): stri`
`190`	`174`	`{`
`191`	`175`	`$nodes = $this->queryNodes($expression, $contextNode);`
`192`	`176`
`193`		`- if (empty($nodes) \|\| $nodes->length === 0 \|\| !($nodes instanceof DOMNodeList)) {`
	`177`	`+ if ($nodes->length === 0) {`
`194`	`178`	`throw new InvalidXmlException(sprintf('XML DOM attribute [%s] not found.', $expression));`
`195`	`179`	`}`
`196`	`180`
`@@ -199,7 +183,7 @@ public function getAttributeValue(string $expression, $contextNode = null): stri`
`199`	`183`	`throw new InvalidXmlException(sprintf('XML DOM attribute [%s] not found.', $expression));`
`200`	`184`	`}`
`201`	`185`
`202`		`- return $attribute->nodeValue;`
	`186`	`+ return $attribute->nodeValue ?? '';`
`203`	`187`	`}`
`204`	`188`
`205`	`189`	`/**`