Level 8

Author: swissspidy

lib/cli/Arguments.php

@@ -73,7 +73,7 @@ public function getArguments() {
 		if (!isset($this->_parsed)) {
 			$this->parse();
 		}
-		return $this->_parsed;
+		return $this->_parsed ?? [];
 	}
 
 	/**
@@ -110,7 +110,7 @@ public function offsetExists($offset) {
 			$offset = $offset->key;
 		}
 
-		return array_key_exists($offset, $this->_parsed);
+		return array_key_exists($offset, $this->_parsed ?? []);
 	}
 
 	/**
@@ -442,15 +442,20 @@ public function parse() {
 
 		$this->_applyDefaults();
 
-		foreach ($this->_lexer as $argument) {
-			if ($this->_parseFlag($argument)) {
-				continue;
-			}
-			if ($this->_parseOption($argument)) {
-				continue;
-			}
+		if ($this->_lexer) {
+			foreach ($this->_lexer as $argument) {
+				if (null === $argument) {
+					continue;
+				}
+				if ($this->_parseFlag($argument)) {
+					continue;
+				}
+				if ($this->_parseOption($argument)) {
+					continue;
+				}
 
-			array_push($this->_invalid, $argument->raw());
+				array_push($this->_invalid, $argument->raw());
+			}
 		}
 
 		if ($this->_strict && !empty($this->_invalid)) {
@@ -523,6 +528,8 @@ private function _parseOption($option) {
 			return false;
 		}
 
+		assert(null !== $this->_lexer);
+
 		// Peak ahead to make sure we get a value.
 		if ($this->_lexer->end() || !$this->_lexer->peek->isValue) {
 			$optionSettings = $this->getOption($option->key);
@@ -546,6 +553,9 @@ private function _parseOption($option) {
 		// Loop until we find a flag in peak-ahead
 		while ( $this->_lexer->valid() ) {
 			$value = $this->_lexer->current();
+			if ( null === $value ) {
+				break;
+			}
 			array_push( $values, $value->raw );
 
 			if ( ! $this->_lexer->end() && ! $this->_lexer->peek->isValue ) {

lib/cli/Streams.php

@@ -204,7 +204,7 @@ public static function prompt( $question, $default = false, $marker = ': ', $hid
 	 *
 	 * @param string  $question  The question to ask the user.
 	 * @param string  $choice    A string of characters allowed as a response. Case is ignored.
-	 * @param string  $default   The default choice. NULL if a default is not allowed.
+	 * @param string|null $default   The default choice. NULL if a default is not allowed.
 	 * @return string  The users choice.
 	 * @see cli\prompt()
 	 */
@@ -214,12 +214,16 @@ public static function choose( $question, $choice = 'yn', $default = 'n' ) {
 		}
 
 		// Make every choice character lowercase except the default
-		$choice = str_ireplace( $default, strtoupper( $default ), strtolower( $choice ) );
+		if ( null !== $default ) {
+			$choice = str_ireplace( $default, strtoupper( $default ), strtolower( $choice ) );
+		} else {
+			$choice = strtolower( $choice );
+		}
 		// Separate each choice with a forward-slash
 		$choices = trim( join( '/', str_split( $choice ) ), '/' );
 
 		while( true ) {
-			$line = self::prompt( sprintf( '%s? [%s]', $question, $choices ), $default, '' );
+			$line = self::prompt( sprintf( '%s? [%s]', $question, $choices ), $default ?? false, '' );
 
 			if( stripos( $choice, $line ) !== false ) {
 				return strtolower( $line );

lib/cli/arguments/Argument.php

@@ -140,7 +140,7 @@ public function exploded() {
 			array_push($exploded, $this->_argument[$i - 1]);
 		}
 
-		$this->_argument = array_pop($exploded);
+		$this->_argument = (string) array_pop($exploded);
 		$this->_raw      = '-' . $this->_argument;
 		return $exploded;
 	}

lib/cli/arguments/Lexer.php

@@ -17,7 +17,7 @@
 /**
  * @property-read Argument $peek
  *
- * @implements \Iterator<int, Argument>
+ * @implements \Iterator<int, Argument|null>
  */
 class Lexer extends Memoize implements \Iterator {
 	/** @var Argument|null */
@@ -42,7 +42,7 @@ public function __construct(array $items) {
 	/**
 	 * The current token.
 	 *
-	 * @return Argument
+	 * @return Argument|null
 	 */
 	#[\ReturnTypeWillChange]
 	public function current() {
@@ -125,7 +125,8 @@ public function end() {
 	 * @return void
 	 */
 	private function _shift() {
-		$this->_item = new Argument(array_shift($this->_items));
+		$shifted = array_shift($this->_items);
+		$this->_item = null !== $shifted ? new Argument($shifted) : null;
 		$this->_index += 1;
 		$this->_explode();
 		$this->_unmemo('peek');
@@ -135,7 +136,7 @@ private function _shift() {
 	 * @return void
 	 */
 	private function _explode() {
-		if (!$this->_item->canExplode) {
+		if (null === $this->_item || !$this->_item->canExplode) {
 			return;
 		}
 

lib/cli/table/Tabular.php

@@ -42,11 +42,13 @@ public function row( array $row ) {
 
 		$rows[] = $row;
 
-		foreach ( $split_lines as $i => $line ) {
-			if ( ! isset( $rows[ $i + 1 ] ) ) {
-				$rows[ $i + 1 ] = array_fill_keys( array_keys( $row ), '' );
+		if ( null !== $col ) {
+			foreach ( $split_lines as $i => $line ) {
+				if ( ! isset( $rows[ $i + 1 ] ) ) {
+					$rows[ $i + 1 ] = array_fill_keys( array_keys( $row ), '' );
+				}
+				$rows[ $i + 1 ][ $col ] = $line;
 			}
-			$rows[ $i + 1 ][ $col ] = $line;
 		}
 
 		foreach ( $rows as $r ) {

phpstan.neon.dist

@@ -1,5 +1,5 @@
 parameters:
-  level: 7
+  level: 8
   paths:
     - lib
   scanDirectories: