Skip to content

Commit 73139e3

Browse files
LOBsTerrjmolivas
LOBsTerr
authored and
jmolivas
committed
Add additional validation for module, when we use no-interaction mode (#3813)
1 parent 1a9a48e commit 73139e3

40 files changed

+73
-56
lines changed

‎src/Command/Config/ExportContentTypeCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
157157
*/
158158
protected function execute(InputInterface $input, OutputInterface $output)
159159
{
160-
$module = $input->getOption('module');
160+
$module = $this->validateModule($input->getOption('module'));
161161
$contentType = $input->getArgument('content-type');
162162
$optionalConfig = $input->getOption('optional-config');
163163
$removeUuid = $input->getOption('remove-uuid');

‎src/Command/Config/ExportSingleCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
260260
protected function execute(InputInterface $input, OutputInterface $output)
261261
{
262262
$directory = $input->getOption('directory');
263-
$module = $input->getOption('module');
263+
$module = $this->validateModule($input->getOption('module'));
264264
$name = $input->getOption('name');
265265
$optional = $input->getOption('optional');
266266
$removeUuid = $input->getOption('remove-uuid');

‎src/Command/Config/ExportViewCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
144144

145145
protected function execute(InputInterface $input, OutputInterface $output)
146146
{
147-
$module = $input->getOption('module');
147+
$module = $this->validateModule($input->getOption('module'));
148148
$viewId = $input->getArgument('view-id');
149149
$optionalConfig = $input->getOption('optional-config');
150150
$includeModuleDependencies = $input->getOption('include-module-dependencies');

‎src/Command/Generate/AjaxCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
117117
return 1;
118118
}
119119

120-
$module = $input->getOption('module');
120+
$module = $this->validateModule($input->getOption('module'));
121121
$class = $this->validator->validateClassName($input->getOption('class'));
122122
$method = $input->getOption('method');
123123
$js_name = $input->getOption('js-name');

‎src/Command/Generate/AuthenticationProviderCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
9898
return 1;
9999
}
100100

101-
$module = $input->getOption('module');
101+
$module = $this->validateModule($input->getOption('module'));
102102
$class = $this->validator->validateClassName($input->getOption('class'));
103103
$provider_id = $input->getOption('provider-id');
104104

‎src/Command/Generate/CacheContextCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
120120
return 1;
121121
}
122122

123-
$module = $input->getOption('module');
123+
$module = $this->validateModule($input->getOption('module'));
124124
$cache_context = $input->getOption('cache-context');
125125
$class = $this->validator->validateClassName($input->getOption('class'));
126126
$services = $input->getOption('services');

‎src/Command/Generate/ControllerCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
135135
return 1;
136136
}
137137

138-
$module = $input->getOption('module');
138+
$module = $this->validateModule($input->getOption('module'));
139139
$class = $this->validator->validateControllerName($input->getOption('class'));
140140
$routes = $input->getOption('routes');
141141
$test = $input->getOption('test');

‎src/Command/Generate/EntityBundleCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
9595
return 1;
9696
}
9797

98-
$module = $input->getOption('module');
98+
$module = $this->validateModule($input->getOption('module'));
9999
$bundleName = $input->getOption('bundle-name');
100100
$bundleTitle = $input->getOption('bundle-title');
101101

‎src/Command/Generate/EntityConfigCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
8888
*/
8989
protected function execute(InputInterface $input, OutputInterface $output)
9090
{
91-
$module = $input->getOption('module');
91+
$module = $this->validateModule($input->getOption('module'));
9292
$entity_class = $input->getOption('entity-class');
9393
$entity_name = $input->getOption('entity-name');
9494
$label = $input->getOption('label');

‎src/Command/Generate/EntityContentCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
136136
*/
137137
protected function execute(InputInterface $input, OutputInterface $output)
138138
{
139-
$module = $input->getOption('module');
139+
$module = $this->validateModule($input->getOption('module'));
140140
$entity_class = $input->getOption('entity-class');
141141
$entity_name = $input->getOption('entity-name');
142142
$label = $input->getOption('label');

‎src/Command/Generate/EventSubscriberCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
138138
return 1;
139139
}
140140

141-
$module = $input->getOption('module');
141+
$module = $this->validateModule($input->getOption('module'));
142142
$name = $input->getOption('name');
143143
$class = $this->validator->validateClassName($input->getOption('class'));
144144
$events = $input->getOption('events');

‎src/Command/Generate/FormAlterCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
164164
return 1;
165165
}
166166

