Skip to content

Add ComposerIO implementation with types #5757

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
stefanfisk wants to merge 2 commits into from
Closed

Add ComposerIO implementation with types #5757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb2d81a
Add ComposerIO implementation with types
stefanfisk Apr 3, 2023
8ebd035
Add dependabot package-command branch as direct dep
stefanfisk Apr 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@
],
"homepage": "https://wp-cli.org",
"license": "MIT",
"repositories": [
{
"type": "vcs",
"url": "https://github.com/wp-cli/package-command.git"
}
],
"require": {
"php": "^5.6 || ^7.0 || ^8.0",
"ext-curl": "*",
Expand All @@ -20,7 +26,7 @@
"wp-cli/db-command": "^1.3 || ^2",
"wp-cli/entity-command": "^1.2 || ^2",
"wp-cli/extension-command": "^1.1 || ^2",
"wp-cli/package-command": "^1 || ^2",
"wp-cli/package-command": "^1 || dev-dependabot/composer/composer/composer-tw-2.5.5",
"wp-cli/wp-cli-tests": "^4.0.1"
},
"suggest": {
Expand Down
44 changes: 9 additions & 35 deletions php/WP_CLI/ComposerIO.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,15 @@
<?php

namespace WP_CLI;

use Composer\IO\NullIO;
use WP_CLI;

/**
* A Composer IO class so we can provide some level of interactivity from WP-CLI
* Due to PHP 5.6 compatibility, we have two different implementations of this class.
*
* See https://github.com/wp-cli/package-command/issues/172.
*/
class ComposerIO extends NullIO {

/**
* {@inheritDoc}
*/
public function isVerbose() {
return true;
}

/**
* {@inheritDoc}
*/
public function write( $messages, $newline = true, $verbosity = self::NORMAL ) {
self::output_clean_message( $messages );
}

/**
* {@inheritDoc}
*/
public function writeError( $messages, $newline = true, $verbosity = self::NORMAL ) {
self::output_clean_message( $messages );
}
use Composer\Semver\VersionParser;
use Composer\InstalledVersions;

private static function output_clean_message( $messages ) {
$messages = (array) preg_replace( '#<(https?)([^>]+)>#', '$1$2', $messages );
foreach ( $messages as $message ) {
// phpcs:ignore WordPress.WP.AlternativeFunctions.strip_tags_strip_tags
WP_CLI::log( strip_tags( trim( $message ) ) );
}
}
if ( InstalledVersions::satisfies( new VersionParser(), 'composer/composer', '^2.3' ) ) {
require 'ComposerIOWithTypes.php';
} else {
require 'ComposerIOWithoutTypes.php';
}
43 changes: 43 additions & 0 deletions php/WP_CLI/ComposerIOWithTypes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<?php // phpcs:disable PHPCompatibility.FunctionDeclarations

namespace WP_CLI;

use Composer\IO\NullIO;
use WP_CLI;

/**
* A Composer IO class so we can provide some level of interactivity from WP-CLI
*/
class ComposerIO extends NullIO {

/**
* {@inheritDoc}
*/
public function isVerbose(): bool {
return true;
}

/**
* {@inheritDoc}
*/
public function write( $messages, bool $newline = true, int $verbosity = self::NORMAL ): void {
self::output_clean_message( $messages );
}

/**
* {@inheritDoc}
*/
public function writeError( $messages, bool $newline = true, int $verbosity = self::NORMAL ): void {
self::output_clean_message( $messages );
}

private static function output_clean_message( $messages ) {
$messages = (array) preg_replace( '#<(https?)([^>]+)>#', '$1$2', $messages );
foreach ( $messages as $message ) {
// phpcs:ignore WordPress.WP.AlternativeFunctions.strip_tags_strip_tags
WP_CLI::log( strip_tags( trim( $message ) ) );
}
}
}

// phpcs:enable
41 changes: 41 additions & 0 deletions php/WP_CLI/ComposerIOWithoutTypes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?php

namespace WP_CLI;

use Composer\IO\NullIO;
use WP_CLI;

/**
* A Composer IO class so we can provide some level of interactivity from WP-CLI
*/
class ComposerIO extends NullIO {

/**
* {@inheritDoc}
*/
public function isVerbose() {
return true;
}

/**
* {@inheritDoc}
*/
public function write( $messages, $newline = true, $verbosity = self::NORMAL ) {
self::output_clean_message( $messages );
}

/**
* {@inheritDoc}
*/
public function writeError( $messages, $newline = true, $verbosity = self::NORMAL ) {
self::output_clean_message( $messages );
}

private static function output_clean_message( $messages ) {
$messages = (array) preg_replace( '#<(https?)([^>]+)>#', '$1$2', $messages );
foreach ( $messages as $message ) {
// phpcs:ignore WordPress.WP.AlternativeFunctions.strip_tags_strip_tags
WP_CLI::log( strip_tags( trim( $message ) ) );
}
}
}