Uniformize Drush commands of devel_generate

Is not it better to provide brand new command, something like generate-bundled-entities with options such as type, bundle.

Update task description with a more specific detail to implement at this issue.

At this patch:

generate-content
Rename --types to --bundles
generate-terms
Remove machine_name and replace it functionality by --bundles

Examples to use with drush 8
drush generate-content 2 2 --bundles=page --kill=1
drush generate-terms 4 --kill=1 --bundles=countries

Examples to use with drush 9
drush devel-generate-content 10 1 --kill --bundles=basic_page
drush devel-generate-terms 50 --kill --bundles=themes,metro_stations

By GUI this patch works too.

Updated version of patch from #8
Made *kill* option for terms generation to have same behaviour with other commands.

I think this patch is no-go because changes arguments for commands - all scripts will fail

So I see 2 ways
- target this changes to 8.x-3.x branch and normalize arguments
- keep arguments the same and backport to 8.x-2.x

Patch looks good. Needs to pass tests on 8.3.x.

Reroll for 8.x-3.x + updating Tests

@davidferlay those images are a bit small to read. When you add an image can you still allow us to get the link to the actual image, then we can zoom to see :-)

The tests now pass (good) but we need to answer the questions in #10 and #11. If this change it not going to be back-ported to 8.x-2.x branch then the updated tests must also not be back-ported. Is this OK?

We're not going to backport this patch to 2.x.

Looks like test for 8.x-2.x was added by mistake or automatically

In validateDrushParams() in TermDevelGenerate.php, the new code is not quite right:

  foreach ($bundles As $bundle) {
    // Try to convert machine name to a vocabulary id.
    if (!$vids[] = $this->vocabularyStorage->load($bundle)->id()) {
      throw new \Exception(dt('Invalid vocabulary name: @name', array('@name' => $vocabulary_name)));

If an invalid $bundle is given then $this->vocabularyStorage->load($bundle)->id() fails badly with "Error: Call to a member function id() on null". In fact, this code, which was copied from later in the function, does not need to get the vocabulary id, because each $bundle is the id/machine name. I have a working versoin of this, but I will also write test coverage because we want to detect and avoid errors like this in future.

Here's a patch exactly the same as #14 but with three extra lines in the test:

// Check that invalid vocabulary machine name throws the correct exception.
$this->setExpectedException('\exception', 'Invalid vocabulary');
$this->drush('devel-generate-terms', [1],
    ['bundles' => $this->randomMachineName(20)]);

This patch will fail testing, and will demonstrate the error reported in #20

Here is the fix to validateDrushParams for terms:

     foreach ($bundles As $bundle) {
-      // Try to convert machine name to a vocabulary id.
-      if (!$vids[] = $this->vocabularyStorage->load($bundle)->id()) {
-        throw new \Exception(dt('Invalid vocabulary name: @name', array('@name' => $vocabulary_name)));
+      // Verify that each bundle is a valid vocabulary id.
+      if (!$this->vocabularyStorage->load($bundle)) {
+        throw new \Exception(dt('Invalid vocabulary machine name: @name', array('@name' => $bundle)));
       }
     }
 
@@ -259,7 +259,7 @@ class TermDevelGenerate extends DevelGenerateBase implements ContainerFactoryPlu
       'num' => $number,
       'kill' => $this->isDrush8() ? drush_get_option('kill') : $options['kill'],
       'title_length' => 12,
-      'vids' => $vids,
+      'vids' => $bundles,
     ];
 

Also in develGenerateCommands.php, function content line 157 we do not need to include the default value in the doc comment as this is added automatically when you call the command with --help, as you can see in the first image on #16.

-   * @option bundles A comma delimited list of content types to create. Defaults to page,article.
+   * @option bundles A comma-delimited list of content types to create.

Patch now includes these changes, so the new lines in the test should pass.

Updated changes made at the last patches.

Thanks, @jhonatan1055 your changes work fine and solve the problem with exceptions. BTW you made a enhance messages.

Now, this is the error message when a User introduces some bad machine name for a bundle.

BTW you made a enhance messages.

That was just a good outcome of altering the code from patch #14 to work properly :-) The exception was already there before.

Latest patch looks OK for me.
Got proper exception when trying to generate terms for non-existing vocabulary.

Thanks jonathan1055. I appreciate your attention to detail on these issues. It makes our project better.

@moshe weitzman, you're welcome. Devel and Devel Generate are great modules and I'm happy to be able to help. Plenty of credit also goes to Vacho and Sorlov for their patches, I just came in at the end and sorted it out a few things.