167-
$module = $input->getOption('module');
167+
$module = $this->validateModule($input->getOption('module'));
168168
$formId = $input->getOption('form-id');
169169
$inputs = $input->getOption('inputs');
170170
$noInteraction = $input->getOption('no-interaction');

‎src/Command/Generate/FormCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ protected function configure()
205205
*/
206206
protected function execute(InputInterface $input, OutputInterface $output)
207207
{
208-
$module = $input->getOption('module');
208+
$module = $this->validateModule($input->getOption('module'));
209209
$services = $input->getOption('services');
210210
$path = $input->getOption('path');
211211
$config_file = $input->getOption('config-file');

‎src/Command/Generate/HelpCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
103103
return 1;
104104
}
105105

106-
$module = $input->getOption('module');
106+
$module = $this->validateModule($input->getOption('module'));
107107

108108
if ($this->extensionManager->validateModuleFunctionExist($module, $module . '_help')) {
109109
throw new \Exception(

‎src/Command/Generate/JsTestCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
9191
return 1;
9292
}
9393

94-
$module = $input->getOption('module');
94+
$module = $this->validateModule($input->getOption('module'));
9595
$class = $this->validator->validateClassName($input->getOption('class'));
9696

9797
$this->generator->generate([

‎src/Command/Generate/ModuleFileCommand.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,11 @@ protected function execute(InputInterface $input, OutputInterface $output)
8787
return 1;
8888
}
8989

90-
$machine_name = $input->getOption('module');
91-
$file_path = $this->extensionManager->getModule($machine_name)->getPath();
90+
$module = $this->validateModule($input->getOption('module'));
91+
$file_path = $this->extensionManager->getModule($module)->getPath();
9292

9393
$this->generator->generate([
94-
'machine_name' => $machine_name,
94+
'machine_name' => $module,
9595
'file_path' => $file_path,
9696
]);
9797
}

‎src/Command/Generate/PermissionCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ protected function configure()
9393
*/
9494
protected function execute(InputInterface $input, OutputInterface $output)
9595
{
96-
$module = $input->getOption('module');
96+
$module = $this->validateModule($input->getOption('module'));
9797
$permissions = $input->getOption('permissions');
9898
$learning = $input->hasOption('learning');
9999
$noInteraction = $input->getOption('no-interaction');

‎src/Command/Generate/PluginBlockCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
167167
return 1;
168168
}
169169

170-
$module = $input->getOption('module');
170+
$module = $this->validateModule($input->getOption('module'));
171171
$class_name = $this->validator->validateClassName($input->getOption('class'));
172172
$label = $input->getOption('label');
173173
$plugin_id = $input->getOption('plugin-id');

‎src/Command/Generate/PluginCKEditorButtonCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
124124
return 1;
125125
}
126126

127-
$module = $input->getOption('module');
127+
$module = $this->validateModule($input->getOption('module'));
128128
$class_name = $this->validator->validateClassName($input->getOption('class'));
129129
$label = $input->getOption('label');
130130
$plugin_id = $input->getOption('plugin-id');

‎src/Command/Generate/PluginConditionCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
144144
return 1;
145145
}
146146

147-
$module = $input->getOption('module');
147+
$module = $this->validateModule($input->getOption('module'));
148148
$class_name = $this->validator->validateClassName($input->getOption('class'));
149149
$label = $input->getOption('label');
150150
$plugin_id = $input->getOption('plugin-id');

‎src/Command/Generate/PluginFieldCommand.php

+4-3
Original file line numberDiff line numberDiff line change
@@ -168,10 +168,11 @@ protected function execute(InputInterface $input, OutputInterface $output)
168168
return 1;
169169
}
170170

