code reformat

Author: Vítězslav Dvořák

.gitignore

@@ -29,5 +29,3 @@ composer.phar
 /.phpdoc/
 /.env
 /node_modules/
-/debian/files
-/examples/*.xml

.openapi-generator/templates/Statementor.mustache

@@ -111,7 +111,7 @@ class Statementor extends \Ease\Sand
      *
      * @throws \Exception
      */
-    public function setScope(string $scope): void
+    public function setScope($scope): \DatePeriod
     {
         switch ($scope) {
             case 'yesterday':
@@ -194,7 +194,6 @@ class Statementor extends \Ease\Sand
                         $this->since = new \DateTime($scope);
                         $this->until = (new \DateTime($scope))->setTime(23, 59, 59, 999);
 
-                        break;
                     }
 
                     throw new \InvalidArgumentException('Unknown scope '.$scope);

.php-cs-fixer.dist.php

@@ -20,7 +20,7 @@
         'strict_param' => true,
         'no_trailing_whitespace' => false,
         'no_trailing_whitespace_in_comment' => false,
-        'braces' => false,
+        'single_space_around_construct' => true,
         'single_blank_line_at_eof' => false,
         'blank_line_after_namespace' => false,
         'no_leading_import_slash' => false,

Makefile

@@ -21,7 +21,7 @@ vendor: composer.json composer.lock ## Installs composer dependencies
 
 .PHONY: cs
 cs: ## Update Coding Standards
-	vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.dist.php --diff --verbose
+	vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.dist.php --diff --verbose  --allow-risky=yes
 
 .PHONY: phpunit
 phpunit: ## Run Tests

lib/ApiClient.php

@@ -1,11 +1,11 @@
 <?php
 
 /**
- *
+ * 
  *
  * @author    Vitex <vitex@hippy.cz>
  * @copyright 2023 Vitex@hippy.cz (G)
- *
+ * 
  * PHP 7
  */
 
@@ -25,12 +25,12 @@ class ApiClient extends \GuzzleHttp\Client
     protected $xIBMClientId = null;
 
     /**
-     * the end IP address of the client application (no server) in IPv4 or IPv6
-     * format. If the bank client (your user) uses a browser by which he
-     * accesses your server app, we need to know the IP address of his browser.
-     * Always provide the closest IP address to the real end-user possible.
+     * the end IP address of the client application (no server) in IPv4 or IPv6 
+     * format. If the bank client (your user) uses a browser by which he 
+     * accesses your server app, we need to know the IP address of his browser. 
+     * Always provide the closest IP address to the real end-user possible. 
      * (optional)
-     *
+     * 
      * @var string
      */
     protected $pSUIPAddress = null;
@@ -43,13 +43,13 @@ class ApiClient extends \GuzzleHttp\Client
 
     /**
      * @inheritDoc
-     *
+     * 
      * $config['clientid'] - obtained from Developer Portal - when you registered your app with us.
      * $config['cert'] = ['/path/to/cert.p12','certificat password']
      * $config['clientpubip'] = the closest IP address to the real end-user
      * $config['mocking'] = true to use /rbcz/premium/mock/* endpoints
-     *
-     * @param array $config
+     * 
+     * @param array $config 
      * @throws \Exception CERT_FILE is not set
      * @throws \Exception CERT_PASS is not set
      */
@@ -73,7 +73,7 @@ public function __construct(array $config = [])
 
         if (array_key_exists('debug', $config) === false) {
             $config['debug'] = \Ease\Shared::cfg('API_DEBUG', false);
-        }
+        } 
 
         if (array_key_exists('clientpubip', $config)) {
             $this->pSUIPAddress = $config['clientpubip'];
@@ -88,7 +88,7 @@ public function __construct(array $config = [])
 
     /**
      * ClientID obtained from Developer Portal
-     *
+     * 
      * @return string
      */
     public function getXIBMClientId()
@@ -98,17 +98,17 @@ public function getXIBMClientId()
 
     /**
      * Keep user public IP here
-     *
+     * 
      * @return string
      */
     public function getpSUIPAddress()
     {
         return $this->pSUIPAddress;
-    }
+    } 
 
     /**
      * Use mocking uri for api calls ?
-     *
+     * 
      * @return boolean
      */
     public function getMockMode()
@@ -118,9 +118,9 @@ public function getMockMode()
 
     /**
      * Obtain Your current Public IP
-     *
+     * 
      * @deprecated since version 0.1 - Do not use in production Environment!
-     *
+     * 
      * @return string
      */
     public static function getPublicIP()
