Merge branch 'master' into patch-2

Author: swissspidy

.github/workflows/testing.yml

@@ -1,6 +1,7 @@
 name: Testing
 
 on:
+  workflow_dispatch:
   pull_request:
   push:
     branches:

.travis.yml

@@ -1,13 +1,11 @@
 PHP Command Line Tools
 ======================
 
-[![Build Status](https://travis-ci.org/wp-cli/php-cli-tools.png?branch=master)](https://travis-ci.org/wp-cli/php-cli-tools)
-
 A collection of functions and classes to assist with command line development.
 
 Requirements
 
- * PHP >= 5.3
+ * PHP >= 5.6
 
 Suggested PHP extensions
 

README.md

@@ -18,15 +18,15 @@
         }
     ],
     "require": {
-        "php": ">= 5.3.0"
+        "php": ">= 7.2.24"
     },
     "require-dev": {
         "roave/security-advisories": "dev-latest",
-        "wp-cli/wp-cli-tests": "^4"
+        "wp-cli/wp-cli-tests": "^5"
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "0.11.x-dev"
+            "dev-master": "0.12.x-dev"
         }
     },
     "minimum-stability": "dev",
@@ -42,22 +42,22 @@
     "config": {
         "allow-plugins": {
             "dealerdirect/phpcodesniffer-composer-installer": true,
-            "johnpbloch/wordpress-core-installer": true
+            "johnpbloch/wordpress-core-installer": true,
+            "phpstan/extension-installer": true
         }
     },
     "scripts": {
-        "post-install-cmd": [
-            "./utils/git-setup-pre-commit-hook"
-        ],
         "behat": "run-behat-tests",
         "behat-rerun": "rerun-behat-tests",
         "lint": "run-linter-tests",
         "phpcs": "run-phpcs-tests",
+        "phpstan": "run-phpstan-tests",
         "phpunit": "run-php-unit-tests",
         "prepare-tests": "install-package-tests",
         "test": [
             "@lint",
             "@phpcs",
+            "@phpstan",
             "@phpunit",
             "@behat"
         ]

composer.json

@@ -4,7 +4,7 @@
 	die('Must run from command line');
 }
 
-error_reporting(E_ALL | E_STRICT);
+error_reporting(E_ALL);
 ini_set('display_errors', 1);
 ini_set('log_errors', 0);
 ini_set('html_errors', 0);

examples/common.php

