Skip to content

Commit fdb3f24

Browse files
schlesseraschlessera
committed
Fix autofixable PHPCS issues
1 parent 63e28f5 commit fdb3f24

File tree

1 file changed

+101
-89
lines changed

1 file changed

+101
-89
lines changed

‎src/ScaffoldPackageCommand.php

Lines changed: 101 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,12 @@ class ScaffoldPackageCommand {
7272
*/
7373
public function package( $args, $assoc_args ) {
7474

75-
$defaults = array(
75+
$defaults = array(
7676
'dir' => '',
7777
'description' => '',
78-
'homepage' => '',
78+
'homepage' => '',
7979
);
80-
$assoc_args = array_merge( $defaults, $assoc_args );
80+
$assoc_args = array_merge( $defaults, $assoc_args );
8181
$assoc_args['name'] = $args[0];
8282

8383
$bits = explode( '/', $assoc_args['name'] );
@@ -101,23 +101,26 @@ public function package( $args, $assoc_args ) {
101101

102102
$force = Utils\get_flag_value( $assoc_args, 'force' );
103103

104-
$package_root = dirname( dirname( __FILE__ ) );
104+
$package_root = dirname( dirname( __FILE__ ) );
105105
$template_path = $package_root . '/templates/';
106-
$wp_cli_yml = <<<EOT
106+
$wp_cli_yml = <<<EOT
107107
require:
108108
- hello-world-command.php
109109
EOT;
110110

111-
$files_written = $this->create_files( array(
112-
"{$package_dir}/.gitignore" => file_get_contents( "{$package_root}/.gitignore" ),
113-
"{$package_dir}/.editorconfig" => file_get_contents( "{$package_root}/.editorconfig" ),
114-
"{$package_dir}/.distignore" => file_get_contents( "{$package_root}/.distignore" ),
115-
"{$package_dir}/CONTRIBUTING.md" => file_get_contents( "{$package_root}/CONTRIBUTING.md" ),
116-
"{$package_dir}/wp-cli.yml" => $wp_cli_yml,
117-
"{$package_dir}/hello-world-command.php" => Utils\mustache_render( "{$template_path}/hello-world-command.mustache", $assoc_args ),
118-
"{$package_dir}/src/HelloWorldCommand.php" => Utils\mustache_render( "{$template_path}/HelloWorldCommand.mustache", $assoc_args ),
119-
"{$package_dir}/composer.json" => Utils\mustache_render( "{$template_path}/composer.mustache", $assoc_args ),
120-
), $force );
111+
$files_written = $this->create_files(
112+
array(
113+
"{$package_dir}/.gitignore" => file_get_contents( "{$package_root}/.gitignore" ),
114+
"{$package_dir}/.editorconfig" => file_get_contents( "{$package_root}/.editorconfig" ),
115+
"{$package_dir}/.distignore" => file_get_contents( "{$package_root}/.distignore" ),
116+
"{$package_dir}/CONTRIBUTING.md" => file_get_contents( "{$package_root}/CONTRIBUTING.md" ),
117+
"{$package_dir}/wp-cli.yml" => $wp_cli_yml,
118+
"{$package_dir}/hello-world-command.php" => Utils\mustache_render( "{$template_path}/hello-world-command.mustache", $assoc_args ),
119+
"{$package_dir}/src/HelloWorldCommand.php" => Utils\mustache_render( "{$template_path}/HelloWorldCommand.mustache", $assoc_args ),
120+
"{$package_dir}/composer.json" => Utils\mustache_render( "{$template_path}/composer.mustache", $assoc_args ),
121+
),
122+
$force
123+
);
121124

122125
if ( empty( $files_written ) ) {
123126
WP_CLI::log( 'All package files were skipped.' );
@@ -227,20 +230,20 @@ public function package_readme( $args, $assoc_args ) {
227230

228231
$force = Utils\get_flag_value( $assoc_args, 'force' );
229232

230-
$package_root = dirname( dirname( __FILE__ ) );
233+
$package_root = dirname( dirname( __FILE__ ) );
231234
$template_path = $package_root . '/templates/';
232235

233-
$bits = explode( '/', $composer_obj['name'] );
236+
$bits = explode( '/', $composer_obj['name'] );
234237
$readme_args = array(
235-
'package_name' => $composer_obj['name'],
236-
'package_short_name' => $bits[1],
237-
'package_name_border' => str_pad( '', strlen( $composer_obj['name'] ), '=' ),
238-
'package_description' => isset( $composer_obj['description'] ) ? $composer_obj['description'] : '',
239-
'required_wp_cli_version' => ! empty( $composer_obj['require']['wp-cli/wp-cli'] ) ? str_replace( array( '~', '^', '>=' ), 'v', $composer_obj['require']['wp-cli/wp-cli'] ) : 'v1.3.0',
240-
'shields' => '',
241-
'has_commands' => false,
238+
'package_name' => $composer_obj['name'],
239+
'package_short_name' => $bits[1],
240+
'package_name_border' => str_pad( '', strlen( $composer_obj['name'] ), '=' ),
241+
'package_description' => isset( $composer_obj['description'] ) ? $composer_obj['description'] : '',
242+
'required_wp_cli_version' => ! empty( $composer_obj['require']['wp-cli/wp-cli'] ) ? str_replace( array( '~', '^', '>=' ), 'v', $composer_obj['require']['wp-cli/wp-cli'] ) : 'v1.3.0',
243+
'shields' => '',
244+
'has_commands' => false,
242245
'wp_cli_update_to_instructions' => 'the latest stable release with `wp cli update`',
243-
'show_powered_by' => isset( $composer_obj['extra']['readme']['show_powered_by'] ) ? (bool) $composer_obj['extra']['readme']['show_powered_by'] : true,
246+
'show_powered_by' => isset( $composer_obj['extra']['readme']['show_powered_by'] ) ? (bool) $composer_obj['extra']['readme']['show_powered_by'] : true,
244247
);
245248

246249
if ( isset( $composer_obj['extra']['readme']['shields'] ) ) {
@@ -270,24 +273,31 @@ public function package_readme( $args, $assoc_args ) {
270273

271274
if ( ! empty( $composer_obj['extra']['commands'] ) ) {
272275
$readme_args['commands'] = array();
273-
$cmd_dump = WP_CLI::runcommand( 'cli cmd-dump', array( 'launch' => false, 'return' => true, 'parse' => 'json' ) );
274-
foreach( $composer_obj['extra']['commands'] as $command ) {
275-
$bits = explode( ' ', $command );
276+
$cmd_dump = WP_CLI::runcommand(
277+
'cli cmd-dump',
278+
array(
279+
'launch' => false,
280+
'return' => true,
281+
'parse' => 'json',
282+
)
283+
);
284+
foreach ( $composer_obj['extra']['commands'] as $command ) {
285+
$bits = explode( ' ', $command );
276286
$parent_command = $cmd_dump;
277287
do {
278288
$cmd_bit = array_shift( $bits );
279-
$found = false;
280-
foreach( $parent_command['subcommands'] as $subcommand ) {
289+
$found = false;
290+
foreach ( $parent_command['subcommands'] as $subcommand ) {
281291
if ( $subcommand['name'] === $cmd_bit ) {
282292
$parent_command = $subcommand;
283-
$found = true;
293+
$found = true;
284294
break;
285295
}
286296
}
287297
if ( ! $found ) {
288298
$parent_command = false;
289299
}
290-
} while( $parent_command && $bits );
300+
} while ( $parent_command && $bits );
291301

292302
/* This check doesn't work because of the way the commands are fetched.
293303
* Needs bigger refactor to put this check back in.
@@ -304,13 +314,13 @@ public function package_readme( $args, $assoc_args ) {
304314
$longdesc = preg_replace_callback( '/([^\n]+)\n: (.+?)(\n\n|$)/s', array( __CLASS__, 'rewrap_param_desc' ), $longdesc );
305315

306316
$readme_args['commands'][] = array(
307-
'name' => "wp {$command}",
317+
'name' => "wp {$command}",
308318
'shortdesc' => isset( $parent_command['description'] ) ? $parent_command['description'] : '',
309-
'synopsis' => "wp {$command}" . ( empty( $parent_command['subcommands'] ) ? ( isset( $parent_command['synopsis'] ) ? " {$parent_command['synopsis']}" : '' ) : "" ),
310-
'longdesc' => $longdesc,
319+
'synopsis' => "wp {$command}" . ( empty( $parent_command['subcommands'] ) ? ( isset( $parent_command['synopsis'] ) ? " {$parent_command['synopsis']}" : '' ) : '' ),
320+
'longdesc' => $longdesc,
311321
);
312322
}
313-
$readme_args['has_commands'] = true;
323+
$readme_args['has_commands'] = true;
314324
$readme_args['has_multiple_commands'] = count( $readme_args['commands'] ) > 1 ? true : false;
315325
}
316326

@@ -326,14 +336,14 @@ public function package_readme( $args, $assoc_args ) {
326336
}
327337

328338
$readme_sections = array();
329-
foreach( $readme_section_headings as $section_heading ) {
330-
$key = strtolower( preg_replace( '#[^\da-z-_]#i', '', $section_heading ) );
339+
foreach ( $readme_section_headings as $section_heading ) {
340+
$key = strtolower( preg_replace( '#[^\da-z-_]#i', '', $section_heading ) );
331341
$readme_sections[ $key ] = array(
332-
'heading' => $section_heading,
342+
'heading' => $section_heading,
333343
);
334344
}
335345
$bundled = ! empty( $composer_obj['extra']['bundled'] );
336-
foreach( array( 'using', 'installing', 'contributing', 'support' ) as $key ) {
346+
foreach ( array( 'using', 'installing', 'contributing', 'support' ) as $key ) {
337347
if ( isset( $readme_sections[ $key ] ) ) {
338348
$file = dirname( dirname( __FILE__ ) ) . '/templates/readme-' . $key . '.mustache';
339349
if ( $bundled
@@ -349,7 +359,7 @@ public function package_readme( $args, $assoc_args ) {
349359
);
350360

351361
$readme_args['quick_links'] = '';
352-
foreach( $readme_sections as $key => $section ) {
362+
foreach ( $readme_sections as $key => $section ) {
353363
if ( ! empty( $section['heading'] ) ) {
354364
$readme_args['quick_links'] .= '[' . $section['heading'] . '](#' . $key . ') | ';
355365
}
@@ -359,20 +369,20 @@ public function package_readme( $args, $assoc_args ) {
359369
}
360370

361371
$readme_args['sections'] = array();
362-
$ext_regex = '#\.(md|mustache)$#i';
363-
foreach( $readme_sections as $section => $section_args ) {
372+
$ext_regex = '#\.(md|mustache)$#i';
373+
foreach ( $readme_sections as $section => $section_args ) {
364374
$value = array();
365-
foreach( array( 'pre', 'body', 'post' ) as $k ) {
375+
foreach ( array( 'pre', 'body', 'post' ) as $k ) {
366376
$v = '';
367377
if ( isset( $composer_obj['extra']['readme'][ $section ][ $k ] ) ) {
368-
$v = $composer_obj['extra']['readme'][ $section][ $k ];
378+
$v = $composer_obj['extra']['readme'][ $section ][ $k ];
369379
if ( false !== stripos( $v, '://' ) ) {
370380
$response = Utils\http_request( 'GET', $v );
371-
$v = $response->body;
372-
} else if ( preg_match( $ext_regex, $v ) ) {
381+
$v = $response->body;
382+
} elseif ( preg_match( $ext_regex, $v ) ) {
373383
$v = $package_dir . '/' . $v;
374384
}
375-
} else if ( isset( $section_args[ $k ] ) ) {
385+
} elseif ( isset( $section_args[ $k ] ) ) {
376386
$v = $section_args[ $k ];
377387
}
378388
if ( $v ) {
@@ -387,15 +397,18 @@ public function package_readme( $args, $assoc_args ) {
387397
$readme_args['package_description'] = $value;
388398
} else {
389399
$readme_args['sections'][] = array(
390-
'heading' => $section_args['heading'],
391-
'body' => $value,
400+
'heading' => $section_args['heading'],
401+
'body' => $value,
392402
);
393403
}
394404
}
395405

396-
$files_written = $this->create_files( array(
397-
"{$package_dir}/README.md" => Utils\mustache_render( "{$template_path}/readme.mustache", $readme_args ),
398-
), $force );
406+
$files_written = $this->create_files(
407+
array(
408+
"{$package_dir}/README.md" => Utils\mustache_render( "{$template_path}/readme.mustache", $readme_args ),
409+
),
410+
$force
411+
);
399412

400413
if ( empty( $files_written ) ) {
401414
WP_CLI::log( 'Package readme generation skipped.' );
@@ -430,61 +443,61 @@ public function package_github( $args, $assoc_args ) {
430443

431444
if ( is_file( $package_dir ) ) {
432445
$package_dir = dirname( $package_dir );
433-
} else if ( is_dir( $package_dir ) ) {
446+
} elseif ( is_dir( $package_dir ) ) {
434447
$package_dir = rtrim( $package_dir, '/' );
435448
}
436449

437450
self::check_if_valid_package_dir( $package_dir );
438451

439-
$force = Utils\get_flag_value( $assoc_args, 'force' );
452+
$force = Utils\get_flag_value( $assoc_args, 'force' );
440453
$template_path = dirname( dirname( __FILE__ ) ) . '/templates';
441454

442-
$composer_obj = json_decode( file_get_contents( $package_dir . '/composer.json' ), true );
455+
$composer_obj = json_decode( file_get_contents( $package_dir . '/composer.json' ), true );
443456
$settings_vars = array(
444457
'has_description' => false,
445458
'description' => '',
446459
'has_labels' => true,
447460
'labels' => array(
448461
array(
449-
'name' => 'bug',
450-
'color' => 'fc2929'
462+
'name' => 'bug',
463+
'color' => 'fc2929',
451464
),
452465
array(
453-
'name' => 'scope:documentation',
454-
'color' => '0e8a16'
466+
'name' => 'scope:documentation',
467+
'color' => '0e8a16',
455468
),
456469
array(
457-
'name' => 'scope:testing',
458-
'color' => '5319e7'
470+
'name' => 'scope:testing',
471+
'color' => '5319e7',
459472
),
460473
array(
461-
'name' => 'good-first-issue',
462-
'color' => 'eb6420',
474+
'name' => 'good-first-issue',
475+
'color' => 'eb6420',
463476
),
464477
array(
465-
'name' => 'help-wanted',
466-
'color' => '159818',
478+
'name' => 'help-wanted',
479+
'color' => '159818',
467480
),
468481
array(
469-
'name' => 'maybelater',
470-
'color' => 'c2e0c6',
482+
'name' => 'maybelater',
483+
'color' => 'c2e0c6',
471484
),
472485
array(
473-
'name' => 'state:unconfirmed',
474-
'color' => 'bfe5bf'
486+
'name' => 'state:unconfirmed',
487+
'color' => 'bfe5bf',
475488
),
476489
array(
477-
'name' => 'state:unsupported',
478-
'color' => 'bfe5bf'
490+
'name' => 'state:unsupported',
491+
'color' => 'bfe5bf',
479492
),
480493
array(
481-
'name' => 'wontfix',
482-
'color' => 'c2e0c6',
494+
'name' => 'wontfix',
495+
'color' => 'c2e0c6',
483496
),
484497
),
485498
);
486499
if ( ! empty( $composer_obj['description'] ) ) {
487-
$settings_vars['description'] = $composer_obj['description'];
500+
$settings_vars['description'] = $composer_obj['description'];
488501
$settings_vars['has_description'] = true;
489502
}
490503
if ( ! empty( $composer_obj['extra']['commands'] ) ) {
@@ -495,10 +508,10 @@ public function package_github( $args, $assoc_args ) {
495508
);
496509
}
497510
}
498-
$create_files = array(
499-
"{$package_dir}/.github/ISSUE_TEMPLATE" => Utils\mustache_render( "{$template_path}/github-issue-template.mustache" ),
511+
$create_files = array(
512+
"{$package_dir}/.github/ISSUE_TEMPLATE" => Utils\mustache_render( "{$template_path}/github-issue-template.mustache" ),
500513
"{$package_dir}/.github/PULL_REQUEST_TEMPLATE" => Utils\mustache_render( "{$template_path}/github-pull-request-template.mustache" ),
501-
"{$package_dir}/.github/settings.yml" => Utils\mustache_render( "{$template_path}/github-settings.mustache", $settings_vars ),
514+
"{$package_dir}/.github/settings.yml" => Utils\mustache_render( "{$template_path}/github-settings.mustache", $settings_vars ),
502515
);
503516
$files_written = $this->create_files( $create_files, $force );
504517
if ( empty( $files_written ) ) {
@@ -616,14 +629,14 @@ public function package_tests( $args, $assoc_args ) {
616629

617630
if ( is_file( $package_dir ) ) {
618631
$package_dir = dirname( $package_dir );
619-
} else if ( is_dir( $package_dir ) ) {
632+
} elseif ( is_dir( $package_dir ) ) {
620633
$package_dir = rtrim( $package_dir, '/' );
621634
}
622635

623636
self::check_if_valid_package_dir( $package_dir );
624637

625638
$package_dir .= '/';
626-
$features_dir = $package_dir . 'features/';
639+
$features_dir = $package_dir . 'features/';
627640
if ( ! is_dir( $features_dir ) ) {
628641
Process::create( Utils\esc_cmd( 'mkdir %s', $features_dir ) )->run();
629642
}
@@ -635,9 +648,9 @@ public function package_tests( $args, $assoc_args ) {
635648
$copy_source[ $package_root ]['templates/load-wp-cli.feature'] = $features_dir;
636649
}
637650

638-
$travis_tags = array( 'cache', 'env', 'matrix', 'before_install', 'install', 'before_script', 'script' );
651+
$travis_tags = array( 'cache', 'env', 'matrix', 'before_install', 'install', 'before_script', 'script' );
639652
$travis_tag_overwrites = $travis_tag_appends = array();
640-
$travis_append = '';
653+
$travis_append = '';
641654
if ( 'travis' === $assoc_args['ci'] ) {
642655
$copy_source[ $package_root ]['.travis.yml'] = $package_dir;
643656

@@ -654,13 +667,12 @@ public function package_tests( $args, $assoc_args ) {
654667
if ( file_exists( $package_dir . 'travis-append.yml' ) ) {
655668
$travis_append = file_get_contents( $package_dir . 'travis-append.yml' );
656669
}
657-
658-
} else if ( 'circle' === $assoc_args['ci'] ) {
670+
} elseif ( 'circle' === $assoc_args['ci'] ) {
659671
$copy_source[ $package_root ]['circle.yml'] = $package_dir;
660672
}
661673

662674
$files_written = array();
663-
foreach( $copy_source as $source => $to_copy ) {
675+
foreach ( $copy_source as $source => $to_copy ) {
664676
foreach ( $to_copy as $file => $dir ) {
665677
if ( 'php/WP_CLI/ProcessRun.php' === $file && ! file_exists( $source . "/{$file}" ) ) {
666678
continue;
@@ -683,7 +695,7 @@ public function package_tests( $args, $assoc_args ) {
683695
}
684696
}
685697

686-
$force = Utils\get_flag_value( $assoc_args, 'force' );
698+
$force = Utils\get_flag_value( $assoc_args, 'force' );
687699
$should_write_file = $this->prompt_if_files_will_be_overwritten( $file_path, $force );
688700
if ( ! $should_write_file ) {
689701
continue;
@@ -704,7 +716,7 @@ public function package_tests( $args, $assoc_args ) {
704716

705717
private static function rewrap_param_desc( $matches ) {
706718
$param = $matches[1];
707-
$desc = self::indent( "\t\t", $matches[2] );
719+
$desc = self::indent( "\t\t", $matches[2] );
708720
return "\t$param\n$desc\n\n";
709721
}
710722

@@ -726,10 +738,10 @@ private function prompt_if_files_will_be_overwritten( $filename, $force ) {
726738
WP_CLI::log( $filename );
727739
if ( ! $force ) {
728740
do {
729-
$answer = \cli\prompt(
741+
$answer = \cli\prompt(
730742
'Skip this file, or replace it with scaffolding?',
731743
$default = false,
732-
$marker = '[s/r]: '
744+
$marker = '[s/r]: '
733745
);
734746
} while ( ! in_array( $answer, array( 's', 'r' ) ) );
735747
$should_write_file = 'r' === $answer;

0 commit comments

Comments
 (0)