fixed #500

Author: lesstif

README.md

@@ -2282,8 +2282,10 @@ try {
     $version->setName('1.0.0')
             ->setDescription('Generated by script')
             ->setReleased(true)
-            ->setReleaseDate(new \DateTime())
-            ->setProjectId($project->id);
+            ->setStartDateAsDateTime(new \DateTime())
+            ->setReleaseDateAsDateTime((new \DateTime())->add(date_interval_create_from_date_string('1 months 3 days')))
+            ->setProjectId($project->id)
+            ;
 
     $res = $versionService->create($version);
 
@@ -2316,9 +2318,9 @@ try {
     $ver->setName($ver->name . ' Updated name')
         ->setDescription($ver->description . ' Updated description')
         ->setReleased(false)
-        ->setReleaseDate(
-            (new \DateTime())->add(date_interval_create_from_date_string('1 months 3 days'))
-        );
+        ->setStartDateAsDateTime(new \DateTime())
+        ->setReleaseDateAsDateTime((new \DateTime())->add(date_interval_create_from_date_string('2 weeks 3 days')))
+        ;
 
     $res = $versionService->update($ver);
 

src/Issue/Version.php

@@ -20,14 +20,17 @@ class Version implements \JsonSerializable
 
     public bool $released;
 
-    public \DateTimeInterface|string $releaseDate;
+    public string $releaseDate;
 
     public bool $overdue;
 
     public ?string $userReleaseDate;
 
     public int $projectId;
 
+    public ?string $startDate;
+    public ?string $userStartDate;
+
     public function __construct($name = null)
     {
         $this->name = $name;
@@ -74,7 +77,14 @@ public function setReleased($released): static
         return $this;
     }
 
-    public function setReleaseDate(DateTimeInterface $releaseDate): static
+    public function setReleaseDateAsDateTime(DateTimeInterface $releaseDate, string $format='Y-m-d'): static
+    {
+        $this->releaseDate = $releaseDate->format($format);
+
+        return $this;
+    }
+
+    public function setReleaseDateAsString(string $releaseDate): static
     {
         $this->releaseDate = $releaseDate;
 
@@ -87,4 +97,32 @@ public function setUserReleaseDateAsDateTime($userReleaseDate): static
 
         return $this;
     }
+
+    public function setStartDateAsDateTime(\DateTimeInterface $startDate, string $format='Y-m-d'): static
+    {
+        $this->startDate = $startDate->format($format);
+
+        return $this;
+    }
+
+    public function setStartDateAsString(?string $startDate): static
+    {
+        $this->startDate = $startDate;
+
+        return $this;
+    }
+
+    public function setUserStartDateAsDateTime(\DateTimeInterface $userStartDate, string $format='Y-m-d'): static
+    {
+        $this->userStartDate = $userStartDate->format($format);
+
+        return $this;
+    }
+
+    public function setUserStartDateAsString(?string $userStartDate): static
+    {
+        $this->userStartDate = $userStartDate;
+
+        return $this;
+    }
 }

src/Version/VersionService.php

@@ -84,20 +84,18 @@ public function get(string $id)
      *
      * @return Version
      */
-    public function update(Version $version)
+    public function update(Version $version) : Version
     {
         if (!$version->id || !is_numeric($version->id)) {
             throw new JiraException($version->id.' is not a valid version id.');
         }
 
-        if ($version->releaseDate instanceof \DateTimeInterface) {
-            $version->releaseDate = $version->releaseDate->format('Y-m-d');
-        }
-
-        //Only one of 'releaseDate' and 'userReleaseDate' can be specified when editing a version."
+        // avoid weird error "Only one of 'releaseDate' and 'userReleaseDate' can be specified when editing a version."
         $version->userReleaseDate = null;
+        $version->userStartDate = null;
 
         $data = json_encode($version);
+
         $ret = $this->exec($this->uri.'/'.$version->id, $data, 'PUT');
 
         return $this->json_mapper->map(

tests/VersionTest.php

@@ -10,12 +10,11 @@
 
 class VersionTest extends TestCase
 {
-    private $project = 'TEST';
+    private string $project = 'TEST';
 
     /**
      * @test
-     * @return void
-     * @throws \JsonMapper_Exception
+     *
      */
     public function create_version() : string
     {
@@ -31,15 +30,16 @@ public function create_version() : string
 
             $version->setName($versionName)
                     ->setDescription('Generated by script')
-                    ->setReleased(true)
-                    ->setReleaseDate(new \DateTime())
+                    ->setReleased(false)
+                    ->setUserStartDateAsDateTime(new \DateTime())
+                    ->setReleaseDateAsDateTime((new \DateTime())->add(date_interval_create_from_date_string('2 weeks 3 days')))
                     ->setProjectId($project->id);
 
             $res = $versionService->create($version);
 
             $this->assertEquals($res->name, $versionName);
         } catch (JiraException $e) {
-            print("Error Occured! " . $e->getMessage());
+            $this->fail("Error Occurred! " . $e->getMessage());
         }
 
         return $versionName;
@@ -52,6 +52,7 @@ public function create_version() : string
      */
     public function update_project_version(string $versionName) : string
     {
+        $newVersionName = null;
         try {
             $versionService = new VersionService();
             $projectService = new ProjectService();
@@ -62,19 +63,22 @@ public function update_project_version(string $versionName) : string
             $ver->setName($ver->name . ' Updated name')
                 ->setDescription($ver->description . ' Updated description')
                 ->setReleased(false)
-                ->setReleaseDate(
+                ->setStartDateAsDateTime(new \DateTime())
+                ->setReleaseDateAsDateTime(
                     (new \DateTime())->add(date_interval_create_from_date_string('1 months 3 days'))
-                    );
+                    )
+                ;
 
             $res = $versionService->update($ver);
 
             $this->assertEquals($res->name, $ver->name);
 
-            return $ver->name;
+            $newVersionName = $res->name;
         } catch (JiraException $e) {
-            print("Error Occurred! " . $e->getMessage());
+            $this->fail("Error Occurred! " . $e->getMessage());
         }
 
+        return $newVersionName;
     }
 
     /**
@@ -91,9 +95,9 @@ public function delete_project_version(string $versionName) : string
 
             $res = $versionService->delete($ver);
 
-            $this->assertEquals($res, true);
+            $this->assertEquals(true, $res);
         } catch (JiraException $e) {
-            print("Error Occured! " . $e->getMessage());
+            $this->fail("Error Occurred! " . $e->getMessage());
         }
 
         return $versionName;