@@ -92,7 +92,7 @@ static public function color($color) {
 		$colors = array();
 		foreach (array('color', 'style', 'background') as $type) {
 			$code = $color[$type];
-			if (isset(self::$_colors[$type][$code])) {
+			if (isset($code) && isset(self::$_colors[$type][$code])) {
 				$colors[] = self::$_colors[$type][$code];
 			}
 		}
@@ -108,9 +108,9 @@ static public function color($color) {
 	 * Colorize a string using helpful string formatters. If the `Streams::$out` points to a TTY coloring will be enabled,
 	 * otherwise disabled. You can control this check with the `$colored` parameter.
 	 *
-     * @param string   $string
+	 * @param string   $string
 	 * @param boolean  $colored  Force enable or disable the colorized output. If left as `null` the TTY will control coloring.
-     * @return string
+	 * @return string
 	 */
 	static public function colorize($string, $colored = null) {
 		$passed = $string;
@@ -146,6 +146,8 @@ static public function colorize($string, $colored = null) {
 	 * @return string A string with color information removed.
 	 */
 	static public function decolorize( $string, $keep = 0 ) {
+		$string = (string) $string;
+
 		if ( ! ( $keep & 1 ) ) {
 			// Get rid of color tokens if they exist
 			$string = str_replace('%%', '%¾', $string);
@@ -182,7 +184,7 @@ static public function cacheString( $passed, $colorized, $deprecated = null ) {
 	 * Return the length of the string without color codes.
 	 *
 	 * @param string  $string  the string to measure
-     * @return int
+	 * @return int
 	 */
 	static public function length($string) {
 		return safe_strlen( self::decolorize( $string ) );
@@ -194,7 +196,7 @@ static public function length($string) {
 	 * @param string      $string        The string to measure.
 	 * @param bool        $pre_colorized Optional. Set if the string is pre-colorized. Default false.
 	 * @param string|bool $encoding      Optional. The encoding of the string. Default false.
-     * @return int
+	 * @return int
 	 */
 	static public function width( $string, $pre_colorized = false, $encoding = false ) {
 		return strwidth( $pre_colorized || self::shouldColorize() ? self::decolorize( $string, $pre_colorized ? 1 /*keep_tokens*/ : 0 ) : $string, $encoding );
@@ -208,9 +210,11 @@ static public function width( $string, $pre_colorized = false, $encoding = false
 	 * @param bool        $pre_colorized Optional. Set if the string is pre-colorized. Default false.
 	 * @param string|bool $encoding      Optional. The encoding of the string. Default false.
 	 * @param int         $pad_type      Optional. Can be STR_PAD_RIGHT, STR_PAD_LEFT, or STR_PAD_BOTH. If pad_type is not specified it is assumed to be STR_PAD_RIGHT.
-     * @return string
+	 * @return string
 	 */
 	static public function pad( $string, $length, $pre_colorized = false, $encoding = false, $pad_type = STR_PAD_RIGHT ) {
+		$string = (string) $string;
+
 		$real_length = self::width( $string, $pre_colorized, $encoding );
 		$diff = strlen( $string ) - $real_length;
 		$length += $diff;

lib/cli/Colors.php

@@ -30,6 +30,9 @@ abstract class Notify {
 	protected $_message;
 	protected $_start;
 	protected $_timer;
+	protected $_tick;
+	protected $_iteration = 0;
+	protected $_speed = 0;
 
 	/**
 	 * Instatiates a Notification object.
@@ -92,23 +95,21 @@ public function elapsed() {
 	 * @return int  The number of ticks performed in 1 second.
 	 */
 	public function speed() {
-		static $tick, $iteration = 0, $speed = 0;
-
 		if (!$this->_start) {
 			return 0;
-		} else if (!$tick) {
-			$tick = $this->_start;
+		} else if (!$this->_tick) {
+			$this->_tick = $this->_start;
 		}
 
 		$now = microtime(true);
-		$span = $now - $tick;
+		$span = $now - $this->_tick;
 		if ($span > 1) {
-			$iteration++;
-			$tick = $now;
-			$speed = ($this->_current / $iteration) / $span;
+			$this->_iteration++;
+			$this->_tick = $now;
+			$this->_speed = ($this->_current / $this->_iteration) / $span;
 		}
 
-		return $speed;
+		return $this->_speed;
 	}
 
 	/**

lib/cli/Notify.php

@@ -160,7 +160,7 @@ public static function input( $format = null, $hide = false ) {
 	 * @return string  The users input.
 	 * @see cli\input()
 	 */
-	public static function prompt( $question, $default = null, $marker = ': ', $hide = false ) {
+	public static function prompt( $question, $default = false, $marker = ': ', $hide = false ) {
 		if( $default && strpos( $question, '[' ) === false ) {
 			$question .= ' [' . $default . ']';
 		}

lib/cli/Streams.php

@@ -44,11 +44,11 @@ class Table {
 	 * @param array  $rows     The rows of data for this table. Optional.
 	 * @param array  $footers  Footers used in this table. Optional.
 	 */
-	public function __construct(array $headers = null, array $rows = null, array $footers = null) {
+	public function __construct(array $headers = array(), array $rows = array(), array $footers = array()) {
 		if (!empty($headers)) {
 			// If all the rows is given in $headers we use the keys from the
 			// first row for the header values
-			if ($rows === null) {
+			if ($rows === array()) {
 				$rows = $headers;
 				$keys = array_keys(array_shift($headers));
 				$headers = array();

lib/cli/Table.php

@@ -19,9 +19,9 @@
  */
 class HelpScreen {
 	protected $_flags = array();
-	protected $_maxFlag = 0;
+	protected $_flagMax = 0;
 	protected $_options = array();
-	protected $_maxOption = 0;
+	protected $_optionMax = 0;
 
 	public function __construct(Arguments $arguments) {
 		$this->setArguments($arguments);