From 84e20162cf9bab3710963c1e1e1b0c82ecadcb3d Mon Sep 17 00:00:00 2001
From: Nicolas Borda <nicolas.borda@manifesto.co.uk>
Date: Mon, 14 Aug 2023 11:53:14 +0200
Subject: [PATCH 1/3] git commit -m 'Issue #3340450 by samit.310@gmail.com,
nitin_lama, imustakim, apaderno, ipwa: Fix the issues reported by phpcs'
--author="Mustakim Farooqui <60236-imustakim@users.noreply.drupalcode.org>"
---
README.md | 4 ++-
src/OwlCarouselGlobal.php | 2 +-
.../OwlCarouselFieldFormatter.php | 31 +++++++++----------
3 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/README.md b/README.md
index c805da9..8f4618b 100755
--- a/README.md
+++ b/README.md
@@ -12,7 +12,9 @@ CONTENTS OF THIS FILE
INTRODUCTION
------------
-This module integrates Owl Carousel, a touch enabled jQuery plugin that lets you create a beautiful, responsive carousel sliders.
+This module integrates Owl Carousel,
+a touch enabled jQuery plugin that lets you create a beautiful,
+ responsive carousel sliders.
* For a full description of the module visit:
https://www.drupal.org/project/owlcarousel
diff --git a/src/OwlCarouselGlobal.php b/src/OwlCarouselGlobal.php
index eed86f1..78045fb 100644
--- a/src/OwlCarouselGlobal.php
+++ b/src/OwlCarouselGlobal.php
@@ -27,7 +27,7 @@ class OwlCarouselGlobal {
'itemsDesktop' => 1,
];
- return isset($settings[$key]) ? $settings[$key] : $settings;
+ return $settings[$key] ?? $settings;
}
/**
diff --git a/src/Plugin/Field/FieldFormatter/OwlCarouselFieldFormatter.php b/src/Plugin/Field/FieldFormatter/OwlCarouselFieldFormatter.php
index 0c80eba..207aa65 100755
--- a/src/Plugin/Field/FieldFormatter/OwlCarouselFieldFormatter.php
+++ b/src/Plugin/Field/FieldFormatter/OwlCarouselFieldFormatter.php
@@ -212,31 +212,31 @@ class OwlCarouselFieldFormatter extends EntityReferenceFormatterBase implements
$loop = $this->getSetting('loop') ? 'TRUE' : 'FALSE';
$dots = $this->getSetting('autoplayHoverPause') ? 'TRUE' : 'FALSE';
- $summary[] = $this->t('OwlCarousel settings summary.');
- $summary[] = $this->t('Image style: ') . $this->getSetting('image_style');
- $summary[] = $this->t('Link image to: ') . $this->getSetting('image_link') ?? $this->t('Nothing');
- $summary[] = $this->t('Amount of items displayed: ') . $itemsdisplay;
- $summary[] = $this->t('Margin from items: ') . $this->getSetting('margin') . 'px';
- $summary[] = $this->t('Display next and prev buttons: ') . $nav;
- $summary[] = $this->t('Autoplay: ') . $autoplay;
- $summary[] = $this->t('Autoplay pause on mouse hover: ') . $autoplaypause;
- $summary[] = $this->t('Loop: ') . $loop;
- $summary[] = $this->t('Show dots: ') . $dots;
+ $summary[] = $this->t('OwlCarousel settings summary');
+ $summary[] = $this->t('Image style: @style', ['@style' => $this->getSetting('image_style')]);
+ $summary[] = $this->t('Link image to: @link', ['@link' => $this->getSetting('image_link') ?? $this->t('Nothing')]);
+ $summary[] = $this->t('Amount of items displayed: @itemsdisplay', ['@itemsdisplay' => $itemsdisplay]);
+ $summary[] = $this->t('Margin from items: @margin px', ['@margin' => $this->getSetting('margin')]);
+ $summary[] = $this->t('Display next and prev buttons: @nav', ['@nav' => $nav]);
+ $summary[] = $this->t('Autoplay: @autoplay', ['@autoplay' => $autoplay]);
+ $summary[] = $this->t('Autoplay pause on mouse hover: @autoplaypause', ['@autoplaypause' => $autoplaypause]);
+ $summary[] = $this->t('Loop: @loop', ['@loop' => $loop]);
+ $summary[] = $this->t('Show dots: @dots', ['@dots' => $dots]);
if ($this->getSetting('dimensionMobile')) {
- $summary[] = $this->t('Mobile dimensions: ') . $this->getSetting('dimensionMobile') . 'px';
+ $summary[] = $this->t('Mobile dimensions: @dimensionMobile px', ['@dimensionMobile' => $this->getSetting('dimensionMobile')]);
}
if ($this->getSetting('itemsMobile')) {
- $summary[] = $this->t('Mobile items to show: ') . $this->getSetting('itemsMobile');
+ $summary[] = $this->t('Mobile items to show: @itemsMobile', ['@itemsMobile' => $this->getSetting('itemsMobile')]);
}
if ($this->getSetting('dimensionDesktop')) {
- $summary[] = $this->t('Desktop dimensions: ') . $this->getSetting('dimensionDesktop') . 'px';
+ $summary[] = $this->t('Desktop dimensions: @dimensionDesktop px', ['@dimensionDesktop' => $this->getSetting('dimensionDesktop')]);
}
if ($this->getSetting('itemsDesktop')) {
- $summary[] = $this->t('Desktop items to show: ') . $this->getSetting('itemsDesktop');
+ $summary[] = $this->t('Desktop items to show: @itemsDesktop', ['@itemsDesktop' => $this->getSetting('itemsDesktop')]);
}
return $summary;
@@ -306,7 +306,7 @@ class OwlCarouselFieldFormatter extends EntityReferenceFormatterBase implements
$settings = $owlcarousel_default_settings;
foreach ($settings as $k => $v) {
$s = $this->getSetting($k);
- $settings[$k] = isset($s) ? $s : $settings[$k];
+ $settings[$k] = $s ?? $settings[$k];
}
return [
'#theme' => 'owlcarousel',
@@ -314,7 +314,6 @@ class OwlCarouselFieldFormatter extends EntityReferenceFormatterBase implements
'#settings' => $settings,
'#attached' => ['library' => ['owlcarousel/owlcarousel']],
];
-
}
/**
--
GitLab
From 90d3fc64fb66aea29c6054fccc304c89eb9857ae Mon Sep 17 00:00:00 2001
From: icurk <igor.curk@gmail.com>
Date: Thu, 13 Mar 2025 11:52:54 +0100
Subject: [PATCH 2/3] Fix deprecated use of libraryDiscovery class.
---
src/Commands/OwlCarouselCommands.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/Commands/OwlCarouselCommands.php b/src/Commands/OwlCarouselCommands.php
index 25013e6..3f42f8c 100644
--- a/src/Commands/OwlCarouselCommands.php
+++ b/src/Commands/OwlCarouselCommands.php
@@ -2,7 +2,7 @@
namespace Drupal\owlcarousel\Commands;
-use Drupal\Core\Asset\libraryDiscovery;
+use Drupal\Core\Asset\LibraryDiscoveryCollector;
use Drush\Commands\DrushCommands;
use GuzzleHttp\Client;
use GuzzleHttp\Exception\RequestException;
@@ -24,14 +24,14 @@ class OwlCarouselCommands extends DrushCommands {
/**
* Library discovery service.
*
- * @var Drupal\Core\Asset\libraryDiscovery
+ * @var Drupal\Core\Asset\LibraryDiscoveryCollector
*/
protected $libraryDiscovery;
/**
* {@inheritdoc}
*/
- public function __construct(libraryDiscovery $library_discovery) {
+ public function __construct(LibraryDiscoveryCollector $library_discovery) {
$this->libraryDiscovery = $library_discovery;
}
--
GitLab
From 50a5242e517efc55c67e4e72aa02bc63835e7141 Mon Sep 17 00:00:00 2001
From: icurk <igor.curk@gmail.com>
Date: Thu, 13 Mar 2025 11:59:10 +0100
Subject: [PATCH 3/3] Adding drupal core version to info file.
---
owlcarousel.info.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/owlcarousel.info.yml b/owlcarousel.info.yml
index c349fda..7e6eca2 100755
--- a/owlcarousel.info.yml
+++ b/owlcarousel.info.yml
@@ -2,7 +2,7 @@ name: Owl Carousel
type: module
description: Owl Carousel jQuery plugin integration module.
core: 8.x
-core_version_requirement: ^8 || ^9 || ^10
+core_version_requirement: ^8 || ^9 || ^10 || ^11
package: Owl Carousel
dependencies:
- drupal:field
--
GitLab