Skip to content

Commit fc3d412

Browse files
Drupal 10 deprecation fixes
- Updated *.info.yml to be compatible with Drupal 10. - Replaced deprecated jQuery $.once to pure javascript .once library. - Replaced deprecated user.private_tempstore service with tempstore.private.
1 parent 730d587 commit fc3d412

File tree

6 files changed

+9
-10
lines changed

6 files changed

+9
-10
lines changed

kifiform.info.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: Form Bundle
22
type: module
33
core: 8.x
4+
core_version_requirement: ">=8"
45
package: Kirjastot.fi
56
description: 'Provides custom form fields'
67
dependencies: {}

kifiform.libraries.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ rating-ajax:
1515
public/js/kifiform-rating.js: {}
1616
dependencies:
1717
- core/jquery
18-
- core/jquery.once
18+
- core/once
1919
view-counter:
2020
js:
2121
public/js/kifiform-view-counter.js: {}
@@ -30,4 +30,4 @@ autocomplete-tags:
3030
public/js/kifiform-autocomplete-tags.js: {}
3131
dependencies:
3232
- core/jquery
33-
- core/jquery.once
33+
- core/once

public/js/kifiform-autocomplete-tags.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,7 @@
5959

6060
Drupal.behaviors.kifiFormAutoCompleteTags = {
6161
attach: function(context, settings) {
62-
var elements = $("input.form-autocomplete")
63-
.once("kifiform-autocomplete-tags")
62+
var elements = $(once("kifiform-autocomplete-tags", "input.form-autocomplete"))
6463
.each(function(i, _input) {
6564
var input = $(_input);
6665

public/js/kifiform-rating.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33

44
Drupal.behaviors.kifiFormContentRating = {
55
attach: function(context, settings) {
6-
$(".field--type-kifiform-rating")
7-
.once("kifiform-rating")
6+
$(once("kifiform-rating", ".field--type-kifiform-rating"))
87
.each(function(i, _element) {
98
var element = $(_element);
109
var form = $(_element).find('.rating-form');

src/Controller/ViewCounterController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
use Drupal\Core\Entity\EntityTypeManagerInterface;
77
use Drupal\Core\Entity\FieldableEntityInterface;
88
use Drupal\Core\Field\FieldItemListInterface;
9-
use Drupal\user\PrivateTempStoreFactory;
9+
use Drupal\Core\TempStore\PrivateTempStoreFactory;
1010
use Symfony\Component\DependencyInjection\ContainerInterface;
1111
use Symfony\Component\HttpFoundation\JsonResponse;
1212
use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
@@ -18,7 +18,7 @@ class ViewCounterController extends ControllerBase {
1818
public static function create(ContainerInterface $container) {
1919
return new static(
2020
$container->get('entity_type.manager'),
21-
$container->get('user.private_tempstore')
21+
$container->get('tempstore.private')
2222
);
2323
}
2424

src/Plugin/Field/FieldType/RatingItem.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public static function defaultFieldSettings() {
103103
}
104104

105105
public function isUserAllowedToVote() {
106-
$store = \Drupal::service('user.private_tempstore')->get('kifiform');
106+
$store = \Drupal::service('tempstore.private')->get('kifiform');
107107
$key = sprintf('%s.%s.%s', $this->getEntity()->getEntityTypeId(), $this->getFieldDefinition()->getName(), $this->getEntity()->id());
108108
return !$store->get($key);
109109
}
@@ -116,7 +116,7 @@ public function addVote($vote, $lock_session = FALSE) {
116116
}
117117

118118
if ($lock_session) {
119-
$store = \Drupal::service('user.private_tempstore')->get('kifiform');
119+
$store = \Drupal::service('tempstore.private')->get('kifiform');
120120
$key = sprintf('%s.%s.%s', $this->getEntity()->getEntityTypeId(), $this->getFieldDefinition()->getName(), $this->getEntity()->id());
121121
$store->set($key, TRUE);
122122
}

0 commit comments

Comments
 (0)