Issue #3271756 by RenatoG: Implement the configFactory with dependency...

Issue #3271756 by RenatoG: Implement the configFactory with dependency injection instead of Drupal::config

block_class.services.yml

 services:
   block_class.helper:
     class: Drupal\block_class\Service\BlockClassHelperService
-    arguments: ['@language_manager', '@entity_type.manager', '@config.factory', '@database', '@request_stack', '@path.matcher', '@uuid', '@current_user', '@path_alias.manager', '@path.current', '@entity.repository']
\ No newline at end of file
+    arguments: ['@language_manager', '@entity_type.manager', '@config.factory', '@database', '@request_stack', '@path.matcher', '@uuid', '@path_alias.manager', '@path.current', '@entity.repository', '@current_user']
\ No newline at end of file

src/Service/BlockClassHelperService.php

@@ -8,7 +8,6 @@ use Drupal\Core\Language\LanguageManagerInterface;
 use Drupal\Core\Path\PathMatcherInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Symfony\Component\HttpFoundation\RequestStack;
-use Drupal\Core\Session\AccountProxyInterface;
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\path_alias\AliasManagerInterface;
@@ -21,6 +20,7 @@ use Drupal\block\Entity\Block;
 use Drupal\Component\Utility\Html;
 use Drupal\block_class\Constants\BlockClassConstants;
 use Drupal\Component\Serialization\Json;
+use Drupal\Core\Session\AccountProxy;
 
 /**
  * Block Class Service Class.
@@ -78,13 +78,6 @@ class BlockClassHelperService {
    */
   protected $database;
 
-  /**
-   * The user current.
-   *
-   * @var \Drupal\Core\Session\AccountProxyInterface
-   */
-  protected $currentUser;
-
   /**
    * The path alias manager.
    *
@@ -106,10 +99,17 @@ class BlockClassHelperService {
    */
   protected $entityRepository;
 
+  /**
+   * Drupal\Core\Session\AccountProxy definition.
+   *
+   * @var \Drupal\Core\Session\AccountProxy
+   */
+  protected $currentUser;
+
   /**
    * Construct of Block Class service.
    */
-  public function __construct(LanguageManagerInterface $language_manager, EntityTypeManagerInterface $entity_manager, ConfigFactoryInterface $config_factory, Connection $database, RequestStack $request_stack, PathMatcherInterface $path_matcher, UuidInterface $uuid_service, AccountProxyInterface $current_user, AliasManagerInterface $alias_manager, CurrentPathStack $current_path, EntityRepositoryInterface $entityRepository) {
+  public function __construct(LanguageManagerInterface $language_manager, EntityTypeManagerInterface $entity_manager, ConfigFactoryInterface $config_factory, Connection $database, RequestStack $request_stack, PathMatcherInterface $path_matcher, UuidInterface $uuid_service, AliasManagerInterface $alias_manager, CurrentPathStack $current_path, EntityRepositoryInterface $entityRepository, AccountProxy $currentUser) {
     $this->languageManager = $language_manager;
     $this->entityTypeManager = $entity_manager;
     $this->pathMatcher = $path_matcher;
@@ -117,10 +117,10 @@ class BlockClassHelperService {
     $this->configFactory = $config_factory;
     $this->database = $database;
     $this->uuidService = $uuid_service;
-    $this->currentUser = $current_user;
     $this->aliasManager = $alias_manager;
     $this->currentPath = $current_path;
     $this->entityRepository = $entityRepository;
+    $this->currentUser = $currentUser;
   }
 
   /**
@@ -249,8 +249,8 @@ class BlockClassHelperService {
    */
   public function addAttributesOnBlock(&$block, &$variables) {
 
-    // Get config object.
-    $config = \Drupal::config('block_class.settings');
+    // Get the config object.
+    $config = $this->configFactory->getEditable('block_class.settings');
 
     // If attributes isn't enabled, skip.
     if (empty($config->get('enable_attributes'))) {
@@ -294,8 +294,8 @@ class BlockClassHelperService {
     // Get all classes if exists.
     $classes_array = explode(' ', $classes);
 
-    // Get config object.
-    $config = \Drupal::config('block_class.settings');
+    // Get the config object.
+    $config = $this->configFactory->getEditable('block_class.settings');
 
     $filter_css_identifier = [];
 
@@ -330,7 +330,7 @@ class BlockClassHelperService {
   public function blockClassFormAlter(&$form, &$form_state) {
 
     // If the user don't have permission, skip that.
-    if (!\Drupal::currentUser()->hasPermission(BlockClassConstants::BLOCK_CLASS_PERMISSION)) {
+    if (!$this->currentUser->hasPermission(BlockClassConstants::BLOCK_CLASS_PERMISSION)) {
       return;
     }
 
@@ -542,8 +542,8 @@ class BlockClassHelperService {
    */
   public function blockClassFormValidate(&$form, &$form_state) {
 
-    // Get config object.
-    $config = \Drupal::config('block_class.settings');
+    // Get the config object.
+    $config = $this->configFactory->getEditable('block_class.settings');
 
     // Validate dynamic items.
     $this->validateDynamicClasses($form, $form_state, $config);