@@ -136,9 +136,9 @@ public static function getPublicIP()
 
     /**
      * Source Identifier
-     *
+     * 
      * @deprecated since version 0.1 - Do not use in production Environment!
-     *
+     * 
      * @return string
      */
     public static function sourceString()
@@ -148,15 +148,15 @@ public static function sourceString()
 
     /**
      * Try to check certificate readibilty
-     *
-     *
+     * 
+     * 
      * @param string  $certFile path to certificate
      * @param boolean $die      throw exception or return false ?
      * @throws Exception - Certificate file not found
-     *
+     * 
      * @return boolean certificate file
      */
-    public static function checkCertificatePresence($certFile, $die = false)
+    public static function checkCertificatePresence(string $certFile, bool $die = false): bool
     {
         $found = false;
         if ((file_exists($certFile) === false) || (is_readable($certFile) === false)) {
@@ -168,14 +168,30 @@ public static function checkCertificatePresence($certFile, $die = false)
         } else {
             $found = true;
         }
-        return  $found;
+        return $found;
+    }
+
+    public static function checkCertificate($certFile, $password): bool
+    {
+        return self::checkCertificatePresence($certFile) && self::checkCertificatePassword($certFile, $password);
+    }
+
+    public static function checkCertificatePassword(string $certFile, string $password): bool
+    {
+        $certContent = file_get_contents($certFile);
+        if (openssl_pkcs12_read($certContent, $certs, $password) === false) {
+            fwrite(\STDERR, 'Cannot read PKCS12 certificate file: '.$certFile.\PHP_EOL);
+            exit(1);
+        }
+        return true;
     }
 
+
     /**
      * Request Identifier
-     *
+     * 
      * @deprecated since version 0.1 - Do not use in production Environment!
-     *
+     * 
      * @return string
      */
     public static function getxRequestId()

lib/ApiException.php

@@ -2,7 +2,7 @@
 
 /**
  * ApiException
- * PHP version 7.4
+ * PHP version 7.4+
  *
  * @category Class
  * @package  VitexSoftware\Raiffeisenbank
@@ -29,7 +29,7 @@
 
 namespace VitexSoftware\Raiffeisenbank;
 
-use Exception;
+use \Exception;
 
 /**
  * ApiException Class Doc Comment
@@ -51,7 +51,7 @@ class ApiException extends Exception
     /**
      * The HTTP header of the server response.
      *
-     * @var string[]|null
+     * @var string[][]|null
      */
     protected $responseHeaders;
 
@@ -67,7 +67,7 @@ class ApiException extends Exception
      *
      * @param string                $message         Error message
      * @param int                   $code            HTTP status code
-     * @param string[]|null         $responseHeaders HTTP response header
+     * @param string[][]|null       $responseHeaders HTTP response header
      * @param \stdClass|string|null $responseBody    HTTP decoded body of the server response either as \stdClass or string
      */
     public function __construct($message = "", $code = 0, $responseHeaders = [], $responseBody = null)
