Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff -ruN md_slider_old/md_slider.info.yml md_slider/md_slider.info.yml
- --- md_slider_old/md_slider.info.yml 2018-10-18 20:22:01.000000000 -0700
- +++ md_slider/md_slider.info.yml 2021-02-19 10:38:34.250860369 -0800
- @@ -6,7 +6,8 @@
- - imce
- version: '8.x-1.4'
- -core: 8.x
- +#core: 8.x
- +core_version_requirement: ^8 || ^9
- project: 'md_slider'
- project status url: 'http://megadrupal.com/fserver'
- -datestamp: 1539919269
- \ No newline at end of file
- +datestamp: 1539919269
- diff -ruN md_slider_old/md_slider.install md_slider/md_slider.install
- --- md_slider_old/md_slider.install 2018-10-18 20:22:01.000000000 -0700
- +++ md_slider/md_slider.install 2021-02-16 12:52:47.815292606 -0800
- @@ -95,7 +95,7 @@
- function md_slider_uninstall() {
- // Remove the css directory
- - file_unmanaged_delete_recursive(file_default_scheme() . '://md-slider-css');
- + file_unmanaged_delete_recursive(\Drupal::config('system.file')->get('default_scheme') . '://md-slider-css');
- // Remove image style md_slider_thumb
- ImageStyle::load('md_slider_thumb')->delete();
- }
- \ No newline at end of file
- diff -ruN md_slider_old/md_slider.libraries.yml md_slider/md_slider.libraries.yml
- --- md_slider_old/md_slider.libraries.yml 2018-10-18 20:22:01.000000000 -0700
- +++ md_slider/md_slider.libraries.yml 2021-02-16 17:27:48.873456782 -0800
- @@ -42,8 +42,8 @@
- - core/drupal.ajax
- - core/jquery.once
- - core/drupal.dialog
- - - core/jquery.ui.tabs
- - - core/jquery.ui.sortable
- + - jquery_ui_tabs/tabs
- + - jquery_ui_sortable/sortable
- - core/jquery.ui.draggable
- - core/jquery.ui.droppable
- @@ -56,4 +56,4 @@
- dependencies:
- - core/jquery
- - core/drupal
- - - core/drupalSettings
- \ No newline at end of file
- + - core/drupalSettings
- diff -ruN md_slider_old/md_slider.module md_slider/md_slider.module
- --- md_slider_old/md_slider.module 2018-10-18 20:22:01.000000000 -0700
- +++ md_slider/md_slider.module 2021-02-16 12:52:47.844293461 -0800
- @@ -157,7 +157,7 @@
- foreach ($slides as $index => $slide) {
- $slide->slideSettings = unserialize($slide->settings);
- $slide->slideSettings += array('slide_id' => $slide->sid);
- - $slide->jsonSlideSettings = JSON::encode($slide->slideSettings);
- + $slide->jsonSlideSettings = Json::encode($slide->slideSettings);
- $slide->contentLayer = array(
- '#theme' => 'admin_layers_render',
- '#layers' => unserialize($slide->layers)
- @@ -436,7 +436,7 @@
- function template_preprocess_front_layers_render(&$vars) {
- $layer = $vars['layer'];
- - if (!isset($layer{"title"})) {
- + if (!isset($layer["title"])) {
- $layer["title"] = "";
- }
- @@ -549,4 +549,4 @@
- $libraries['md_slider.slider.' . $slider->machine_name]['css']['component'][$file_url] = array();
- }
- }
- -}
- \ No newline at end of file
- +}
- diff -ruN md_slider_old/src/Controller/MDSliderController.php md_slider/src/Controller/MDSliderController.php
- --- md_slider_old/src/Controller/MDSliderController.php 2018-10-18 20:22:01.000000000 -0700
- +++ md_slider/src/Controller/MDSliderController.php 2021-02-16 12:52:47.877294433 -0800
- @@ -20,9 +20,6 @@
- class MDSliderController extends ControllerBase {
- - /**
- - *
- - */
- public function listMDSlider() {
- $all_slider = MDSliderDataBase::loadAll('md_sliders');
- $header = array(
- @@ -61,7 +58,7 @@
- '#theme' => 'table',
- '#header' => $header,
- '#rows' => $rows,
- - '#empty' => t('No MegaSlider available. <a href="@link">Add MegaSlider</a>.', array('@link' => \Drupal::url('md_slider.admin.add'))),
- + '#empty' => t('No MegaSlider available. <a href="@link">Add MegaSlider</a>.', array('@link' => Url::fromRoute('md_slider.admin.add')->toString())),
- '#attributes' => array('id' => 'md-slider'),
- );
- }
- @@ -90,9 +87,9 @@
- $build['slide_settings'] = array(
- '#theme' => 'slide_settings',
- );
- - $json_url = \Drupal::url('md_slider.admin.json_response', array(), array('absolute' => TRUE));
- - $html_url = \Drupal::url('md_slider.admin.html_response', array(), array('absolute' => TRUE));
- - $image_url = \Drupal::url('md_slider.admin.image', array(), array('absolute' => TRUE));
- + $json_url = Url::fromRoute('md_slider.admin.json_response', array(), array('absolute' => TRUE))->toString();
- + $html_url = Url::fromRoute('md_slider.admin.html_response', array(), array('absolute' => TRUE))->toString();
- + $image_url = Url::fromRoute('md_slider.admin.image', array(), array('absolute' => TRUE))->toString();
- $build['#attached']['drupalSettings']['MDSlider']['jsonConfigURL'] = $json_url;
- $build['#attached']['drupalSettings']['MDSlider']['htmlConfigURL'] = $html_url;
- $build['#attached']['drupalSettings']['MDSlider']['imageConfigURL'] = $image_url;
- diff -ruN md_slider_old/src/Form/MDSliderCloneForm.php md_slider/src/Form/MDSliderCloneForm.php
- --- md_slider_old/src/Form/MDSliderCloneForm.php 2018-10-18 20:22:01.000000000 -0700
- +++ md_slider/src/Form/MDSliderCloneForm.php 2021-02-16 12:52:47.889294787 -0800
- @@ -136,11 +136,11 @@
- }
- }
- MDSliderRenderCss::saveFileCss($machine_name, $style);
- - drupal_set_message($this->t('Clone successfully Slider %title', array('%title' => $title)));
- + $this->messenger()->addStatus($this->t('Clone successfully Slider %title', array('%title' => $title)));
- $form_state->setRedirect('md_slider.admin.edit', array('slider' => $machine_name));
- }
- else {
- - drupal_set_message($this->t('Clone Failed Slider %title', array('%title' => $title)));
- + $this->messenger()->addStatus($this->t('Clone Failed Slider %title', array('%title' => $title)));
- }
- }
- }
- diff -ruN md_slider_old/src/Form/MDSliderConfigForm.php md_slider/src/Form/MDSliderConfigForm.php
- --- md_slider_old/src/Form/MDSliderConfigForm.php 2018-10-18 20:22:01.000000000 -0700
- +++ md_slider/src/Form/MDSliderConfigForm.php 2021-02-16 12:52:47.902295170 -0800
- @@ -7,6 +7,7 @@
- namespace Drupal\md_slider\Form;
- +use Drupal\Core\File\FileSystemInterface;
- use Drupal\Core\Form\FormBase;
- use Drupal\md_slider\MDSlider;
- use Drupal\Core\Form\FormStateInterface;
- @@ -361,9 +362,9 @@
- if ($response) {
- $css_content = '';
- $destination_dir = 'public://md-slider-css';
- - file_prepare_directory($destination_dir, FILE_CREATE_DIRECTORY);
- - file_unmanaged_save_data($css_content, $destination_dir . "/md-slider-{$slider->machine_name}-layers.css", FILE_EXISTS_REPLACE);
- - drupal_set_message($this->t('Slider %slider has been created.', array('%slider' => $slider->title)));
- + \Drupal::service('file_system')->prepareDirectory($destination_dir, FileSystemInterface::CREATE_DIRECTORY);
- + \Drupal::service('file_system')->saveData($css_content, $destination_dir . "/md-slider-{$slider->machine_name}-layers.css", FileSystemInterface::EXISTS_REPLACE);
- + $this->messenger()->addStatus($this->t('Slider %slider has been created.', array('%slider' => $slider->title)));
- \Drupal::service('library.discovery')->clearCachedDefinitions();
- $cache = \Drupal::cache('discovery');
- $cache->delete('block_plugins');
- @@ -379,7 +380,7 @@
- if ($response) {
- //fix error cache
- \Drupal::service('router.builder')->rebuild();
- - drupal_set_message($this->t('Slider %slider has been updated.', array('%slider' => $slider->title)));
- + $this->messenger()->addStatus($this->t('Slider %slider has been updated.', array('%slider' => $slider->title)));
- }
- }
- }
- diff -ruN md_slider_old/src/Form/MDSliderDeleteForm.php md_slider/src/Form/MDSliderDeleteForm.php
- --- md_slider_old/src/Form/MDSliderDeleteForm.php 2018-10-18 20:22:01.000000000 -0700
- +++ md_slider/src/Form/MDSliderDeleteForm.php 2021-02-16 12:52:47.960296880 -0800
- @@ -97,7 +97,7 @@
- $this->md_slider->getDataSlider($this->md_slider->machine_name);
- $response = $this->md_slider->deleteDataSlider($this->md_slider->slid);
- if ($response)
- - drupal_set_message($this->t('Slider %slider has been deleted.', array('%slider' => $this->md_slider->title)));
- + $this->messenger()->addStatus($this->t('Slider %slider has been deleted.', array('%slider' => $this->md_slider->title)));
- $form_state->setRedirect('md_slider.admin');
- }
- }
- diff -ruN md_slider_old/src/Form/MDSliderEditForm.php md_slider/src/Form/MDSliderEditForm.php
- --- md_slider_old/src/Form/MDSliderEditForm.php 2018-10-18 20:22:01.000000000 -0700
- +++ md_slider/src/Form/MDSliderEditForm.php 2021-02-16 12:52:47.965297028 -0800
- @@ -111,6 +111,6 @@
- $file = MDSliderRenderCss::saveFileCss($slider->machine_name, $style);
- //fix error cache
- \Drupal::service('router.builder')->rebuild();
- - drupal_set_message($this->t('Slider %slider has been updated.', array('%slider' => $slider->title)));
- + $this->messenger()->addStatus($this->t('Slider %slider has been updated.', array('%slider' => $slider->title)));
- }
- }
- \ No newline at end of file
- diff -ruN md_slider_old/src/Form/MDSliderImageForm.php md_slider/src/Form/MDSliderImageForm.php
- --- md_slider_old/src/Form/MDSliderImageForm.php 2018-10-18 20:22:01.000000000 -0700
- +++ md_slider/src/Form/MDSliderImageForm.php 2021-02-19 11:16:38.614901962 -0800
- @@ -43,7 +43,7 @@
- */
- public static function create(ContainerInterface $container) {
- return new static(
- - $container->get('entity.manager')->getStorage('file')
- + $container->get('entity_type.manager')->getStorage('file')
- );
- }
- diff -ruN md_slider_old/src/Form/MDSliderImportForm.php md_slider/src/Form/MDSliderImportForm.php
- --- md_slider_old/src/Form/MDSliderImportForm.php 2018-10-18 20:22:01.000000000 -0700
- +++ md_slider/src/Form/MDSliderImportForm.php 2021-02-19 11:16:49.098159160 -0800
- @@ -7,6 +7,7 @@
- namespace Drupal\md_slider\Form;
- +use Drupal\Core\File\FileSystemInterface;
- use Drupal\Core\Entity\EntityStorageInterface;
- use Drupal\Core\Form\FormBase;
- use Drupal\Core\Form\FormStateInterface;
- @@ -40,7 +41,7 @@
- */
- public static function create(ContainerInterface $container) {
- return new static(
- - $container->get('entity.manager')->getStorage('file')
- + $container->get('entity_type.manager')->getStorage('file')
- );
- }
- @@ -80,9 +81,9 @@
- */
- public function validateForm(array &$form, FormStateInterface $form_state) {
- $destination_dir = 'public://md-slider-image';
- - $writable = file_prepare_directory($destination_dir, FILE_CREATE_DIRECTORY);
- + $writable = \Drupal::service('file_system')->prepareDirectory($destination_dir, FileSystemInterface::CREATE_DIRECTORY);
- if (!$writable) {
- - drupal_set_message($this->t());
- + $this->messenger()->addStatus($this->t());
- $form_state->setError($form, t('The directory %dir does not exist and could not be created.', array('%dir' => $destination_dir)));
- }
- }
- @@ -94,11 +95,11 @@
- $fid = $form_state->getValue('file');
- $file = File::load($fid[0]);
- - $file_path = drupal_realpath($file->getFileUri());
- + $file_path = \Drupal::service('file_system')->realpath($file->getFileUri());
- $destination_dir = 'public://md-slider-image';
- $import = new MDSliderImport();
- $import->getDataImport($file_path, $destination_dir);
- $import->importDataSlider();
- - drupal_set_message($this->t("MD Slider: Import successful!"));
- + $this->messenger()->addStatus($this->t("MD Slider: Import successful!"));
- }
- -}
- \ No newline at end of file
- +}
- diff -ruN md_slider_old/src/MDSliderDataBase.php md_slider/src/MDSliderDataBase.php
- --- md_slider_old/src/MDSliderDataBase.php 2018-10-18 20:22:01.000000000 -0700
- +++ md_slider/src/MDSliderDataBase.php 2021-02-16 12:52:48.015298502 -0800
- @@ -17,22 +17,26 @@
- public static function insert($table, $field) {
- $return_value = NULL;
- try {
- - $return_value = db_insert($table)
- + // TODO: Drupal Rector Notice: Please delete the following comment after you've made any necessary changes.
- + // You will need to use `\Drupal\core\Database\Database::getConnection()` if you do not yet have access to the container here.
- + $return_value = \Drupal::database()->insert($table)
- ->fields($field)
- ->execute();
- }
- catch (\Exception $e) {
- - drupal_set_message(t('db_insert failed. Message = %message, query= %query', array(
- + \Drupal::messenger()->addError(t('db_insert failed. Message = %message, query= %query', array(
- '%message' => $e->getMessage(),
- '%query' => $e->query_string,
- - )), 'error');
- + )));
- }
- return $return_value;
- }
- public static function update($table, $fields, $conditions) {
- try {
- - $count = db_update($table)
- + // TODO: Drupal Rector Notice: Please delete the following comment after you've made any necessary changes.
- + // You will need to use `\Drupal\core\Database\Database::getConnection()` if you do not yet have access to the container here.
- + $count = \Drupal::database()->update($table)
- ->fields($fields);
- foreach ($conditions as $field => $value) {
- $count->condition($field, $value);
- @@ -40,10 +44,10 @@
- $count->execute();
- }
- catch (\Exception $e) {
- - drupal_set_message(t('db_update failed. Message = %message, query= %query', array(
- + \Drupal::messenger()->addError(t('db_update failed. Message = %message, query= %query', array(
- '%message' => $e->getMessage(),
- '%query' => $e->query_string,
- - )), 'error');
- + )));
- }
- return $count;
- }
- @@ -52,7 +56,9 @@
- * @param array $entry
- */
- public static function load($table, $entry = array()) {
- - $select = db_select($table, 'table_alias');
- + // TODO: Drupal Rector Notice: Please delete the following comment after you've made any necessary changes.
- + // You will need to use `\Drupal\core\Database\Database::getConnection()` if you do not yet have access to the container here.
- + $select = \Drupal::database()->select($table, 'table_alias');
- $select->fields('table_alias');
- foreach ($entry as $field => $value) {
- $select->condition($field, $value);
- @@ -67,7 +73,9 @@
- * @return
- */
- public static function loadAll($table, $entry = array(), $sort = array()) {
- - $select = db_select($table, 'table_alias');
- + // TODO: Drupal Rector Notice: Please delete the following comment after you've made any necessary changes.
- + // You will need to use `\Drupal\core\Database\Database::getConnection()` if you do not yet have access to the container here.
- + $select = \Drupal::database()->select($table, 'table_alias');
- $select->fields('table_alias');
- if (count($entry) > 0) {
- foreach ($entry as $field => $value) {
- @@ -84,7 +92,9 @@
- }
- public static function delete($table, $entry = array()) {
- - $delete = db_delete($table);
- + // TODO: Drupal Rector Notice: Please delete the following comment after you've made any necessary changes.
- + // You will need to use `\Drupal\core\Database\Database::getConnection()` if you do not yet have access to the container here.
- + $delete = \Drupal::database()->delete($table);
- if (count($entry) > 0) {
- foreach ($entry as $field => $value) {
- $delete->condition($field, $value);
- diff -ruN md_slider_old/src/Plugin/Field/FieldWidget/MDSliderWidget.php md_slider/src/Plugin/Field/FieldWidget/MDSliderWidget.php
- --- md_slider_old/src/Plugin/Field/FieldWidget/MDSliderWidget.php 2018-10-18 20:22:01.000000000 -0700
- +++ md_slider/src/Plugin/Field/FieldWidget/MDSliderWidget.php 2021-02-16 12:52:48.037299150 -0800
- @@ -7,6 +7,7 @@
- namespace Drupal\md_slider\Plugin\Field\FieldWidget;
- +use Drupal\Core\Url;
- use Drupal\Core\Field\FieldItemListInterface;
- use Drupal\Core\Field\WidgetBase;
- use Drupal\Core\Form\FormStateInterface;
- @@ -35,7 +36,7 @@
- if (count($all_slider) == 0) {
- $element += [
- '#type' => 'markup',
- - '#markup' => '<h5>'. t('No MegaSlider available. <a href="@link">Add MegaSlider</a>.', array('@link' => \Drupal::url('md_slider.admin.add'))) . '</h5>'
- + '#markup' => '<h5>'. t('No MegaSlider available. <a href="@link">Add MegaSlider</a>.', array('@link' => Url::fromRoute('md_slider.admin.add')->toString())) . '</h5>'
- ];
- }
- else {
- diff -ruN md_slider_old/src/Slider/MDSliderImport.php md_slider/src/Slider/MDSliderImport.php
- --- md_slider_old/src/Slider/MDSliderImport.php 2018-10-18 20:22:01.000000000 -0700
- +++ md_slider/src/Slider/MDSliderImport.php 2021-02-16 12:52:48.047299445 -0800
- @@ -7,6 +7,7 @@
- namespace Drupal\md_slider\Slider;
- +use Drupal\Core\File\FileSystemInterface;
- use Drupal\md_slider\MDSlide;
- use Drupal\md_slider\MDSlider;
- @@ -44,7 +45,7 @@
- // Get image content
- zip_entry_open($zip, $entry);
- $entry_content = zip_entry_read($entry, zip_entry_filesize($entry));
- - $image = file_save_data($entry_content, "{$destination_dir}/{$image_name}", FILE_EXISTS_RENAME);
- + $image = file_save_data($entry_content, "{$destination_dir}/{$image_name}", FileSystemInterface::EXISTS_RENAME);
- if ($image !== FALSE)
- $images[$image_name] = $image;
- zip_entry_close($entry);
- @@ -91,7 +92,7 @@
- $slid = $md_slider->saveDataSlider();
- $style = array();
- if (!$slid) {
- - drupal_set_message(t("MD Slider: Import unsuccessful!"), "error");
- + \Drupal::messenger()->addError(t("MD Slider: Import unsuccessful!"));
- return;
- }
- diff -ruN md_slider_old/src/Slider/MDSliderRenderCss.php md_slider/src/Slider/MDSliderRenderCss.php
- --- md_slider_old/src/Slider/MDSliderRenderCss.php 2018-10-18 20:22:01.000000000 -0700
- +++ md_slider/src/Slider/MDSliderRenderCss.php 2021-02-16 12:52:48.059299799 -0800
- @@ -6,6 +6,7 @@
- namespace Drupal\md_slider\Slider;
- +use Drupal\Core\File\FileSystemInterface;
- class MDSliderRenderCss{
- /**
- @@ -262,8 +263,8 @@
- public static function saveFileCss($slider_name, $style) {
- $css = implode("\r\n", $style);
- $destination_dir = 'public://md-slider-css';
- - file_prepare_directory($destination_dir, FILE_CREATE_DIRECTORY);
- - file_unmanaged_save_data($css, $destination_dir . "/md-slider-{$slider_name}-layers.css", FILE_EXISTS_REPLACE);
- + \Drupal::service('file_system')->prepareDirectory($destination_dir, FileSystemInterface::CREATE_DIRECTORY);
- + \Drupal::service('file_system')->saveData($css, $destination_dir . "/md-slider-{$slider_name}-layers.css", FileSystemInterface::EXISTS_REPLACE);
- }
- }
Advertisement
Add Comment
Please, Sign In to add comment