src/Commands/InspectorCommands.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Commands/InspectorCommands.php b/src/Commands/InspectorCommands.php index a22d28c..d3e8a3b 100644 --- a/src/Commands/InspectorCommands.php +++ b/src/Commands/InspectorCommands.php @@ -60,8 +60,8 @@ class InspectorCommands extends DrushCommands { * Configuration keys to skip. Cannot be used together with filter-keys. * @option filter-keys * Configuration keys to filter. Cannot be used together with skip-keys. - * @option invalidatability-is-error - * Treat <100% invalidatability as an error. + * @option strict-validation + * Treat <100% validatability as an error. * * @usage drush config:inspect * Inspect whole config for schema errors. @@ -71,9 +71,9 @@ class InspectorCommands extends DrushCommands { * Inspect whole config for schema errors but details errors. * @usage drush config:inspect --only-error --detail * Inspect whole config for schema errors and display only errors if any. - * @usage drush config:inspect --only-error --invalidatability-is-error + * @usage drush config:inspect --only-error --strict-validation * Inspect whole config for schema errors and incomplete validatability. - * @usage drush config:inspect --only-error --invalidatability-is-error --filter-keys=media.settings,system.theme.global + * @usage drush config:inspect --only-error --strict-validation --filter-keys=media.settings,system.theme.global * Inspect only media.settings and system.theme.global config for schema and * validatability errors. * @@ -92,7 +92,7 @@ class InspectorCommands extends DrushCommands { 'detail' => FALSE, 'skip-keys' => self::OPT, 'filter-keys' => self::OPT, - 'invalidatability-is-error' => FALSE, + 'strict-validation' => FALSE, ]) { if ($options['skip-keys'] && $options['filter-keys']) { throw new \Exception('Cannot use both --skip-keys and --filter-keys. Use either or neither, not both.'); @@ -103,7 +103,7 @@ class InspectorCommands extends DrushCommands { $keys = empty($key) ? $this->activeStorage->listAll() : [$key]; $onlyError = $options['only-error']; $detail = $options['detail']; - $invalidatability_is_error = $options['invalidatability-is-error']; + $strict_validation = $options['strict_validation']; $skipKeys = !isset($options['skip-keys']) ? [] : array_fill_keys(explode(',', $options['skip-keys']), '1'); $filterKeys = !isset($options['filter-keys']) ? [] : array_fill_keys(explode(',', $options['filter-keys']), '1'); @@ -175,7 +175,7 @@ class InspectorCommands extends DrushCommands { } // Respect --only-error (failure on any of the 3 is considered an error). - if ($onlyError && $has_schema && ($has_valid_schema && $has_valid_data && (!$invalidatability_is_error || $raw_validatability->isComplete()))) { + if ($onlyError && $has_schema && ($has_valid_schema && $has_valid_data && (!$strict_validation || $raw_validatability->isComplete()))) { continue; } $rows[$name] = ['key' => $name, 'status' => $status, 'validatability' => $validatability, 'data' => $data]; @@ -189,9 +189,9 @@ class InspectorCommands extends DrushCommands { if ($onlyError // - only show keys whose data is invalid && $data_detail[$key] === TRUE - // - or, if --invalidatability-is-error is specified, also show keys - // whose data is not validatable. - && (!$invalidatability_is_error || $validatability_detail[$key] === TRUE) + // - or, if --strict-validation is specified, also show keys whose data is not + // validatable. + && (!$strict_validation || $validatability_detail[$key] === TRUE) ) { continue; }