@@ -80,7 +80,7 @@ public function __construct($message = "", $code = 0, $responseHeaders = [], $re
     /**
      * Gets the HTTP response header
      *
-     * @return string[]|null HTTP response header
+     * @return string[][]|null HTTP response header
      */
     public function getResponseHeaders()
     {

lib/Configuration.php

@@ -2,7 +2,7 @@
 
 /**
  * Configuration
- * PHP version 7.4
+ * PHP version 7.4+
  *
  * @category Class
  * @package  VitexSoftware\Raiffeisenbank
@@ -211,7 +211,7 @@ public function getAccessToken()
     /**
      * Sets boolean format for query string.
      *
-     * @param string $booleanFormatForQueryString Boolean format for query string
+     * @param string $booleanFormat Boolean format for query string
      *
      * @return $this
      */
@@ -497,7 +497,7 @@ public static function getHostString(array $hostsSettings, $hostIndex, array $va
 
         // check array index out of bound
         if ($hostIndex < 0 || $hostIndex >= count($hostsSettings)) {
-            throw new \InvalidArgumentException("Invalid index $hostIndex when selecting the host. Must be less than " . count($hostsSettings));
+            throw new \InvalidArgumentException("Invalid index $hostIndex when selecting the host. Must be less than ".count($hostsSettings));
         }
 
         $host = $hostsSettings[$hostIndex];
@@ -507,13 +507,13 @@ public static function getHostString(array $hostsSettings, $hostIndex, array $va
         foreach ($host["variables"] ?? [] as $name => $variable) {
             if (array_key_exists($name, $variables)) { // check to see if it's in the variables provided by the user
                 if (!isset($variable['enum_values']) || in_array($variables[$name], $variable["enum_values"], true)) { // check to see if the value is in the enum
-                    $url = str_replace("{" . $name . "}", $variables[$name], $url);
+                    $url = str_replace("{".$name."}", $variables[$name], $url);
                 } else {
-                    throw new \InvalidArgumentException("The variable `$name` in the host URL has invalid value " . $variables[$name] . ". Must be " . join(',', $variable["enum_values"]) . ".");
+                    throw new \InvalidArgumentException("The variable `$name` in the host URL has invalid value ".$variables[$name].". Must be ".join(',', $variable["enum_values"]).".");
                 }
             } else {
                 // use default value
-                $url = str_replace("{" . $name . "}", $variable["default_value"], $url);
+                $url = str_replace("{".$name."}", $variable["default_value"], $url);
             }
         }
 

lib/HeaderSelector.php

@@ -2,7 +2,7 @@
 
 /**
  * HeaderSelector
- * PHP version 7.4
+ * PHP version 7.4+
  *
  * @category Class
  * @package  VitexSoftware\Raiffeisenbank
@@ -87,7 +87,7 @@ private function selectAcceptHeader(array $accept): ?string
         }
 
         # If none of the available Accept headers is of type "json", then just use all them
-        $headersWithJson = preg_grep('~(?i)^(application/json|[^;/ \t]+/[^;/ \t]+[+]json)[ \t]*(;.*)?$~', $accept);
+        $headersWithJson = $this->selectJsonMimeList($accept);
         if (count($headersWithJson) === 0) {
             return implode(',', $accept);
         }
@@ -97,6 +97,35 @@ private function selectAcceptHeader(array $accept): ?string
         return $this->getAcceptHeaderWithAdjustedWeight($accept, $headersWithJson);
     }
 
+    /**
+    * Detects whether a string contains a valid JSON mime type
+    *
+    * @param string $searchString
+    * @return bool
+    */
+    public function isJsonMime(string $searchString): bool
+    {
+        return preg_match('~^application/(json|[\w!#$&.+-^_]+\+json)\s*(;|$)~', $searchString) === 1;
+    }
+
+    /**
+    * Select all items from a list containing a JSON mime type
+    *
+    * @param array $mimeList
+    * @return array
+    */
+    private function selectJsonMimeList(array $mimeList): array
+    {
+        $jsonMimeList = [];
+        foreach ($mimeList as $mime) {
+            if ($this->isJsonMime($mime)) {
+                $jsonMimeList[] = $mime;
+            }
+        }
+        return $jsonMimeList;
+    }
+
+
     /**
     * Create an Accept header string from the given "Accept" headers array, recalculating all weights
     *
@@ -114,6 +143,7 @@ private function getAcceptHeaderWithAdjustedWeight(array $accept, array $headers
         ];
 
         foreach ($accept as $header) {
+
             $headerData = $this->getHeaderAndWeight($header);
 
             if (stripos($headerData['header'], 'application/json') === 0) {

lib/Model/DownloadStatementRequest.php

@@ -30,8 +30,8 @@
 
 namespace VitexSoftware\Raiffeisenbank\Model;
 
-use ArrayAccess;
-use VitexSoftware\Raiffeisenbank\ObjectSerializer;
+use \ArrayAccess;
+use \VitexSoftware\Raiffeisenbank\ObjectSerializer;
 
 /**
  * DownloadStatementRequest Class Doc Comment
@@ -555,3 +555,5 @@ public function toHeaderValue()
         return json_encode(ObjectSerializer::sanitizeForSerialization($this));
     }
 }
+
+

lib/Model/GetBalance200Response.php

@@ -30,8 +30,8 @@
 
 namespace VitexSoftware\Raiffeisenbank\Model;
 
-use ArrayAccess;
-use VitexSoftware\Raiffeisenbank\ObjectSerializer;
+use \ArrayAccess;
+use \VitexSoftware\Raiffeisenbank\ObjectSerializer;
 
 /**
  * GetBalance200Response Class Doc Comment
@@ -516,3 +516,5 @@ public function toHeaderValue()
         return json_encode(ObjectSerializer::sanitizeForSerialization($this));
     }
 }
+
+