Additional error handling for SemanticVersions

Author: jonesiscoding

composer.json

@@ -9,7 +9,7 @@
             "email": "am@jonesiscoding.com"
         }
     ],
-    "version": "1.5",
+    "version": "1.5.1",
     "autoload": {
         "psr-4": {
             "DevCoding\\Mac\\": "src"

src/Objects/MacApplication.php

@@ -56,7 +56,7 @@ public function getShortVersion()
   {
     try
     {
-      return SemanticVersion::parse($this->getPlistValue('CFBundleShortVersionString'));
+      return new SemanticVersion($this->getPlistValue('CFBundleShortVersionString'));
     }
     catch (\Exception $e)
     {
@@ -71,7 +71,7 @@ public function getVersion()
   {
     try
     {
-      return SemanticVersion::parse($this->getPlistValue('CFBundleVersion'));
+      return new SemanticVersion($this->getPlistValue('CFBundleVersion'));
     }
     catch (\Exception $e)
     {

src/Objects/SemanticVersion.php

@@ -6,15 +6,33 @@
 
 class SemanticVersion extends Version
 {
+  protected $raw;
+
   public function __construct(string $version = '0.1.0')
   {
+    $this->raw = $version;
+
     try
     {
       parent::__construct($version);
     }
     catch (\Exception $e)
     {
-      $Fix = static::parse($version);
+      try
+      {
+        // Try the built in fixer
+        $Fix = static::parse($version);
+      }
+      catch (\Exception $e)
+      {
+        // Too many dots
+        $v = explode('.', $version);
+        if (count($v) > 3)
+        {
+          $version = array_shift($v) . "." . array_shift($v) . '.' . implode('', $v);
+          $Fix = static::parse($version);
+        }
+      }
 
       $this->setMajor($Fix->major);
       $this->setMinor($Fix->minor);
@@ -24,6 +42,11 @@ public function __construct(string $version = '0.1.0')
     }
   }
 
+  public function getRaw()
+  {
+    return $this->raw;
+  }
+
   public function getBuild()
   {
     return $this->build;