Merge origin/main into main

Author: Vitexus

src/AbraFlexi/Banka.php

@@ -40,7 +40,11 @@ class Banka extends RW {
      * @return boolean
      */
     public function stahnoutVypisyOnline() {
-        $this->performRequest('nacteni-vypisu-online.json', 'PUT', 'txt');
+        try {
+            $this->performRequest('nacteni-vypisu-online.json', 'PUT', 'txt');
+        } catch (Exception $exc) {
+            $this->addStatusMessage('Json response is still plaintext', 'debug');
+        }
         return $this->lastResponseCode == 200;
     }
 

src/AbraFlexi/Date.php

@@ -16,22 +16,33 @@
  */
 class Date extends \DateTime {
 
+    /**
+     * Support for Null values
+     * @var bool
+     */
+    public bool $isNull = false;
+
     /**
      * AbraFlexi date to PHP DateTime conversion
      *
-     * @param string $flexidate 2017-05-26 or 2017-05-26Z or 2017-05-26+02:00
+     * @param string $flexidate 2017-05-26 or 2017-05-26Z or 2017-05-26+02:00 or "NOW"
      *
      * @return \DateTime | false
      */
-    public function __construct(string $flexidate) {
+    public function __construct(string $flexidate = 'NOW') {
+        $this->isNull = empty($flexidate);
+        $format = '';
         if (strstr($flexidate, '+')) {
             $format = RO::$DateFormat . 'O';
         } elseif (strstr($flexidate, 'Z')) {
             $format = RO::$DateFormat . 'Z';
-        } else {
+        } elseif ( !empty ($flexidate) && ($flexidate != 'NOW')) {
             $format = RO::$DateFormat;
         }
-        parent::__construct(\DateTime::createFromFormat($format, $flexidate)->setTime(0, 0)->format(\DateTimeInterface::ATOM));
+        if(strstr($flexidate, ':')){ // ?!?!?
+            $flexidate = substr($flexidate,0, -6);
+        }
+        parent::__construct(empty($format) ? null : \DateTime::createFromFormat($format, $flexidate)->setTime(0, 0)->format(\DateTimeInterface::ATOM));
     }
 
     /**
@@ -40,7 +51,7 @@ public function __construct(string $flexidate) {
      * @return string
      */
     public function __toString() {
-        return $this->format(RO::$DateFormat);
+        return $this->isNull ? null : $this->format(RO::$DateFormat);
     }
 
 }

src/AbraFlexi/DateTime.php

@@ -16,20 +16,28 @@
  */
 class DateTime extends \DateTime {
 
+    /**
+     * Support for Null values
+     * @var bool
+     */
+    public bool $isNull = false;
+
     /**
      * AbraFlexi dateTime to PHP DateTime conversion
      *
      * @param string $flexidatetime 2017-09-26T10:00:53.755+02:00 or older 2017-05-19T00:00:00+02:00
      *
      * @return \DateTime | false
      */
-    public function __construct(string $flexidatetime) {
+    public function __construct(string $flexidatetime = 'NOW') {
+        $this->isNull = empty($flexidatetime);
+        $format = '';
         if (strchr($flexidatetime, '.')) { //NewFormat
             $format = RO::$DateTimeFormat;
-        } else { // Old format
+        } elseif ( !empty ($flexidatetime) && ($flexidatetime != 'NOW')) { // Old format
             $format = 'Y-m-d\TH:i:s+P';
         }
-        parent::__construct(\DateTime::createFromFormat($format, $flexidatetime)->format(\DateTimeInterface::ATOM));
+        parent::__construct(empty($format) ? null : \DateTime::createFromFormat($format, $flexidatetime)->format(\DateTimeInterface::ATOM));
     }
 
     /**
@@ -38,7 +46,7 @@ public function __construct(string $flexidatetime) {
      * @return string
      */
     public function __toString() {
-        return $this->format(RO::$DateTimeFormat);
+        return $this->isNull ? null : $this->format(RO::$DateTimeFormat);
     }
 
 }