Code cleanup

Author: alecpl

Crypt/Console/PinCliParameters.php

@@ -7,16 +7,19 @@ class PinCliParameters
     private $verbose;
     private $log;
 
-    public function __construct($verbose = 0, $log = null) {
+    public function __construct($verbose = 0, $log = null)
+    {
         $this->verbose = $verbose;
         $this->log = $log;
     }
 
-    public function getVerbose() {
+    public function getVerbose()
+    {
         return $this->verbose;
     }
 
-    public function getLog() {
+    public function getLog()
+    {
         return $this->log;
     }
-}
+}

Crypt/Console/SimpleCliWrapper.php

@@ -2,7 +2,6 @@
 
 namespace Crypt\Console;
 
-
 require_once __DIR__ . '/PinCliParameters.php';
 
 class SimpleCliWrapper
@@ -93,7 +92,6 @@ public function parseCli()
      * }
      * ```
      *
-     * @param $msg
      * @return void
      */
     public function writeToErrOrEcho($msg)
@@ -128,10 +126,7 @@ private function printHelp()
 ";
     }
 
-
     /**
-     * @param array $opts
-     *
      * @return int
      */
     public static function getVerbosityLevel(array $opts)
@@ -140,7 +135,6 @@ public static function getVerbosityLevel(array $opts)
             return self::DEFAULT_VERBOSITY;
         }
 
-
         // the default options with just a -v is false, but based
         // on the old system, it would be level 0
         if (isset($opts[self::VERBOSE_SHORT])) {
@@ -164,11 +158,10 @@ public static function getVerbosityLevel(array $opts)
 
     }
 
-
     public static function getLogLocation(array $opts)
     {
         if (!isset($opts[self::LOG_SHORT]) && !isset($opts[self::LOG_LONG])) {
-            return "";
+            return '';
         }
 
         if (isset($opts[self::LOG_SHORT]) && is_string($opts[self::LOG_SHORT])) {
@@ -181,4 +174,4 @@ public static function getLogLocation(array $opts)
 
         return self::INVALID_INPUT;
     }
-}
+}

scripts/crypt-gpg-pinentry

@@ -5,13 +5,9 @@
 
 // Check if we're running directly from git repo or if we're running
 // from a PEAR or Composer packaged version.
-$ds    = DIRECTORY_SEPARATOR;
-$root  = __DIR__ . $ds . '..' ;
 $paths = [
     '@php-dir@', // PEAR or Composer
-    $root, // Git (or Composer with wrong @php-dir@)
-    // and composer-installed PEAR_Exception for Console_CommandLine (#21074)
-    $root . $ds . '..' . $ds . '..' . $ds . 'pear' . $ds . 'pear_exception',
+    __DIR__ . DIRECTORY_SEPARATOR . '..', // Git (or Composer with wrong @php-dir@)
 ];
 
 foreach ($paths as $idx => $path) {