171+
$module = $this->validateModule($input->getOption('module'));
171172
$this->chainQueue
172173
->addCommand(
173174
'generate:plugin:fieldtype', [
174-
'--module' => $input->getOption('module'),
175+
'--module' => $module,
175176
'--class' => $this->validator->validateClassName($input->getOption('type-class')),
176177
'--label' => $input->getOption('type-label'),
177178
'--plugin-id' => $input->getOption('type-plugin-id'),
@@ -185,7 +186,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
185186
$this->chainQueue
186187
->addCommand(
187188
'generate:plugin:fieldwidget', [
188-
'--module' => $input->getOption('module'),
189+
'--module' => $module,
189190
'--class' => $this->validator->validateClassName($input->getOption('widget-class')),
190191
'--label' => $input->getOption('widget-label'),
191192
'--plugin-id' => $input->getOption('widget-plugin-id'),
@@ -196,7 +197,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
196197
$this->chainQueue
197198
->addCommand(
198199
'generate:plugin:fieldformatter', [
199-
'--module' => $input->getOption('module'),
200+
'--module' => $module,
200201
'--class' => $this->validator->validateClassName($input->getOption('formatter-class')),
201202
'--label' => $input->getOption('formatter-label'),
202203
'--plugin-id' => $input->getOption('formatter-plugin-id'),

‎src/Command/Generate/PluginFieldFormatterCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
137137
return 1;
138138
}
139139

140-
$module = $input->getOption('module');
140+
$module = $this->validateModule($input->getOption('module'));
141141
$class_name = $this->validator->validateClassName($input->getOption('class'));
142142
$label = $input->getOption('label');
143143
$plugin_id = $input->getOption('plugin-id');

‎src/Command/Generate/PluginFieldTypeCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
141141
return 1;
142142
}
143143

144-
$module = $input->getOption('module');
144+
$module = $this->validateModule($input->getOption('module'));
145145
$class_name = $this->validator->validateClassName($input->getOption('class'));
146146
$label = $input->getOption('label');
147147
$plugin_id = $input->getOption('plugin-id');

‎src/Command/Generate/PluginFieldWidgetCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
137137
return 1;
138138
}
139139

140-
$module = $input->getOption('module');
140+
$module = $this->validateModule($input->getOption('module'));
141141
$class_name = $this->validator->validateClassName($input->getOption('class'));
142142
$label = $input->getOption('label');
143143
$plugin_id = $input->getOption('plugin-id');

‎src/Command/Generate/PluginImageEffectCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
128128
return 1;
129129
}
130130

131-
$module = $input->getOption('module');
131+
$module = $this->validateModule($input->getOption('module'));
132132
$class_name = $this->validator->validateClassName($input->getOption('class'));
133133
$label = $input->getOption('label');
134134
$plugin_id = $input->getOption('plugin-id');

‎src/Command/Generate/PluginImageFormatterCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
117117
return 1;
118118
}
119119

120-
$module = $input->getOption('module');
120+
$module = $this->validateModule($input->getOption('module'));
121121
$class_name = $this->validator->validateClassName($input->getOption('class'));
122122
$label = $input->getOption('label');
123123
$plugin_id = $input->getOption('plugin-id');

‎src/Command/Generate/PluginMailCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
129129
return 1;
130130
}
131131

132-
$module = $input->getOption('module');
132+
$module = $this->validateModule($input->getOption('module'));
133133
$class_name = $this->validator->validateClassName($input->getOption('class'));
134134
$label = $input->getOption('label');
135135
$plugin_id = $input->getOption('plugin-id');

‎src/Command/Generate/PluginMigrateProcessCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
109109
return 1;
110110
}
111111

112-
$module = $input->getOption('module');
112+
$module = $this->validateModule($input->getOption('module'));
113113
$class_name = $this->validator->validateClassName($input->getOption('class'));
114114
$plugin_id = $input->getOption('plugin-id');
115115

‎src/Command/Generate/PluginMigrateSourceCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
160160
return 1;
161161
}
162162

163-
$module = $input->getOption('module');
163+
$module = $this->validateModule($input->getOption('module'));
164164
$class_name = $this->validator->validateClassName($input->getOption('class'));
165165
$plugin_id = $input->getOption('plugin-id');
166166
$table = $input->getOption('table');

