Convert applicable custom_block_menu() entries to use _entity_form in routing.yml

Swooping in :)

This is blocked by #1987344: NotFoundHttpException thrown in ParamConverterManager results in a WSOD at least.

Blocks #1908756: Separate Action Links (MENU_LOCAL_ACTION) from hook_menu()

+++ b/core/includes/menu.incundefined
@@ -771,8 +771,15 @@ function _menu_translate(&$router_item, $map, $to_arg = FALSE) {
+    // Attempt to match this path to provide a fully built request to the
+    // acccess checker.
+    try {
+      $request->attributes->add(Drupal::service('router')->matchRequest($request));
+      $router_item['access'] = Drupal::service('access_manager')->check($route, $request);
+    }
+    catch (NotFoundHttpException $e) {
+      $router_item['access'] = FALSE;

I guess this should be moved into a separate issue.

+++ b/core/modules/block/custom_block/custom_block.routing.ymlundefined
@@ -1,6 +1,28 @@
+    custom_block: \d+

Oh does this regex support come from symfony directly, neat.

That got moved out into #1987344: NotFoundHttpException thrown in ParamConverterManager results in a WSOD which went in.

Rerolled and updated for #1908756: Separate Action Links (MENU_LOCAL_ACTION) from hook_menu().

Missed a spot.

re-rolled the patch. Tested locally but failed on the 'Custom Block translation UI' test. A verbose message gave me this:
InvalidArgumentException: Missing 'form: default' for entity 'custom_block' in Drupal\Core\Entity\EntityManager->getControllerClass() (line 166 of /var/www/html/drupal/core/lib/Drupal/Core/Entity/EntityManager.php).

It still has to do something with routing.

+++ b/core/modules/block/custom_block/custom_block.routing.ymlundefined
+++ b/core/modules/block/custom_block/custom_block.routing.ymlundefined
+     custom_block: \d+
+ ¶
+ custom_block_type_add:
...
+     _permission: 'administer blocks'
+ ¶
+ custom_block_type_edit:

Trailing whitespace

+++ b/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Core/Entity/CustomBlockType.phpundefined
+++ b/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Core/Entity/CustomBlockType.phpundefined
-  *       "default" = "Drupal\custom_block\CustomBlockTypeFormController",

You can't get rid of "default" anymore until #2006348: Remove default/fallback entity form operation goes in.

Added the 'default' in the file. Didn't found the white pace error.

The test still fails. Dunno why. Tried to add a custom block manually in a different language and I got the following error:

Wrong form controller.
Also leftover code in custom_block.admin.inc.

#18: custom_block-1983682-18.patch queued for re-testing.

Ah that was a hack anyway, we fixed title callback for routes.

Wrong interdiff

#22: custom-block-1983682-22.patch queued for re-testing.

+++ b/core/modules/block/custom_block/custom_block.routing.ymlundefined
@@ -24,4 +24,26 @@ custom_block_type_delete:
+custom_block_edit:
+  pattern: '/block/{custom_block}'
+  defaults:
+    _entity_form: 'custom_block.edit'
+  requirements:
+    _entity_access: 'custom_block.update'
+    custom_block: \d+

Are we sure that we want to use this route for editing a block? What about sub-requests / ESI etc...

Is that in scope?

  $items['block/%custom_block'] = array(
    'title' => 'Edit',
    'page callback' => 'custom_block_edit',
    'page arguments' => array(1),
    'access callback' => 'entity_page_access',
    'access arguments' => array(1, 'update'),
    'file' => 'custom_block.pages.inc',
  );

is in HEAD, this is just a conversion.

You're correct - it's out of scope :)

Committed c2e0cda and pushed to 8.x. Thanks!