Level 2

Author: swissspidy

lib/cli/Arguments.php

@@ -287,7 +287,7 @@ public function getInvalidArguments() {
 	public function getFlag($flag) {
 		if ($flag instanceOf Argument) {
 			$obj  = $flag;
-			$flag = $flag->value;
+			$flag = $flag->value();
 		}
 
 		if (isset($this->_flags[$flag])) {
@@ -350,7 +350,7 @@ public function isStackable($flag) {
 	public function getOption($option) {
 		if ($option instanceOf Argument) {
 			$obj = $option;
-			$option = $option->value;
+			$option = $option->value();
 		}
 
 		if (isset($this->_options[$option])) {
@@ -412,7 +412,7 @@ public function parse() {
 				continue;
 			}
 
-			array_push($this->_invalid, $argument->raw);
+			array_push($this->_invalid, $argument->raw());
 		}
 
 		if ($this->_strict && !empty($this->_invalid)) {

lib/cli/Streams.php

@@ -27,11 +27,11 @@ static public function isTty() {
 	 * then each key in the array will be the placeholder name. Placeholders are of the
 	 * format {:key}.
 	 *
-	 * @param string   $msg  The message to render.
-	 * @param mixed    ...   Either scalar arguments or a single array argument.
+	 * @param string  $msg  The message to render.
+	 * @param mixed   ...$args Either scalar arguments or a single array argument.
 	 * @return string  The rendered string.
 	 */
-	public static function render( $msg ) {
+	public static function render( $msg, ...$args ) {
 		$args = func_get_args();
 
 		// No string replacement is needed
@@ -66,23 +66,23 @@ public static function render( $msg ) {
 	 * through `sprintf` before output.
 	 *
 	 * @param string  $msg  The message to output in `printf` format.
-	 * @param mixed   ...   Either scalar arguments or a single array argument.
+	 * @param mixed   ...$args Either scalar arguments or a single array argument.
 	 * @return void
 	 * @see \cli\render()
 	 */
-	public static function out( $msg ) {
+	public static function out( $msg, ...$args ) {
 		fwrite( static::$out, self::_call( 'render', func_get_args() ) );
 	}
 
 	/**
 	 * Pads `$msg` to the width of the shell before passing to `cli\out`.
 	 *
 	 * @param string  $msg  The message to pad and pass on.
-	 * @param mixed   ...   Either scalar arguments or a single array argument.
+	 * @param mixed   ...$args Either scalar arguments or a single array argument.
 	 * @return void
 	 * @see cli\out()
 	 */
-	public static function out_padded( $msg ) {
+	public static function out_padded( $msg, ...$args ) {
 		$msg = self::_call( 'render', func_get_args() );
 		self::out( str_pad( $msg, \cli\Shell::columns() ) );
 	}
@@ -107,10 +107,10 @@ public static function line( $msg = '' ) {
 	 *
 	 * @param string  $msg  The message to output in `printf` format. With no string,
 	 *                      a newline is printed.
-	 * @param mixed   ...   Either scalar arguments or a single array argument.
+	 * @param mixed   ...$args Either scalar arguments or a single array argument.
 	 * @return void
 	 */
-	public static function err( $msg = '' ) {
+	public static function err( $msg = '', ...$args ) {
 		// func_get_args is empty if no args are passed even with the default above.
 		$args = array_merge( func_get_args(), array( '' ) );
 		$args[0] .= "\n";

lib/cli/Table.php

@@ -311,7 +311,7 @@ public function countRows() {
 	/**
 	 * Set whether items in an Ascii table are pre-colorized.
 	 *
-	 * @param bool|array $precolorized A boolean to set all columns in the table as pre-colorized, or an array of booleans keyed by column index (number) to set individual columns as pre-colorized.
+	 * @param bool|array $pre_colorized A boolean to set all columns in the table as pre-colorized, or an array of booleans keyed by column index (number) to set individual columns as pre-colorized.
 	 * @see cli\Ascii::setPreColorized()
 	 */
 	public function setAsciiPreColorized( $pre_colorized ) {

lib/cli/arguments/Argument.php

@@ -25,7 +25,7 @@ class Argument extends Memoize {
 	/**
 	 * The canonical name of this argument, used for aliasing.
 	 *
-	 * @param string
+	 * @var string
 	 */
 	public $key;
 

lib/cli/arguments/Lexer.php

@@ -32,7 +32,7 @@ public function __construct(array $items) {
 	/**
 	 * The current token.
 	 *
-	 * @return string
+	 * @return Argument
 	 */
 	#[\ReturnTypeWillChange]
 	public function current() {

lib/cli/cli.php

@@ -19,11 +19,11 @@
  * then each key in the array will be the placeholder name. Placeholders are of the
  * format {:key}.
  *
- * @param string   $msg  The message to render.
- * @param mixed    ...   Either scalar arguments or a single array argument.
+ * @param string  $msg  The message to render.
+ * @param mixed   ...$args Either scalar arguments or a single array argument.
  * @return string  The rendered string.
  */
-function render( $msg ) {
+function render( $msg, ...$args ) {
 	return Streams::_call( 'render', func_get_args() );
 }
 
@@ -32,23 +32,23 @@ function render( $msg ) {
  * through `sprintf` before output.
  *
  * @param string  $msg  The message to output in `printf` format.
- * @param mixed   ...   Either scalar arguments or a single array argument.
+ * @param mixed   ...$args Either scalar arguments or a single array argument.
  * @return void
  * @see \cli\render()
  */
-function out( $msg ) {
+function out( $msg, ...$args ) {
 	Streams::_call( 'out', func_get_args() );
 }
 
 /**
  * Pads `$msg` to the width of the shell before passing to `cli\out`.
  *
  * @param string  $msg  The message to pad and pass on.
- * @param mixed   ...   Either scalar arguments or a single array argument.
+ * @param mixed   ...$args Either scalar arguments or a single array argument.
  * @return void
  * @see cli\out()
  */
-function out_padded( $msg ) {
+function out_padded( $msg, ...$args ) {
 	Streams::_call( 'out_padded', func_get_args() );
 }
 
@@ -68,10 +68,10 @@ function line( $msg = '' ) {
  *
  * @param string  $msg  The message to output in `printf` format. With no string,
  *                      a newline is printed.
- * @param mixed   ...   Either scalar arguments or a single array argument.
+ * @param mixed   ...$args Either scalar arguments or a single array argument.
  * @return void
  */
-function err( $msg = '' ) {
+function err( $msg = '', ...$args ) {
 	Streams::_call( 'err', func_get_args() );
 }
 
@@ -162,7 +162,7 @@ function menu( $items, $default = null, $title = 'Choose an item' ) {
  */
 function safe_strlen( $str, $encoding = false ) {
 	// Allow for selective testings - "1" bit set tests grapheme_strlen(), "2" preg_match_all( '/\X/u' ), "4" mb_strlen(), "other" strlen().
-	$test_safe_strlen = getenv( 'PHP_CLI_TOOLS_TEST_SAFE_STRLEN' );
+	$test_safe_strlen = (int) getenv( 'PHP_CLI_TOOLS_TEST_SAFE_STRLEN' );
 
 	// Assume UTF-8 if no encoding given - `grapheme_strlen()` will return null if given non-UTF-8 string.
 	if ( ( ! $encoding || 'UTF-8' === $encoding ) && can_use_icu() && null !== ( $length = grapheme_strlen( $str ) ) ) {
@@ -225,7 +225,7 @@ function safe_substr( $str, $start, $length = false, $is_width = false, $encodin
 	}
 
 	// Allow for selective testings - "1" bit set tests grapheme_substr(), "2" preg_split( '/\X/' ), "4" mb_substr(), "8" substr().
-	$test_safe_substr = getenv( 'PHP_CLI_TOOLS_TEST_SAFE_SUBSTR' );
+	$test_safe_substr = (int) getenv( 'PHP_CLI_TOOLS_TEST_SAFE_SUBSTR' );
 
 	// Assume UTF-8 if no encoding given - `grapheme_substr()` will return false (not null like `grapheme_strlen()`) if given non-UTF-8 string.
 	if ( ( ! $encoding || 'UTF-8' === $encoding ) && can_use_icu() && false !== ( $try = grapheme_substr( $str, $start, $length ) ) ) {
@@ -325,7 +325,7 @@ function strwidth( $string, $encoding = false ) {
 	list( $eaw_regex, $m_regex ) = get_unicode_regexs();
 
 	// Allow for selective testings - "1" bit set tests grapheme_strlen(), "2" preg_match_all( '/\X/u' ), "4" mb_strwidth(), "other" safe_strlen().
-	$test_strwidth = getenv( 'PHP_CLI_TOOLS_TEST_STRWIDTH' );
+	$test_strwidth = (int) getenv( 'PHP_CLI_TOOLS_TEST_STRWIDTH' );
 
 	// Assume UTF-8 if no encoding given - `grapheme_strlen()` will return null if given non-UTF-8 string.
 	if ( ( ! $encoding || 'UTF-8' === $encoding ) && can_use_icu() && null !== ( $width = grapheme_strlen( $string ) ) ) {

lib/cli/table/Ascii.php

@@ -246,7 +246,7 @@ private function padColumn($content, $column) {
 	/**
 	 * Set whether items are pre-colorized.
 	 *
-	 * @param bool|array $colorized A boolean to set all columns in the table as pre-colorized, or an array of booleans keyed by column index (number) to set individual columns as pre-colorized.
+	 * @param bool|array $pre_colorized A boolean to set all columns in the table as pre-colorized, or an array of booleans keyed by column index (number) to set individual columns as pre-colorized.
 	 */
 	public function setPreColorized( $pre_colorized ) {
 		$this->_pre_colorized = $pre_colorized;

phpstan.neon.dist

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