WIP: php-gettext 5

src/IterableCodeExtractor.php

@@ -265,4 +265,38 @@ static function ( $file, $key, $iterator ) use ( $include, $exclude, $extensions
 	private static function trim_leading_slash( $path ) {
 		return ltrim( $path, '/' );
 	}
+
+	/**
+	 * Formerly part php-gettext 4.x.
+	 */
+	protected static function getFiles($file)
+	{
+		if (empty($file)) {
+			throw new InvalidArgumentException('There is not any file defined');
+		}
+
+		if (is_string($file)) {
+			if (!is_file($file)) {
+				throw new InvalidArgumentException("'$file' is not a valid file");
+			}
+
+			if (!is_readable($file)) {
+				throw new InvalidArgumentException("'$file' is not a readable file");
+			}
+
+			return [$file];
+		}
+
+		if (is_array($file)) {
+			$files = [];
+
+			foreach ($file as $f) {
+				$files = array_merge($files, self::getFiles($f));
+			}
+
+			return $files;
+		}
+
+		throw new InvalidArgumentException('The first argument must be string or array');
+	}
 }

src/MakePotCommand.php

@@ -6,6 +6,7 @@
 use Gettext\Merge;
 use Gettext\Translation;
 use Gettext\Translations;
+use Gettext\Headers;
 use Gettext\Utils\ParsedComment;
 use WP_CLI;
 use WP_CLI_Command;
@@ -402,6 +403,8 @@ function ( $file ) {
 			}
 		}
 
+		$this->exceptions = Translations::create();
+
 		if ( isset( $assoc_args['subtract'] ) ) {
 			$this->subtract_and_merge = Utils\get_flag_value( $assoc_args, 'subtract-and-merge', false );
 
@@ -415,7 +418,7 @@ function ( $file ) {
 
 				WP_CLI::debug( sprintf( 'Ignoring any string already existing in: %s', $file ), 'make-pot' );
 
-				$this->exceptions[ $file ] = new Translations();
+				$this->exceptions[ $file ] = Translations::create();
 				Po::fromFile( $file, $this->exceptions[ $file ] );
 			}
 		}
@@ -554,11 +557,11 @@ protected function get_file_headers( $type ) {
 	 * @return Translations A Translation set.
 	 */
 	protected function extract_strings() {
-		$translations = new Translations();
+		$translations = Translations::create();
 
 		// Add existing strings first but don't keep headers.
 		if ( ! empty( $this->merge ) ) {
-			$existing_translations = new Translations();
+			$existing_translations = Translations::create();
 			Po::fromFile( $this->merge, $existing_translations );
 			$translations->mergeWith( $existing_translations, Merge::ADD | Merge::REMOVE );
 		}
@@ -568,10 +571,10 @@ protected function extract_strings() {
 		$this->set_default_headers( $translations );
 
 		// POT files have no Language header.
-		$translations->deleteHeader( Translations::HEADER_LANGUAGE );
+		$translations->getHeaders()->delete( Headers::HEADER_LANGUAGE );
 
 		// Only relevant for PO files, not POT files.
-		$translations->setHeader( 'PO-Revision-Date', 'YEAR-MO-DA HO:MI+ZONE' );
+		$translations->getHeaders()->set('PO-Revision-Date', 'YEAR-MO-DA HO:MI+ZONE');
 
 		if ( $this->domain ) {
 			$translations->setDomain( $this->domain );
@@ -585,15 +588,15 @@ protected function extract_strings() {
 				continue;
 			}
 
-			$translation = new Translation( '', $data );
+			$translation = Translation::create( '', $data );
 
 			if ( isset( $this->main_file_data['Theme Name'] ) ) {
-				$translation->addExtractedComment( sprintf( '%s of the theme', $header ) );
+				$translation->getComments()->add( sprintf( '%s of the theme', $header ) );
 			} else {
-				$translation->addExtractedComment( sprintf( '%s of the plugin', $header ) );
+				$translation->getComments()->add( sprintf( '%s of the plugin', $header ) );
 			}
 
-			$translations[] = $translation;
+			$translations->add($translation);
 		}
 
 		try {
@@ -908,16 +911,16 @@ protected function set_default_headers( $translations ) {
 		}
 
 		if ( null !== $name ) {
-			$translations->setHeader( 'Project-Id-Version', $name . ( $version ? ' ' . $version : '' ) );
+			$translations->getHeaders()->set('Project-Id-Version', $name . ( $version ? ' ' . $version : '' ));
 		}
 
 		if ( null !== $bugs_address ) {
-			$translations->setHeader( 'Report-Msgid-Bugs-To', $bugs_address );
+			$translations->getHeaders()->set('Report-Msgid-Bugs-To', $bugs_address);
 		}
 
-		$translations->setHeader( 'Last-Translator', 'FULL NAME <EMAIL@ADDRESS>' );
-		$translations->setHeader( 'Language-Team', 'LANGUAGE <[email protected]>' );
-		$translations->setHeader( 'X-Generator', 'WP-CLI ' . WP_CLI_VERSION );
+		$translations->getHeaders()->set('Last-Translator', 'FULL NAME <EMAIL@ADDRESS>');
+		$translations->getHeaders()->set('Language-Team', 'LANGUAGE <[email protected]>');
+		$translations->getHeaders()->set('X-Generator', 'WP-CLI ' . WP_CLI_VERSION);
 
 		foreach ( $this->headers as $key => $value ) {
 			$translations->setHeader( $key, $value );

src/PhpCodeExtractor.php

@@ -3,11 +3,11 @@
 namespace WP_CLI\I18n;
 
 use Exception;
-use Gettext\Extractors\PhpCode;
+use Gettext\Scanner\PhpScanner;
 use Gettext\Translations;
 use WP_CLI;
 
-final class PhpCodeExtractor extends PhpCode {
+class PhpCodeExtractor {
 	use IterableCodeExtractor;
 
 	public static $options = [
@@ -43,16 +43,17 @@ final class PhpCodeExtractor extends PhpCode {
 		],
 	];
 
-	protected static $functionsScannerClass = 'WP_CLI\I18n\PhpFunctionsScanner';
-
 	/**
 	 * {@inheritdoc}
 	 */
 	public static function fromString( $string, Translations $translations, array $options = [] ) {
 		WP_CLI::debug( "Parsing file {$options['file']}", 'make-pot' );
 
 		try {
-			static::fromStringMultiple( $string, [ $translations ], $options );
+			$scanner = new PhpScanner( $translations );
+			$scanner->setFunctions( self::$options['functions'] );
+			$scanner->extractCommentsStartingWith($options['extractComments']);
+			$scanner->scanString( $string, $options[ 'file' ] );
 		} catch ( Exception $exception ) {
 			WP_CLI::debug(
 				sprintf(