Merge branch 'master' into add-alignments

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,19 +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": {
         "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];
 			}
 		}
@@ -147,7 +147,7 @@ static public function colorize($string, $colored = null) {
 	 */
 	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);
@@ -214,7 +214,7 @@ static public function width( $string, $pre_colorized = false, $encoding = false
 	 */
 	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

@@ -46,11 +46,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, $alignments = []) {
+	public function __construct(array $headers = array(), array $rows = array(), array $footers = array(), $alignments = 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

@@ -141,31 +141,32 @@ public function row( array $row ) {
 		if ( count( $row ) > 0 ) {
 			$extra_rows = array_fill( 0, count( $row ), array() );
 
-			foreach( $row as $col => $value ) {
-
-				$value = str_replace( array( "\r\n", "\n" ), ' ', $value );
-
-				$col_width = $this->_widths[ $col ];
-				$encoding = function_exists( 'mb_detect_encoding' ) ? mb_detect_encoding( $value, null, true /*strict*/ ) : false;
+			foreach ( $row as $col => $value ) {
+				$value              = $value ?: '';
+				$col_width          = $this->_widths[ $col ];
+				$encoding           = function_exists( 'mb_detect_encoding' ) ? mb_detect_encoding( $value, null, true /*strict*/ ) : false;
 				$original_val_width = Colors::width( $value, self::isPreColorized( $col ), $encoding );
-				if ( $col_width && $original_val_width > $col_width ) {
-					$row[ $col ] = \cli\safe_substr( $value, 0, $col_width, true /*is_width*/, $encoding );
-					$value = \cli\safe_substr( $value, \cli\safe_strlen( $row[ $col ], $encoding ), null /*length*/, false /*is_width*/, $encoding );
-					$i = 0;
-					do {
-						$extra_value = \cli\safe_substr( $value, 0, $col_width, true /*is_width*/, $encoding );
-						$val_width = Colors::width( $extra_value, self::isPreColorized( $col ), $encoding );
-						if ( $val_width ) {
-							$extra_rows[ $col ][] = $extra_value;
-							$value = \cli\safe_substr( $value, \cli\safe_strlen( $extra_value, $encoding ), null /*length*/, false /*is_width*/, $encoding );
-							$i++;
-							if ( $i > $extra_row_count ) {
-								$extra_row_count = $i;
+				if ( $col_width && ( $original_val_width > $col_width || strpos( $value, "\n" ) !== false ) ) {
+					$split_lines = preg_split( '/\r\n|\n/', $value );
+
+					$wrapped_lines = [];
+					foreach ( $split_lines as $line ) {
+						do {
+							$wrapped_value = \cli\safe_substr( $line, 0, $col_width, true /*is_width*/, $encoding );
+							$val_width     = Colors::width( $wrapped_value, self::isPreColorized( $col ), $encoding );
+							if ( $val_width ) {
+								$wrapped_lines[] = $wrapped_value;
+								$line            = \cli\safe_substr( $line, \cli\safe_strlen( $wrapped_value, $encoding ), null /*length*/, false /*is_width*/, $encoding );
 							}
-						}
-					} while( $value );
-				}
+						} while ( $line );
+					}
 
+					$row[ $col ] = array_shift( $wrapped_lines );
+					foreach ( $wrapped_lines as $wrapped_line ) {
+						$extra_rows[ $col ][] = $wrapped_line;
+						++$extra_row_count;
+					}
+				}
 			}
 		}
 
@@ -204,7 +205,7 @@ public function row( array $row ) {
 	private function padColumn($content, $column) {
 		$column_name = $this->_headers[$column];
 		$alignment = array_key_exists($column_name, $this->_alignments) ? $this->_alignments[$column_name] : Column::ALIGN_LEFT;
-
+		$content = str_replace( "\t", '    ', (string) $content );
 		return $this->_characters['padding'] . Colors::pad( $content, $this->_widths[ $column ], $this->isPreColorized( $column ), false, $alignment) . $this->_characters['padding'];
 	}
 

lib/cli/table/Ascii.php

@@ -22,7 +22,30 @@ class Tabular extends Renderer {
 	 * @param array  $row  The table row.
 	 * @return string  The formatted table row.
 	 */
-	public function row(array $row) {
-		return implode("\t", array_values($row));
+	public function row( array $row ) {
+		$rows   = [];
+		$output = '';
+
+		foreach ( $row as $col => $value ) {
+			$value       = isset( $value ) ? (string) $value : '';
+			$value       = str_replace( "\t", '    ', $value );
+			$split_lines = preg_split( '/\r\n|\n/', $value );
+			// Keep anything before the first line break on the original line
+			$row[ $col ] = array_shift( $split_lines );
+		}
+
+		$rows[] = $row;
+
+		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;
+		}
+
+		foreach ( $rows as $r ) {
+			$output .= implode( "\t", array_values( $r ) ) . PHP_EOL;
+		}
+		return rtrim( $output, PHP_EOL );
 	}
 }

lib/cli/table/Tabular.php

@@ -1,16 +1,24 @@
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.8/phpunit.xsd"
-         bootstrap="tests/bootstrap.php"
-         colors="always"
-         beStrictAboutTestsThatDoNotTestAnything="true"
-         beStrictAboutOutputDuringTests="true"
-         beStrictAboutTestSize="true"
-         beStrictAboutChangesToGlobalState="false">
-	<testsuites>
-		<testsuite>
-			<directory prefix="spec-" suffix=".php">tests/</directory>
-			<directory prefix="test-" suffix=".php">tests/</directory>
-			<directory suffix="Test.php">tests/</directory>
-		</testsuite>
-	</testsuites>
+		 xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/4.8/phpunit.xsd"
+		 bootstrap="tests/bootstrap.php"
+		 backupGlobals="false"
+		 beStrictAboutCoversAnnotation="true"
+		 beStrictAboutOutputDuringTests="true"
+		 beStrictAboutTestsThatDoNotTestAnything="true"
+		 beStrictAboutTodoAnnotatedTests="true"
+		 convertErrorsToExceptions="true"
+		 convertWarningsToExceptions="true"
+		 convertNoticesToExceptions="true"
+		 convertDeprecationsToExceptions="true"
+		 colors="true"
+		 verbose="true">
+	<testsuite name="wp-cli/php-cli-tools tests">
+		<directory prefix="Test" suffix=".php">tests/</directory>
+	</testsuite>
+
+	<filter>
+		<whitelist processUncoveredFilesFromWhitelist="true">
+			<directory suffix=".php">lib/</directory>
+		</whitelist>
+	</filter>
 </phpunit>