Skip to content

Commit ce08eda

Browse files
swissspidyswissspidy
authored
Merge pull request #126 from wp-cli/fix/wpcs-3.0-issues
2 parents 962c420 + 7425292 commit ce08eda

File tree

7 files changed

+27
-27
lines changed

7 files changed

+27
-27
lines changed

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"wp-cli/db-command": "^1.3 || ^2",
1919
"wp-cli/entity-command": "^1.3 || ^2",
2020
"wp-cli/extension-command": "^1.2 || ^2",
21-
"wp-cli/wp-cli-tests": "^3.1"
21+
"wp-cli/wp-cli-tests": "^4"
2222
},
2323
"config": {
2424
"process-timeout": 7200,

‎language-command.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
return;
55
}
66

7-
$wpcli_language_autoloader = dirname( __FILE__ ) . '/vendor/autoload.php';
7+
$wpcli_language_autoloader = __DIR__ . '/vendor/autoload.php';
88

99
if ( file_exists( $wpcli_language_autoloader ) ) {
1010
require_once $wpcli_language_autoloader;
1111
}
1212

13-
$wpcli_language_check_requirements = function() {
13+
$wpcli_language_check_requirements = function () {
1414
if ( \WP_CLI\Utils\wp_version_compare( '4.0', '<' ) ) {
1515
WP_CLI::error( 'Requires WordPress 4.0 or greater.' );
1616
}

‎phpcs.xml.dist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
Related: https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards/issues/1623 -->
6464
<rule ref="WordPress.NamingConventions.ValidVariableName">
6565
<properties>
66-
<property name="customPropertiesWhitelist" type="array">
66+
<property name="allowed_custom_properties" type="array">
6767
<element value="Language"/>
6868
<element value="Name"/>
6969
<element value="Type"/>

‎src/Core_Language_Command.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public function list_( $args, $assoc_args ) {
9393
$current_locale = get_locale();
9494

9595
$translations = array_map(
96-
function( $translation ) use ( $available, $current_locale, $updates ) {
96+
function ( $translation ) use ( $available, $current_locale, $updates ) {
9797
$translation['status'] = 'uninstalled';
9898
if ( in_array( $translation['language'], $available, true ) ) {
9999
$translation['status'] = 'installed';
@@ -199,7 +199,7 @@ public function install( $args, $assoc_args ) {
199199

200200
if ( in_array( $language_code, $available, true ) ) {
201201
\WP_CLI::log( "Language '{$language_code}' already installed." );
202-
$skips++;
202+
++$skips;
203203
} else {
204204
$response = $this->download_language_pack( $language_code );
205205

@@ -209,13 +209,13 @@ public function install( $args, $assoc_args ) {
209209

210210
// Skip if translation is not yet available.
211211
if ( 'not_found' === $response->get_error_code() ) {
212-
$skips++;
212+
++$skips;
213213
} else {
214-
$errors++;
214+
++$errors;
215215
}
216216
} else {
217217
\WP_CLI::log( "Language '{$language_code}' installed." );
218-
$successes++;
218+
++$successes;
219219
}
220220
}
221221

‎src/Plugin_Language_Command.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ private function install_one( $args, $assoc_args ) {
263263

264264
if ( in_array( $language_code, $available, true ) ) {
265265
\WP_CLI::log( "Language '{$language_code}' already installed." );
266-
$skips++;
266+
++$skips;
267267
} else {
268268
$response = $this->download_language_pack( $language_code, $plugin );
269269

@@ -273,13 +273,13 @@ private function install_one( $args, $assoc_args ) {
273273

274274
// Skip if translation is not yet available.
275275
if ( 'not_found' === $response->get_error_code() ) {
276-
$skips++;
276+
++$skips;
277277
} else {
278-
$errors++;
278+
++$errors;
279279
}
280280
} else {
281281
\WP_CLI::log( "Language '{$language_code}' installed." );
282-
$successes++;
282+
++$successes;
283283
}
284284
}
285285
}
@@ -332,7 +332,7 @@ private function install_many( $args, $assoc_args ) {
332332
if ( in_array( $language_code, $available, true ) ) {
333333
\WP_CLI::log( "Language '{$language_code}' for '{$plugin_details['Name']}' already installed." );
334334
$result['status'] = 'already installed';
335-
$skips++;
335+
++$skips;
336336
} else {
337337
$response = $this->download_language_pack( $language_code, $plugin_name );
338338

@@ -342,15 +342,15 @@ private function install_many( $args, $assoc_args ) {
342342

343343
if ( 'not_found' === $response->get_error_code() ) {
344344
$result['status'] = 'not available';
345-
$skips++;
345+
++$skips;
346346
} else {
347347
$result['status'] = 'not installed';
348-
$errors++;
348+
++$errors;
349349
}
350350
} else {
351351
\WP_CLI::log( "Language '{$language_code}' for '{$plugin_details['Name']}' installed." );
352352
$result['status'] = 'installed';
353-
$successes++;
353+
++$successes;
354354
}
355355
}
356356

‎src/Theme_Language_Command.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public function list_( $args, $assoc_args ) {
9898

9999
if ( $all ) {
100100
$args = array_map(
101-
function( $file ) {
101+
function ( $file ) {
102102
return \WP_CLI\Utils\get_theme_name( $file );
103103
},
104104
array_keys( wp_get_themes() )
@@ -269,7 +269,7 @@ private function install_one( $args, $assoc_args ) {
269269

270270
if ( in_array( $language_code, $available, true ) ) {
271271
\WP_CLI::log( "Language '{$language_code}' already installed." );
272-
$skips++;
272+
++$skips;
273273
} else {
274274
$response = $this->download_language_pack( $language_code, $theme );
275275

@@ -279,13 +279,13 @@ private function install_one( $args, $assoc_args ) {
279279

280280
// Skip if translation is not yet available.
281281
if ( 'not_found' === $response->get_error_code() ) {
282-
$skips++;
282+
++$skips;
283283
} else {
284-
$errors++;
284+
++$errors;
285285
}
286286
} else {
287287
\WP_CLI::log( "Language '{$language_code}' installed." );
288-
$successes++;
288+
++$successes;
289289
}
290290
}
291291
}
@@ -338,7 +338,7 @@ private function install_many( $args, $assoc_args ) {
338338
if ( in_array( $language_code, $available, true ) ) {
339339
\WP_CLI::log( "Language '{$language_code}' for '{$theme_details['Name']}' already installed." );
340340
$result['status'] = 'already installed';
341-
$skips++;
341+
++$skips;
342342
} else {
343343
$response = $this->download_language_pack( $language_code, $theme_name );
344344

@@ -348,15 +348,15 @@ private function install_many( $args, $assoc_args ) {
348348

349349
if ( 'not_found' === $response->get_error_code() ) {
350350
$result['status'] = 'not available';
351-
$skips++;
351+
++$skips;
352352
} else {
353353
$result['status'] = 'not installed';
354-
$errors++;
354+
++$errors;
355355
}
356356
} else {
357357
\WP_CLI::log( "Language '{$language_code}' for '{$theme_details['Name']}' installed." );
358358
$result['status'] = 'installed';
359-
$successes++;
359+
++$successes;
360360
}
361361
}
362362

‎src/WP_CLI/CommandWithTranslation.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ public function update( $args, $assoc_args ) {
144144
protected function get_translation_updates() {
145145
$available = $this->get_installed_languages();
146146

147-
$func = function() use ( $available ) {
147+
$func = function () use ( $available ) {
148148
return $available;
149149
};
150150

0 commit comments

Comments
 (0)