Unverified Commit d4c4f668 authored by Stefan Auditor's avatar Stefan Auditor Committed by Stefan Auditor
Browse files

Issue #3282696 by sanduhrs: Port of l10n_community: Fix parameter upcasting

parent 74862b6d

l10n_community/l10n_community.routing.yml

+6 −17
Original line number Diff line number Diff line
@@ -66,17 +66,6 @@ l10n_community.language.translate.export: 
      language:

        type: language



l10n_community.project.overview:

  path: '/translate/projects/{project}'

  defaults:

    _title: 'Overview'

    _controller: '\Drupal\l10n_community\Controller\L10nCommunityProjectsController::overview'

  requirements:

    _permission: 'access localization community'

  options:

    parameters:

      project:

        type: l10n_server_project

l10n_community.project.export:

  path: '/translate/projects/{project}/export'

  defaults:
@@ -87,7 +76,7 @@ l10n_community.project.export: 
  options:

    parameters:

      project:

        type: l10n_server_project

        type: entity:l10n_server_project

l10n_community.project.releases:

  path: '/translate/projects/{project}/releases'

  defaults:
@@ -98,7 +87,7 @@ l10n_community.project.releases: 
  options:

    parameters:

      project:

        type: l10n_server_project

        type: entity:l10n_server_project

l10n_community.project.releases.release:

  path: '/translate/projects/{project}/releases/{release}'

  defaults:
@@ -109,9 +98,9 @@ l10n_community.project.releases.release: 
  options:

    parameters:

      project:

        type: l10n_server_project

        type: entity:l10n_server_project

      release:

        type: l10n_server_release

        type: entity:l10n_server_release

l10n_community.language.translate.reset:

  path: '/translate/languages/{language}/translate/reset/{project}/{release}'

  defaults:
@@ -124,6 +113,6 @@ l10n_community.language.translate.reset: 
      language:

        type: language

      project:

        type: l10n_server_project

        type: entity:l10n_server_project

      release:

        type: l10n_server_release
 
        type: entity:l10n_server_release

l10n_community/src/Controller/L10nCommunityLanguagesController.php

+20 −1
Original line number Diff line number Diff line
@@ -6,12 +6,14 @@ namespace Drupal\l10n_community\Controller; 
use Drupal\Core\Config\ConfigManagerInterface;

use Drupal\Core\Controller\ControllerBase;

use Drupal\Core\Language\Language;

use Drupal\l10n_server\Entity\L10nServerProjectInterface;

use Drupal\l10n_server\Entity\L10nServerReleaseInterface;

use Symfony\Component\DependencyInjection\ContainerInterface;



/**

 * Returns responses for Localization community UI routes.

 */

class L10NCommunityLanguagesController extends ControllerBase {

class L10nCommunityLanguagesController extends ControllerBase {



  /**

   * The config manager.
@@ -103,4 +105,21 @@ class L10NCommunityLanguagesController extends ControllerBase { 
    return $build;

  }



  /**

   * Builds the response.

   *

   * @param \Drupal\Core\Language\Language $language

   * @param \Drupal\l10n_server\Entity\L10nServerProjectInterface $project

   * @param \Drupal\l10n_server\Entity\L10nServerReleaseInterface $release

   *

   * @return array

   */

  public function reset(Language $language, L10nServerProjectInterface $project, L10nServerReleaseInterface $release) {

    $build['content'] = [

      '#type' => 'item',

      '#markup' => __METHOD__ . '::' . $project->label() . '::' . $release->label() . '::' . $language->getId(),

    ];

    return $build;

  }



}

l10n_community/src/Controller/L10nCommunityProjectsController.php

+1 −19
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ namespace Drupal\l10n_community\Controller; 


use Drupal\Core\Config\ConfigManagerInterface;

use Drupal\Core\Controller\ControllerBase;

use Drupal\Core\Language\Language;

use Drupal\l10n_server\Entity\L10nServerProjectInterface;

use Drupal\l10n_server\Entity\L10nServerReleaseInterface;

use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -13,7 +12,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface; 
/**

 * Returns responses for Localization community UI routes.

 */

class L10NCommunityProjectsController extends ControllerBase {

class L10nCommunityProjectsController extends ControllerBase {



  /**

   * The config manager.
@@ -106,21 +105,4 @@ class L10NCommunityProjectsController extends ControllerBase { 
    return $build;

  }



  /**

   * Builds the response.

   *

   * @param \Drupal\Core\Language\Language $language

   * @param \Drupal\l10n_server\Entity\L10nServerProjectInterface $project

   * @param \Drupal\l10n_server\Entity\L10nServerReleaseInterface $release

   *

   * @return array

   */

  public function reset(Language $language, L10nServerProjectInterface $project, L10nServerReleaseInterface $release) {

    $build['content'] = [

      '#type' => 'item',

      '#markup' => __METHOD__ . '::' . $project->label() . '::' . $release->label() . '::' . $language->getId(),

    ];

    return $build;

  }



}