Fixed work with Date/Timezone

Author: Vitexus

debian/changelog

@@ -1,4 +1,4 @@
-php-spojenet-abraflexi (2.15) UNRELEASED; urgency=medium
+php-spojenet-abraflexi (2.16) UNRELEASED; urgency=medium
 
   [ Vítězslav Dvořák ]
   * ease-core based
@@ -36,8 +36,9 @@ php-spojenet-abraflexi (2.15) UNRELEASED; urgency=medium
   * v2.13 release
   * v2.14 release
   * Relation class introduced
+  * Relations recovered
 
- -- vitex <[email protected]>  Tue, 05 Oct 2021 11:17:03 +0200
+ -- vitex <[email protected]>  Sun, 17 Oct 2021 15:19:51 +0200
 
 flexipeehp (1.12) experimental; urgency=medium
 

debian/composer.json

@@ -3,7 +3,7 @@
   "description": "Library for easy interaction with czech accounting system AbraFlexi.",
   "homepage": "https://github.com/Spoje-NET/php-abraflexi",
   "license": "GPL-2.0+",
-  "version": "2.15",
+  "version": "2.16",
   "type": "library",
   "authors": [
     {

src/AbraFlexi/Date.php

@@ -33,15 +33,12 @@ public function __construct(string $flexidate = 'NOW') {
         $this->isNull = empty($flexidate);
         $format = '';
         if (strstr($flexidate, '+')) {
-            $format = RO::$DateFormat . 'O';
+            $format = RO::$DateFormat . 'T';
         } elseif (strstr($flexidate, 'Z')) {
             $format = RO::$DateFormat . 'Z';
-        } elseif ( !empty ($flexidate) && ($flexidate != 'NOW')) {
+        } elseif (!empty($flexidate) && ($flexidate != 'NOW')) {
             $format = RO::$DateFormat;
         }
-        if(strstr($flexidate, ':')){ // ?!?!?
-            $flexidate = substr($flexidate,0, -6);
-        }
         parent::__construct(empty($format) ? null : \DateTime::createFromFormat($format, $flexidate)->setTime(0, 0)->format(\DateTimeInterface::ATOM));
     }
 

testing/src/AbraFlexi/DateTest.php

@@ -0,0 +1,69 @@
+<?php
+
+namespace Test\AbraFlexi;
+
+use AbraFlexi\Date;
+
+/**
+ * Generated by PHPUnit_SkeletonGenerator on 2021-10-17 at 16:07:28.
+ */
+class DateTest extends \PHPUnit\Framework\TestCase {
+
+    /**
+     * @var Date
+     */
+    protected $object;
+
+    /**
+     * Sets up the fixture, for example, opens a network connection.
+     * This method is called before a test is executed.
+     */
+    protected function setUp(): void {
+        $this->object = new Date();
+    }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown(): void {
+        
+    }
+
+    /**
+     * Test Constructor
+     *
+     * @covers AbraFlexi\Date::__construct
+     */
+    public function testConstructor() {
+        $classname = get_class($this->object);
+
+        // Get mock, without the constructor being called
+        $mock = $this->getMockBuilder($classname)
+                ->disableOriginalConstructor()
+                ->getMockForAbstractClass();
+        
+        $mock->__construct('');
+        $this->assertTrue($mock->isNull);
+        
+        $mock->__construct('NOW');
+        $this->assertFalse($mock->isNull);
+       
+        $mock->__construct('2021-10-16');
+        
+        $mock->__construct('2021-10-16+02:00');
+        
+        $mock->__construct('2021-10-16Z');
+        
+    }
+
+    
+    
+    /**
+     * @covers AbraFlexi\Date::__toString
+     */
+    public function test__toString() {
+        $this->assertEquals(date('Y-m-d'), $this->object->__toString());
+    }
+
+}