Replace user_access() calls with $account->hasPermission() in content translation module

I take this issue for me on CodeSprintUA/CIS

#4: 2061961-replace-user_access-calls-4.patch queued for re-testing.

7: replace-useraccess-calls-2061961-7.patch queued for re-testing.

Patch needs re-work to not use global user - see #2047951: [META] Remove calls to deprecated global $user and $GLOBALS['user']

1. +++ b/core/modules/content_translation/content_translation.admin.inc
   @@ -60,7 +60,8 @@ function content_translation_field_sync_widget(FieldDefinitionInterface $field)
   -  if (!user_access('administer content translation')) {
   +  $account = \Drupal::currentUser();
   +  if (!$account->hasPermission('administer content translation')) {
   
   @@ -146,7 +147,8 @@ function _content_translation_form_language_content_settings_form_alter(array &$
   -  if (!user_access('administer content translation')) {
   +  $account = \Drupal::currentUser();
   +  if (!$account->hasPermission('administer content translation')) {
   

   $account is not needed here,
   just use \Drupal::currentUser()->hasPermission()

2. +++ b/core/modules/content_translation/content_translation.module
   @@ -308,8 +308,15 @@ function _content_translation_menu_strip_loaders($path) {
   +  global $user;
   ...
   +    $account = \Drupal::currentUser() ?: $user;
   
   @@ -324,13 +331,20 @@ function content_translation_translate_access(EntityInterface $entity) {
   +  global $user;
   ...
   +    $account = \Drupal::currentUser() ?: $user;
   
   @@ -902,7 +916,14 @@ function content_translation_enable_widget($entity_type, $bundle, array &$form,
   +  global $user;
   ...
   +    $account = \Drupal::currentUser() ?: $user;
   

   global $user is the same \Drupal:currentUser()

1. +++ b/core/modules/content_translation/content_translation.admin.inc
   @@ -60,7 +60,8 @@ function content_translation_field_sync_widget(FieldDefinitionInterface $field)
   -  if (!user_access('administer content translation')) {
   +  $account = \Drupal::currentUser();
   +  if (!$account->hasPermission('administer content translation')) {
   
   @@ -146,7 +147,8 @@ function _content_translation_form_language_content_settings_form_alter(array &$
   -  if (!user_access('administer content translation')) {
   +  $account = \Drupal::currentUser();
   +  if (!$account->hasPermission('administer content translation')) {
   
   +++ b/core/modules/content_translation/content_translation.module
   @@ -902,7 +904,8 @@ function content_translation_enable_widget($entity_type, $bundle, array &$form,
   +    $account = \Drupal::currentUser();
   +  if (empty($element['#content_translation_skip_alter']) && $account->hasPermission('administer content translation')) {
   ...
   -  if (empty($element['#content_translation_skip_alter']) && user_access('administer content translation')) {
   

   Please do not add new variable ($account), see my previous review (1)

2. +++ b/core/modules/content_translation/content_translation.module
   @@ -324,13 +325,14 @@ function content_translation_translate_access(EntityInterface $entity) {
    function content_translation_view_access(EntityInterface $entity, $langcode, AccountInterface $account = NULL) {
   +  $account = \Drupal::currentUser();
   

   $account = $account ?: \Drupal::currentuser();
   The passed account could be different from current user

And another round...
1) Once there's more then one \Drupal::currentUser() execution it makes sense to use variable
2) Do not add extra space before \Drupal::
3) Please check carefully the functions that have $account argument passed in

1. +++ b/core/modules/content_translation/content_translation.module
   @@ -309,7 +309,7 @@ function _content_translation_menu_strip_loaders($path) {
   +    ( \Drupal::currentUser()->hasPermission('create content translations') ||  \Drupal::currentUser()->hasPermission('update content translations') ||  \Drupal::currentUser()->hasPermission('delete content translations'));
   ...
   -    (user_access('create content translations') || user_access('update content translations') || user_access('delete content translations'));
   
   @@ -330,7 +330,7 @@ function content_translation_view_access(EntityInterface $entity, $langcode, Acc
   -  return !empty($entity->translation[$langcode]['status']) || user_access('translate any entity', $account) || user_access($permission, $account);
   +  return !empty($entity->translation[$langcode]['status']) ||  \Drupal::currentUser()->hasPermission('translate any entity', $account) ||  \Drupal::currentUser()->hasPermission($permission, $account);
   

   In case like this better revert to $account, to minimize function calls

2. +++ b/core/modules/content_translation/lib/Drupal/content_translation/ContentTranslationController.php
   @@ -63,10 +63,10 @@ public function getTranslationAccess(EntityInterface $entity, $op) {
   +    if (! \Drupal::currentUser()->hasPermission('translate any entity') && !empty($info['permission_granularity'])) {
   +      $translate_permission =  \Drupal::currentUser()->hasPermission($info['permission_granularity'] == 'bundle' ? "translate {$entity->bundle()} {$entity->entityType()}" : "translate {$entity->entityType()}");
   ...
   +    return $translate_permission &&  \Drupal::currentUser()->hasPermission("$op content translations");
   

   the same

Now it's good to go

Thanks for your work on this! See #2048171-17: [meta] Replace user_access() calls with $account->hasPermission() wherever possible..

18: drupal_content_translation_replace-useraccess-calls-2061961-18.patch queued for re-testing.

Oops. :)

18: drupal_content_translation_replace-useraccess-calls-2061961-18.patch queued for re-testing.

This patch should be merged into #2061977: Replace user_access() calls with $account->hasPermission() in all core modules except user

testbot fun! stop that, will you?