Issue #3293210 by slucero: Fix PHPCS, deprecations, and test failures to enable DrupalCI testing (50c7f8af) · Commits · project / patternkit

composer.json

+4 −7

Original line number	Diff line number	Diff line
		@@ -14,18 +14,15 @@
		],
		"license": "MIT",
		"require": {
		"php": ">=7.1.3",
		"php": ">=7.4.0",
		"ext-json": "*",
		"swaggest/json-schema": "^0.12",
		"symfony/finder": "^3.4 \|\| ^4.0",
		"symfony/yaml": "^3.4 \|\| ^4.0"
		},
		"require-dev": {
		"drupal/core-recommended": "^8.8"
		},
		"config": {
		"platform": {
		"php": "7.1.3"
		}
		"drupal/core-recommended": "^9",
		"drupal/core-dev": "^9"
		},
		"extra": {
		"drush": {

modules/patternkit_media_library/patternkit_media_library.install

+1 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ function patternkit_media_library_requirements($phase) {

		return $requirements;
		}

		/**
		* Sets default value for new config item 'patternkit_media_library.settings'.
		*/

modules/patternkit_media_library/patternkit_media_library.services.yml

+1 −1

Original line number	Diff line number	Diff line
		services:
		patternkit.opener.jsonlibrary:
		class: Drupal\patternkit_media_library\MediaLibraryJSONLibraryOpener
		arguments: ['@entity_type.manager']
		arguments: ['@entity_type.manager', '@file_url_generator']

modules/patternkit_media_library/src/Form/MediaLibrarySettingsForm.php

+6 −9

Original line number	Diff line number	Diff line
		@@ -2,11 +2,8 @@

		namespace Drupal\patternkit_media_library\Form;

		use Drupal\Core\Config\ConfigFactoryInterface;
		use Drupal\Core\Extension\ModuleHandlerInterface;
		use Drupal\Core\Form\ConfigFormBase;
		use Drupal\Core\Form\FormStateInterface;
		use Symfony\Component\DependencyInjection\ContainerInterface;

		/**
		* Settings form for configuring Patternkit's media library integration.
		@@ -23,12 +20,12 @@ class MediaLibrarySettingsForm extends ConfigFormBase {
		/**
		* Implements buildForm().
		*
		* {@inheritDoc}
		* {@inheritdoc}
		*/
		public function buildForm(array $form, FormStateInterface $form_state) :array {
		$config = $this->config(static::SETTINGS);

		$form['use_styles'] = array(
		$form['use_styles'] = [
		'#type' => 'checkbox',
		'#title' => t('Use bundled styles for the media library modal window'),
		'#description' => t('If checked, then Patternkit will load some styles for
		@@ -37,20 +34,20 @@ class MediaLibrarySettingsForm extends ConfigFormBase {
		Media Library Theme Reset</a>, so enable that module if you want to use
		these styles.'),
		'#default_value' => $config->get('use_styles') ?? FALSE,
		);
		];

		return parent::buildForm($form, $form_state);
		}

		/**
		* {@inheritDoc}
		* {@inheritdoc}
		*/
		protected function getEditableConfigNames() :array {
		return [static::SETTINGS];
		}

		/**
		* {@inheritDoc}
		* {@inheritdoc}
		*/
		public function getFormId() :string {
		return 'patternkit_media_library_settings_form';
		@@ -59,7 +56,7 @@ class MediaLibrarySettingsForm extends ConfigFormBase {
		/**
		* {@inheritdoc}
		*/
		public function submitForm(array &$form, FormStateInterface $form_state) {
		public function submitForm(array &$form, FormStateInterface $form_state): void {
		$form_values = $form_state->getValues();
		$config = $this->config(self::SETTINGS);

modules/patternkit_media_library/src/MediaLibraryJSONLibraryOpener.php

+13 −2

Original line number	Diff line number	Diff line
		@@ -5,6 +5,7 @@ namespace Drupal\patternkit_media_library;
		use Drupal\Core\Access\AccessResult;
		use Drupal\Core\Ajax\AjaxResponse;
		use Drupal\Core\Entity\EntityTypeManagerInterface;
		use Drupal\Core\File\FileUrlGeneratorInterface;
		use Drupal\Core\Session\AccountInterface;
		use Drupal\media_library\MediaLibraryOpenerInterface;
		use Drupal\media_library\MediaLibraryState;
		@@ -22,14 +23,24 @@ class MediaLibraryJSONLibraryOpener implements MediaLibraryOpenerInterface {
		*/
		protected $entityTypeManager;

		/**
		* The file url generator service.
		*
		* @var \Drupal\Core\File\FileUrlGeneratorInterface
		*/
		protected $fileUrlGenerator;

		/**
		* MediaLibraryFieldWidgetOpener constructor.
		*
		* @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
		* The entity type manager.
		* @param \Drupal\Core\File\FileUrlGeneratorInterface $file_url_generator
		* The file url generator service.
		*/
		public function __construct(EntityTypeManagerInterface $entity_type_manager) {
		public function __construct(EntityTypeManagerInterface $entity_type_manager, FileUrlGeneratorInterface $file_url_generator) {
		$this->entityTypeManager = $entity_type_manager;
		$this->fileUrlGenerator = $file_url_generator;
		}

		/**
		@@ -71,7 +82,7 @@ class MediaLibraryJSONLibraryOpener implements MediaLibraryOpenerInterface {
		$url = $file->toUrl()->setAbsolute(FALSE);
		}
		elseif ($file->access('download')) {
		$url = file_url_transform_relative(file_create_url($file->getFileUri()));
		$url = $this->fileUrlGenerator->generateString($file->getFileUri());
		}
		else {
		$url = $file->label();