‎src/Command/Generate/PluginRestResourceCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
137137
}
138138

139139
$http_methods = $this->getHttpMethods();
140-
$module = $input->getOption('module');
140+
$module = $this->validateModule($input->getOption('module'));
141141
$class_name = $this->validator->validateClassName($input->getOption('class'));
142142
$plugin_id = $input->getOption('plugin-id');
143143
$plugin_label = $input->getOption('plugin-label');

‎src/Command/Generate/PluginRulesActionCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
137137
return 1;
138138
}
139139

140-
$module = $input->getOption('module');
140+
$module = $this->validateModule($input->getOption('module'));
141141
$class_name = $this->validator->validateClassName($input->getOption('class'));
142142
$label = $input->getOption('label');
143143
$plugin_id = $input->getOption('plugin-id');

‎src/Command/Generate/PluginSkeletonCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
133133
return 1;
134134
}
135135

136-
$module = $input->getOption('module');
136+
$module = $this->validateModule($input->getOption('module'));
137137

138138
$pluginId = $input->getOption('plugin-id');
139139
$plugin = ucfirst($this->stringConverter->underscoreToCamelCase($pluginId));

‎src/Command/Generate/PluginTypeAnnotationCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ protected function configure()
107107
*/
108108
protected function execute(InputInterface $input, OutputInterface $output)
109109
{
110-
$module = $input->getOption('module');
110+
$module = $this->validateModule($input->getOption('module'));
111111
$class_name = $this->validator->validateClassName($input->getOption('class'));
112112
$machine_name = $input->getOption('machine-name');
113113
$label = $input->getOption('label');

‎src/Command/Generate/PluginTypeYamlCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ protected function configure()
107107
*/
108108
protected function execute(InputInterface $input, OutputInterface $output)
109109
{
110-
$module = $input->getOption('module');
110+
$module = $this->validateModule($input->getOption('module'));
111111
$class_name = $this->validator->validateClassName($input->getOption('class'));
112112
$plugin_name = $input->getOption('plugin-name');
113113
$plugin_file_name = $input->getOption('plugin-file-name');

‎src/Command/Generate/PostUpdateCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
108108
return 1;
109109
}
110110

111-
$module = $input->getOption('module');
111+
$module = $this->validateModule($input->getOption('module'));
112112
$postUpdateName = $input->getOption('post-update-name');
113113

114114
$this->validatePostUpdateName($module, $postUpdateName);

‎src/Command/Generate/RouteSubscriberCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
108108
return 1;
109109
}
110110

111-
$module = $input->getOption('module');
111+
$module = $this->validateModule($input->getOption('module'));
112112
$name = $input->getOption('name');
113113
$class = $this->validator->validateClassName($input->getOption('class'));
114114

‎src/Command/Generate/ServiceCommand.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
145145
return 1;
146146
}
147147

148-
$module = $input->getOption('module');
148+
$module = $this->validateModule($input->getOption('module'));
149149
$name = $input->getOption('name');
150150
$class = $this->validator->validateClassName($input->getOption('class'));
151151
$interface = $input->getOption('interface');
@@ -171,6 +171,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
171171
'name' => $name,
172172
'class' => $class,
173173
'interface' => $interface,
174+
'interface_name' => $interface_name,
174175
'services' => $build_services,
175176
'path_service' => $path_service,
176177
]);

‎src/Command/Generate/TwigExtensionCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
133133
return 1;
134134
}
135135

136-
$module = $input->getOption('module');
136+
$module = $this->validateModule($input->getOption('module'));
137137
$name = $input->getOption('name');
138138
$class = $this->validator->validateClassName($input->getOption('class'));
139139
$services = $input->getOption('services');

‎src/Command/Generate/UpdateCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
107107
return 1;
108108
}
109109

110-
$module = $input->getOption('module');
110+
$module = $this->validateModule($input->getOption('module'));
111111
$updateNumber = $input->getOption('update-n');
112112

113113
$lastUpdateSchema = $this->getLastUpdate($module);

0 commit comments

Comments
 (0)