Minor code tweaks for return types and conformity.

Author: jonesiscoding

src/Objects/AbstractMacPower.php

@@ -8,6 +8,11 @@ abstract class AbstractMacPower
 {
   use ShellTrait;
 
+  /**
+   * @param string $key
+   *
+   * @return string|null
+   */
   protected function getPowerDataType($key)
   {
     $data = explode("\n", $this->getShellExec('system_profiler SPPowerDataType'));

src/Objects/AdobeApplication.php

@@ -68,7 +68,7 @@ function ($v) {
 
             if (file_exists($file))
             {
-              return new AdobeApplication(dirname(dirname($file)));
+              return new AdobeApplication(dirname($file, 2));
             }
           }
         }
@@ -79,7 +79,7 @@ function ($v) {
   }
 
   /**
-   * @return false|string
+   * @return false|SemanticVersion
    */
   public function getBaseVersion()
   {
@@ -113,7 +113,7 @@ public function getSap()
     {
       $info = $this->getAdobeAppInfo($this->getSlug());
 
-      $this->_sap = isset($info['sap']) ? $info['sap'] : false;
+      $this->_sap = $info['sap'] ?? false;
     }
 
     return $this->_sap;
@@ -218,13 +218,13 @@ private static function getAppInfoFromAdbArg($str)
                     $tYear = $year;
                   }
 
-                  $paths[] = dirname(dirname($template));
+                  $paths[] = dirname($template, 2);
                 }
               }
             }
 
             $names[]    = $tInfo['productName'];
-            $bVer[$ver] = isset($tYear) ? $tYear : $tInfo['productName'];
+            $bVer[$ver] = $tYear ?? $tInfo['productName'];
           }
         }
       }

src/Objects/MacApplication.php

@@ -50,7 +50,7 @@ public function getIdentifier()
   }
 
   /**
-   * @return SemanticVersion|Version|null
+   * @return SemanticVersion|null
    */
   public function getShortVersion()
   {
@@ -65,7 +65,7 @@ public function getShortVersion()
   }
 
   /**
-   * @return SemanticVersion|Version|null
+   * @return SemanticVersion|null
    */
   public function getVersion()
   {

src/Objects/MacBattery.php

@@ -65,7 +65,7 @@ public function getCondition()
   }
 
   /**
-   * @return int|null
+   * @return string|null
    */
   public function getCycles()
   {

src/Objects/MacDevice.php

@@ -186,7 +186,7 @@ public function isBatteryPowered()
    * Determines if the display is prevented from sleeping by an assertation, usually an indicator that a presentation
    * or video conference is currently running.
    *
-   * @return string|null
+   * @return bool
    */
   public function isDisplaySleepPrevented()
   {
@@ -239,7 +239,7 @@ public function isSecurityChip()
   }
 
   /**
-   * Determines if the MacOS Secure Boot feature is set to "full".
+   * Determines if the macOS Secure Boot feature is set to "full".
    *
    * @return bool
    */