Issue #3474819 by linhnm: Drupal 11 Compatibility

orejime.info.yml

 name: 'Orejime'
 type: module
 description: 'Drupal integration of Orejime'
-core_version_requirement: ^9.2 || ^10
+core_version_requirement: ^9.2 || ^10 || ^11
 package: 'orejime'
 configure: orejime_service.settings
 dependencies:

src/Controller/OrejimeController.php

@@ -4,13 +4,13 @@ namespace Drupal\orejime\Controller;
 
 use Drupal\Component\Utility\Xss;
 use Drupal\Core\Controller\ControllerBase;
+use Drupal\Core\Datetime\DateFormatterInterface;
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Link;
+use Drupal\Core\Render\RendererInterface;
 use Drupal\Core\Url;
-use Drupal\Core\Datetime\DateFormatterInterface;
 use Drupal\orejime\Entity\OrejimeInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Drupal\Core\Render\RendererInterface;
 
 /**
  * Class OrejimeController.
@@ -66,12 +66,11 @@ class OrejimeController extends ControllerBase implements ContainerInjectionInte
    *   An array suitable for drupal_render().
    */
   public function revisionShow($orejime_service_revision) {
-    $orejime_service = $this->entityTypeManager()
-      ->getStorage('orejime_service')
-      ->loadRevision($orejime_service_revision);
-    $view_builder = $this->entityTypeManager()->getViewBuilder('orejime_service');
-
-    return $view_builder->view($orejime_service);
+    /** @var \Drupal\Core\Entity\RevisionableStorageInterface $orejime_service_storage */
+    $orejime_service_storage = $this->entityTypeManager()
+      ->getStorage('orejime_service');
+    $orejime_service = $orejime_service_storage->loadRevision($orejime_service_revision);
+    return $this->entityTypeManager()->getViewBuilder('orejime_service')->view($orejime_service);
   }
 
   /**
@@ -84,9 +83,10 @@ class OrejimeController extends ControllerBase implements ContainerInjectionInte
    *   The page title.
    */
   public function revisionPageTitle($orejime_service_revision) {
-    $orejime_service = $this->entityTypeManager()
-      ->getStorage('orejime_service')
-      ->loadRevision($orejime_service_revision);
+    /** @var \Drupal\Core\Entity\RevisionableStorageInterface $orejime_service_storage */
+    $orejime_service_storage = $this->entityTypeManager()
+      ->getStorage('orejime_service');
+    $orejime_service = $orejime_service_storage->loadRevision($orejime_service_revision);
     return $this->t('Revision of %title from %date', [
       '%title' => $orejime_service->label(),
       '%date' => $this->dateFormatter->format($orejime_service->getRevisionCreationTime()),
@@ -108,6 +108,8 @@ class OrejimeController extends ControllerBase implements ContainerInjectionInte
     $langname = $orejime_service->language()->getName();
     $languages = $orejime_service->getTranslationLanguages();
     $has_translations = (count($languages) > 1);
+
+    /** @var \Drupal\Core\Entity\RevisionableStorageInterface $orejime_service_storage */
     $orejime_service_storage = $this->entityTypeManager()
       ->getStorage('orejime_service');
 

src/Form/OrejimeRevisionDeleteForm.php

@@ -27,7 +27,7 @@ class OrejimeRevisionDeleteForm extends ConfirmFormBase {
   /**
    * The Orejime storage.
    *
-   * @var \Drupal\Core\Entity\EntityStorageInterface
+   * @var \Drupal\orejime\OrejimeStorageInterface
    */
   protected $orejimeStorage;
 

src/Form/OrejimeRevisionRevertForm.php

@@ -28,7 +28,7 @@ class OrejimeRevisionRevertForm extends ConfirmFormBase {
   /**
    * The Orejime storage.
    *
-   * @var \Drupal\Core\Entity\EntityStorageInterface
+   * @var \Drupal\orejime\OrejimeStorageInterface
    */
   protected $orejimeStorage;
 

src/Form/OrejimeSettingsForm.php

@@ -8,6 +8,8 @@ use Drupal\Core\Asset\CssOptimizer;
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Extension\ModuleExtensionList;
+use Drupal\Core\Extension\ModuleHandlerInterface;
+use Drupal\Core\File\FileExists;
 use Drupal\Core\File\FileSystemInterface;
 use Drupal\Core\File\FileUrlGeneratorInterface;
 use Drupal\Core\Form\ConfigFormBase;
@@ -15,7 +17,6 @@ use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\State\StateInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\Yaml\Yaml;
-use Drupal\Core\Extension\ModuleHandlerInterface;
 
 /**
  * Settings form for module Orejime.
@@ -89,6 +90,8 @@ class OrejimeSettingsForm extends ConfigFormBase {
   protected $moduleExtensionList;
 
   /**
+   * The file URL generator.
+   *
    * @var \Drupal\Core\File\FileUrlGeneratorInterface
    */
   protected $fileUrlGenerator;
@@ -114,6 +117,7 @@ class OrejimeSettingsForm extends ConfigFormBase {
    *   The module extension list.
    * @param \Drupal\Core\File\FileUrlGeneratorInterface $file_url_generator
    *   The file URL generator.
+   *
    * @throws \Drupal\Component\Plugin\Exception\PluginException
    */
   public function __construct(ConfigFactoryInterface $config_factory, FactoryInterface $plugin_factory, ModuleHandlerInterface $module_handler, FileSystemInterface $file_system, TimeInterface $time, StateInterface $state, EntityTypeManagerInterface $entityTypeManager, ModuleExtensionList $extension_list_module, FileUrlGeneratorInterface $file_url_generator) {
@@ -693,7 +697,7 @@ class OrejimeSettingsForm extends ConfigFormBase {
         $style = $this->rewriteStylesheet($new_colors, $style, $border_radius);
         $base_file = $this->fileSystem->basename($source);
         $css = $target . $base_file;
-        $this->fileSystem->saveData($style, $css, FileSystemInterface::EXISTS_REPLACE);
+        $this->fileSystem->saveData($style, $css, FileExists::Rename);
         $this->fileSystem->chmod($css);
         $this->config('orejime.settings')->set('color.url_css', $css);
         $this->config('orejime.settings')->save();