Add MajorMinorVersion to PhpVersion objects

Author: mlocati

PhpManager/private/PhpVersion.ps1

@@ -1,5 +1,11 @@
 class PhpVersion : System.IComparable
 {
+    <#
+    The major.minor version of PHP
+    #>
+    [ValidateNotNull()]
+    [ValidateLength(1, [int]::MaxValue)]
+    [string] $MajorMinorVersion
     <#
     The version of PHP, without the alpha/beta/RC state
     #>
@@ -8,6 +14,12 @@
     [ValidateLength(1, [int]::MaxValue)]
     $Version
     <#
+    The version of PHP, possibly including the alpha/beta/RC state
+    #>
+    [ValidateNotNull()]
+    [ValidateLength(1, [int]::MaxValue)]
+    [string] $FullVersion
+    <#
     The unstability level, if any (alpha, beta, RC)
     #>
     [string]
@@ -18,12 +30,6 @@
     #>
     [Nullable[int]] $UnstabilityVersion
     <#
-    the version of PHP, possibly including the alpha/beta/RC state
-    #>
-    [ValidateNotNull()]
-    [ValidateLength(1, [int]::MaxValue)]
-    [string] $FullVersion
-    <#
     A string used to display the details of the version
     #>
     [ValidateNotNull()]
@@ -76,8 +82,8 @@
         } else {
             $this.UnstabilityLevel = $null
         }
-        $dv = $this.Version
-        $cv = $this.Version
+        $dv = $data.Version
+        $cv = $data.Version
         switch ($this.UnstabilityLevel) {
             '' {
                 $cv += '.9999999'
@@ -98,8 +104,11 @@
                 throw 'Unrecognized UnstabilityLevel'
             }
         }
+        $cv = [System.Version] $cv
+        $this.MajorMinorVersion = '{0}.{1}' -f $cv.Major,$cv.Minor
+        $this.Version = $data.Version
         $this.FullVersion = $dv
-        $this.ComparableVersion = [System.Version] $cv
+        $this.ComparableVersion = $cv
         $this.Architecture = $data.Architecture
         $this.ThreadSafe = $data.ThreadSafe
         $this.VCVersion = $data.VCVersion

README.md

@@ -147,6 +147,23 @@ You can also specify a directory: the command will display the details of the PH
 Get-Php C:\PHP
 ```
 
+Sample Output:
+
+```
+Folder             : C:\PHP
+ExecutablePath     : C:\PHP\php.exe
+ExtensionsPath     : C:\PHP\ext
+MajorMinorVersion  : 7.4
+Version            : 7.4.0
+FullVersion        : 7.4.0RC6
+UnstabilityLevel   : RC
+UnstabilityVersion : 6
+DisplayName        : PHP 7.4.0RC6 x86 (32-bit) Thread-Safe
+Architecture       : x86
+ThreadSafe         : True
+VCVersion          : 15
+```
+
 ### Getting `php.ini` configuration keys
 
 Use the `Get-PhpIniKey` command to retrieve the value of a configuration in the `php.ini` file used by a PHP installation.

test/tests/Install-Get-Update-Uninstall-Php.Tests.ps1

@@ -13,6 +13,7 @@
             $initialPhpVersion.GetType().FullName | Should -BeExactly 'PhpVersionInstalled'
             $initialPhpVersion.Version | Should -BeOfType [string]
             $initialPhpVersion.Version | Should -BeExactly '7.1.0'
+            $initialPhpVersion.MajorMinorVersion | Should -BeExactly '7.1'
             $initialPhpVersion.ComparableVersion | Should -BeOfType [version]
             $initialPhpVersion.UnstabilityLevel | Should -BeNullOrEmpty
             $initialPhpVersion.UnstabilityVersion | Should -BeNullOrEmpty