From c9543a5f4073552a47eaf0a8526afae43c25e18f Mon Sep 17 00:00:00 2001 From: Andrii Podanenko Date: Wed, 3 May 2023 15:46:54 +0300 Subject: [PATCH 01/10] feat: codesniffer and rector fixes for Drupal 10 --- README.md | 1 - .../openy_block_branch_amenities.install | 5 +-- .../src/Plugin/Block/AmenitiesWithIcons.php | 18 ++++----- .../BranchAmenitiesFormatter.php | 6 +-- .../openy_block_branch_contacts_info.install | 1 + .../openy_block_branch_contacts_info.module | 1 + .../src/Plugin/Block/BranchContactsInfo.php | 10 ++--- .../openy_block_custom_simple.install | 2 +- .../openy_block_date/openy_block_date.module | 4 ++ .../openy_block_date/src/EntityOperations.php | 3 +- .../openy_block_featured_highlights.install | 2 +- openy_editor/openy_editor.install | 1 - openy_egym_iwatch/openy_egym_iwatch.install | 31 +++++++++------ .../openy_egym_iwatch.libraries.yml | 1 - openy_egym_iwatch/openy_egym_iwatch.module | 12 ++++-- .../openy_loc_branch/openy_loc_branch.install | 38 +++++++++---------- .../openy_loc_branch/openy_loc_branch.module | 4 +- .../src/BranchAlertBuilder.php | 2 +- .../openy_loc_camp/openy_loc_camp.install | 24 ++++++------ .../openy_loc_camp/openy_loc_camp.module | 1 - .../openy_loc_camp/src/CampAlertBuilder.php | 2 +- .../openy_loc_camp/src/CampService.php | 5 ++- .../openy_loc_facility.install | 13 +++---- .../src/FacilityAlertBuilder.php | 2 +- .../openy_loc_filter/openy_loc_filter.module | 4 ++ .../src/Form/LocationFilterSettingsForm.php | 4 +- openy_location/openy_location.install | 6 ++- .../override/media_directories.settings.yml | 2 +- .../openy_media_document.install | 6 +-- .../FieldFormatter/FileIframeFormatter.php | 6 +-- .../FieldFormatter/FileLinkFormatter.php | 6 +-- .../openy_media_image.install | 24 ++++++------ .../openy_media_video.install | 3 +- openy_media/openy_media.install | 23 ++++++----- .../openy_menu_main/openy_menu_main.install | 14 +++---- openy_menu/openy_menu.install | 2 +- .../openy_node_activity.install | 7 ++-- .../openy_node_activity.module | 16 +++++--- .../openy_node_blog/openy_node_blog.install | 18 ++++----- .../openy_node_blog/openy_node_blog.module | 2 +- .../openy_node_blog/src/BlogAlertBuilder.php | 2 +- .../src/BlogSimplePaginator.php | 23 ++++++----- .../openy_node_campaign.install | 1 + .../openy_node_category.install | 6 +-- .../openy_node_category.module | 16 +++++--- .../openy_node_class/openy_node_class.module | 16 +++++--- .../openy_node_event/openy_node_event.install | 2 +- .../openy_node_event/openy_node_event.module | 4 +- .../openy_node_landing.install | 6 +-- .../src/LandingPageAlertBuilder.php | 2 +- .../openy_node_mbrshp.install | 2 +- .../openy_node_news/openy_node_news.install | 2 +- .../openy_node_news/src/NewsAlertBuilder.php | 2 +- .../openy_node_program.install | 18 ++++----- .../openy_node_social_post.install | 7 +++- openy_node/openy_node.install | 28 +++++++------- openy_node/openy_node.module | 7 +++- openy_node/src/BatchNodeUpdate.php | 18 +++++---- .../openy_prgf_1c/openy_prgf_1c.install | 1 + .../openy_prgf_2c/openy_prgf_2c.install | 1 + .../openy_prgf_4c/openy_prgf_4c.install | 3 +- .../openy_prgf_banner.install | 13 ++++--- .../openy_prgf_blog_branch.install | 2 +- .../openy_prgf_blog_camp.install | 2 +- .../openy_prgf_blog_listing.install | 4 +- .../openy_prgf_blog_listing.module | 4 +- .../openy_prgf_camp_menu.install | 1 - .../src/Plugin/Block/CampMenu.php | 7 ++-- .../openy_prgf_categories_listing.install | 2 +- .../openy_prgf_class_location.install | 5 ++- .../openy_prgf_class_location.module | 3 +- .../src/ClassLocationServiceInterface.php | 2 +- .../src/Plugin/Block/ClassLocation.php | 7 ++-- .../openy_prgf_class_sessions.module | 3 +- .../src/ClassSessionsService.php | 9 ++--- .../src/ClassSessionsServiceInterface.php | 11 +++--- .../src/Plugin/Block/ClassSessions.php | 7 +++- .../openy_prgf_classes_listing.module | 12 ++++-- ..._prgf_embedded_groupexpro_schedule.install | 3 +- .../openy_prgf_event_latest.install | 4 +- .../openy_prgf_event_listing.install | 4 +- .../openy_prgf_event_listing.module | 16 ++++++-- .../openy_prgf_faq/openy_prgf_faq.install | 3 +- .../openy_prgf_featured_content.install | 4 +- .../openy_prgf_featured_highlights.info.yml | 1 - .../openy_prgf_featured_highlights.module | 3 ++ .../openy_prgf_gallery.install | 14 +++---- .../openy_prgf_grid_content.install | 2 +- .../openy_prgf_group_schedules.install | 3 +- .../openy_prgf_loc_finder.install | 2 +- .../openy_prgf_lto/openy_prgf_lto.install | 2 +- .../openy_prgf_mbrshp_calc.install | 2 +- .../openy_prgf_news_listing.module | 4 +- .../openy_prgf_pgm_reg.module | 4 ++ .../openy_prgf_promo_card.install | 2 +- .../openy_prgf_repeat_schedules.install | 4 +- .../openy_prgf_small_banner.install | 8 ++-- .../openy_prgf_story_card.install | 2 +- .../openy_prgf_teaser.install | 10 ++--- openy_prgf/openy_prgf.install | 2 +- openy_prgf/openy_prgf.module | 2 +- openy_taxonomy/openy_taxonomy.install | 8 ++-- .../views/filter/BetterTaxonomyIndexTid.php | 2 +- .../src/Plugin/ConfigEventIgnore/Role.php | 2 +- 104 files changed, 389 insertions(+), 317 deletions(-) diff --git a/README.md b/README.md index 28ec87f8..2c5a975e 100644 --- a/README.md +++ b/README.md @@ -3,4 +3,3 @@ Features from Open Y Distrubution ![image](https://user-images.githubusercontent.com/563412/123828698-70c82f80-d90a-11eb-943e-fd8f2aa78eeb.png) - diff --git a/openy_block/modules/openy_block_branch_amenities/openy_block_branch_amenities.install b/openy_block/modules/openy_block_branch_amenities/openy_block_branch_amenities.install index cbbaecc7..5b871301 100644 --- a/openy_block/modules/openy_block_branch_amenities/openy_block_branch_amenities.install +++ b/openy_block/modules/openy_block_branch_amenities/openy_block_branch_amenities.install @@ -30,8 +30,7 @@ function openy_block_branch_amenities_update_8001() { /** * New paragraph with branch amenities. */ -function openy_block_branch_amenities_update_8002() -{ +function openy_block_branch_amenities_update_8002() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_block_branch_amenities') . '/config/install/'; $config_importer = \Drupal::service('openy_upgrade_tool.importer'); $config_importer->setDirectory($config_dir); @@ -51,7 +50,7 @@ function openy_block_branch_amenities_update_8003() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_block_branch_amenities') . '/config/install/'; // Update multiple configurations. $configs = [ - 'core.entity_form_display.block_content.branch_amenities.default' =>[ + 'core.entity_form_display.block_content.branch_amenities.default' => [ 'content.field_sb_link.settings.enabled_attributes', 'content.field_sb_link.type', ], diff --git a/openy_block/modules/openy_block_branch_amenities/src/Plugin/Block/AmenitiesWithIcons.php b/openy_block/modules/openy_block_branch_amenities/src/Plugin/Block/AmenitiesWithIcons.php index f6a883b6..64fc09d8 100644 --- a/openy_block/modules/openy_block_branch_amenities/src/Plugin/Block/AmenitiesWithIcons.php +++ b/openy_block/modules/openy_block_branch_amenities/src/Plugin/Block/AmenitiesWithIcons.php @@ -20,17 +20,17 @@ class AmenitiesWithIcons extends BlockBase implements ContainerFactoryPluginInterface { /** - * RouteMatch service instance + * RouteMatch service instance. */ protected $routeMatch; /** * @param array $configuration - * Plugin config + * Plugin config. * @param string $plugin_id - * Plugin id + * Plugin id. * @param mixed $plugin_definition - * Plugin definition + * Plugin definition. * @param $routeMatch * RouteMatch service instance */ @@ -67,8 +67,8 @@ public function build() { return $node->get('field_location_amenities')->view([ 'type' => 'entity_reference_entity_view', 'settings' => [ - 'view_mode' => 'icon' - ] + 'view_mode' => 'icon', + ], ]); } @@ -80,11 +80,11 @@ public function build() { */ public function getCacheTags() { if ($node = $this->routeMatch->getParameter('node')) { - //if there is node add its cachetag + // If there is node add its cachetag. return Cache::mergeTags(parent::getCacheTags(), ['node:' . $node->id()]); } else { - //Return default tags instead. + // Return default tags instead. return parent::getCacheTags(); } } @@ -93,7 +93,7 @@ public function getCacheTags() { * {@inheritdoc} */ public function getCacheContexts() { - return Cache::mergeContexts(parent::getCacheContexts(), array('route')); + return Cache::mergeContexts(parent::getCacheContexts(), ['route']); } } diff --git a/openy_block/modules/openy_block_branch_amenities/src/Plugin/Field/FieldFormatter/BranchAmenitiesFormatter.php b/openy_block/modules/openy_block_branch_amenities/src/Plugin/Field/FieldFormatter/BranchAmenitiesFormatter.php index 99191946..24a4125c 100644 --- a/openy_block/modules/openy_block_branch_amenities/src/Plugin/Field/FieldFormatter/BranchAmenitiesFormatter.php +++ b/openy_block/modules/openy_block_branch_amenities/src/Plugin/Field/FieldFormatter/BranchAmenitiesFormatter.php @@ -33,9 +33,9 @@ public function settingsSummary() { public function viewElements(FieldItemListInterface $items, $langcode) { $elements = [[ - '#type' => 'markup', - '#markup' => check_markup('[openy:list-branch-amenities]', 'full_html'), - ], + '#type' => 'markup', + '#markup' => check_markup('[openy:list-branch-amenities]', 'full_html'), + ], ]; return $elements; diff --git a/openy_block/modules/openy_block_branch_contacts_info/openy_block_branch_contacts_info.install b/openy_block/modules/openy_block_branch_contacts_info/openy_block_branch_contacts_info.install index 4a9df618..5b5a6ecd 100644 --- a/openy_block/modules/openy_block_branch_contacts_info/openy_block_branch_contacts_info.install +++ b/openy_block/modules/openy_block_branch_contacts_info/openy_block_branch_contacts_info.install @@ -1,4 +1,5 @@ getPath('openy_block_custom_simple') . '/config/install/'; // Update multiple configurations. $configs = [ - 'core.entity_form_display.block_content.simple_block.default' =>[ + 'core.entity_form_display.block_content.simple_block.default' => [ 'content.field_sb_link.settings.enabled_attributes', 'content.field_sb_link.type', ], diff --git a/openy_block/modules/openy_block_date/openy_block_date.module b/openy_block/modules/openy_block_date/openy_block_date.module index 748b24b5..41b69d8a 100644 --- a/openy_block/modules/openy_block_date/openy_block_date.module +++ b/openy_block/modules/openy_block_date/openy_block_date.module @@ -1,5 +1,9 @@ $field->value, 'UTC'); + $dateTime = DrupalDateTime::createFromFormat(DateTimeItemInterface::DATETIME_STORAGE_FORMAT, $entity->$field->value, 'UTC'); $timestamp = $dateTime->getTimestamp(); if ($timestamp > $requestTime) { $build['#cache']['tags'][] = self::TAG . ":$timestamp"; diff --git a/openy_block/modules/openy_block_featured_highlights/openy_block_featured_highlights.install b/openy_block/modules/openy_block_featured_highlights/openy_block_featured_highlights.install index bfd4633f..ca4da8a6 100644 --- a/openy_block/modules/openy_block_featured_highlights/openy_block_featured_highlights.install +++ b/openy_block/modules/openy_block_featured_highlights/openy_block_featured_highlights.install @@ -12,7 +12,7 @@ function openy_block_featured_highlights_update_8001() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_block_featured_highlights') . '/config/install/'; // Update multiple configurations. $configs = [ - 'core.entity_form_display.block_content.featured_highlights_block.default' =>[ + 'core.entity_form_display.block_content.featured_highlights_block.default' => [ 'content.field_featured_hl_block_link.settings.enabled_attributes', 'content.field_featured_hl_block_link.type', ], diff --git a/openy_editor/openy_editor.install b/openy_editor/openy_editor.install index 9b2d838c..bd3b300b 100644 --- a/openy_editor/openy_editor.install +++ b/openy_editor/openy_editor.install @@ -5,7 +5,6 @@ * Open Y Editor install file. */ - /** * Update Open Y editor feature configs. */ diff --git a/openy_egym_iwatch/openy_egym_iwatch.install b/openy_egym_iwatch/openy_egym_iwatch.install index c89ff05f..e05cc1a7 100644 --- a/openy_egym_iwatch/openy_egym_iwatch.install +++ b/openy_egym_iwatch/openy_egym_iwatch.install @@ -1,5 +1,9 @@ 'clock.png', - 'hero' => 'HERO.png', - '1' => '1.png', - '2' => '2.png', - '3' => '3.png', - '4' => '4.png', - '5' => '5.png', - '6' => '6.png', - ] as $key => $image_file_name) { + 'clock' => 'clock.png', + 'hero' => 'HERO.png', + '1' => '1.png', + '2' => '2.png', + '3' => '3.png', + '4' => '4.png', + '5' => '5.png', + '6' => '6.png', + ] as $key => $image_file_name) { $file_path = dirname(__FILE__) . '/demo_images/' . $image_file_name; if (file_exists($file_path)) { $file = file_get_contents($file_path); @@ -55,7 +62,7 @@ function openy_egym_iwatch_install() {

The YMCA app for Apple Watch

With the new YMCA app for Apple Watch, members can enjoy extra workout features with a tap on the wrist. The YMCA app for Apple Watch can help you amp up activity—and it’s free to download.

', - 'format' => 'full_html' + 'format' => 'full_html', ]); $prgf_sc->isNew(); $prgf_sc->save(); @@ -146,7 +153,7 @@ For any training plan created on iPhone, follow along on your Apple Watch. Infor ->setValue('DOWNLOAD THE APP'); $prgf_grid_column7->get('field_prgf_grid_clm_description')->setValue([ 'value' => '

Appstore

', - 'format' => 'full_html' + 'format' => 'full_html', ]); $prgf_grid_column7->isNew(); @@ -157,7 +164,7 @@ For any training plan created on iPhone, follow along on your Apple Watch. Infor ->setValue('No Apple Watch?'); $prgf_grid_column8->get('field_prgf_grid_clm_description')->setValue([ 'value' => '

Check your local YMCA for more info on buying an Apple Watch.

', - 'format' => 'full_html' + 'format' => 'full_html', ]); $prgf_grid_column8->isNew(); diff --git a/openy_egym_iwatch/openy_egym_iwatch.libraries.yml b/openy_egym_iwatch/openy_egym_iwatch.libraries.yml index 014c2007..56d38914 100644 --- a/openy_egym_iwatch/openy_egym_iwatch.libraries.yml +++ b/openy_egym_iwatch/openy_egym_iwatch.libraries.yml @@ -4,4 +4,3 @@ openy_egym_iwatch: css: theme: dist/css/openy_egym_iwatch.css: { minified: true} - diff --git a/openy_egym_iwatch/openy_egym_iwatch.module b/openy_egym_iwatch/openy_egym_iwatch.module index a72f6df5..5c963e88 100644 --- a/openy_egym_iwatch/openy_egym_iwatch.module +++ b/openy_egym_iwatch/openy_egym_iwatch.module @@ -1,5 +1,11 @@ getParameter('node')) { if (count(openy_egym_iwatch_search_node_paragraphs($node, ['banner_fixed']))) { - $new = new Drupal\Core\Breadcrumb\Breadcrumb(); + $new = new Breadcrumb(); $new->addCacheableDependency($breadcrumb); $breadcrumb = $new; } diff --git a/openy_location/modules/openy_loc_branch/openy_loc_branch.install b/openy_location/modules/openy_loc_branch/openy_loc_branch.install index ad6b3ef9..bbdc9e2b 100644 --- a/openy_location/modules/openy_loc_branch/openy_loc_branch.install +++ b/openy_location/modules/openy_loc_branch/openy_loc_branch.install @@ -65,7 +65,7 @@ function openy_loc_branch_update_8001() { */ function openy_loc_branch_update_8002() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_loc_branch') . '/config/install/'; - // Import new configuration + // Import new configuration. $config_importer = \Drupal::service('openy_upgrade_tool.importer'); $config_importer->setDirectory($config_dir); $config_importer->importConfigs([ @@ -74,7 +74,7 @@ function openy_loc_branch_update_8002() { // Update multiple configurations. $configs = [ - 'core.entity_form_display.node.branch.default' =>[ + 'core.entity_form_display.node.branch.default' => [ 'third_party_settings.field_group.group_header_area', 'third_party_settings.field_group.group_content_area', 'third_party_settings.field_group.group_bottom_area', @@ -96,7 +96,7 @@ function openy_loc_branch_update_8002() { function openy_loc_branch_update_8003() { $module = 'openy_loc_branch'; $bundle = 'branch'; - // Field definitions + // Field definitions. $config_dir = \Drupal::service('extension.list.module')->getPath($module) . '/config/install'; $config_importer = \Drupal::service('openy_upgrade_tool.importer'); $config_importer->setDirectory($config_dir); @@ -104,11 +104,11 @@ function openy_loc_branch_update_8003() { 'field.field.node.' . $bundle . '.field_meta_tags', 'simple_sitemap.bundle_settings.' . $bundle . '.landing_page', ]); - // Dependencies + // Dependencies. $config = \Drupal::service('extension.list.module')->getPath($module) . $module . '.info.yml'; $config_importer = \Drupal::service('openy_upgrade_tool.param_updater'); $config_importer->update($config, $module . '.info', 'dependencies'); - // Entity view display + // Entity view display. $config = \Drupal::service('extension.list.module')->getPath($module) . '/config/install/core.entity_view_display.node.' . $bundle . '.default.yml'; $config_importer = \Drupal::service('openy_upgrade_tool.param_updater'); $config_importer->update($config, 'core.entity_view_display.node.' . $bundle . '.default', 'dependencies.module'); @@ -119,7 +119,7 @@ function openy_loc_branch_update_8003() { */ function openy_loc_branch_update_8004() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_loc_branch') . '/config/install/'; - // Import new configuration + // Import new configuration. $config_importer = \Drupal::service('openy_upgrade_tool.importer'); $config_importer->setDirectory($config_dir); $config_importer->importConfigs([ @@ -151,7 +151,7 @@ function openy_loc_branch_update_8004() { */ function openy_loc_branch_update_8005() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_loc_branch') . '/config/install/'; - // Import new configuration + // Import new configuration. $config_importer = \Drupal::service('openy_upgrade_tool.importer'); $config_importer->setDirectory($config_dir); $config_importer->importConfigs([ @@ -164,7 +164,7 @@ function openy_loc_branch_update_8005() { */ function openy_loc_branch_update_8006() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_loc_branch') . '/config/install/'; - // Import new configuration + // Import new configuration. $config_importer = \Drupal::service('openy_upgrade_tool.importer'); $config_importer->setDirectory($config_dir); $config_importer->importConfigs([ @@ -238,7 +238,7 @@ function openy_loc_branch_update_8010() { */ function openy_loc_branch_update_8011() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_loc_branch') . '/config/install/'; - // Import new configuration + // Import new configuration. $config_importer = \Drupal::service('openy_upgrade_tool.importer'); $config_importer->setDirectory($config_dir); $config_importer->importConfigs([ @@ -259,7 +259,7 @@ function openy_loc_branch_update_8012() { */ function openy_loc_branch_update_8013() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_loc_branch') . '/config/install/'; - // Import new configuration + // Import new configuration. $config_importer = \Drupal::service('openy_upgrade_tool.importer'); $config_importer->setDirectory($config_dir); $config_importer->importConfigs([ @@ -307,7 +307,7 @@ function openy_loc_branch_update_8014() { 'hidden', ], 'field.storage.node.field_location_amenities' => [ - 'dependencies.module' + 'dependencies.module', ], ]; @@ -363,7 +363,7 @@ function openy_loc_branch_update_8017() { // Update multiple configurations. $configs = [ - 'core.entity_view_display.node.branch.full' =>[ + 'core.entity_view_display.node.branch.full' => [ 'content', 'hidden', ], @@ -424,7 +424,7 @@ function openy_loc_branch_update_8020() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_loc_branch') . '/config/install/'; // Update multiple configurations. $configs = [ - 'core.entity_form_display.node.branch.default' =>[ + 'core.entity_form_display.node.branch.default' => [ 'content.field_location_temp_url.settings.enabled_attributes', 'content.field_location_temp_url.type', 'content.field_location_directions.settings.enabled_attributes', @@ -460,7 +460,7 @@ function openy_loc_branch_update_8023() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_loc_branch') . '/config/install/'; // Update multiple configurations. $configs = [ - 'field.field.node.branch.field_location_coordinates' =>[ + 'field.field.node.branch.field_location_coordinates' => [ 'required', ], ]; @@ -511,8 +511,8 @@ function openy_loc_branch_update_8025() { 'content', ], 'core.entity_view_display.node.branch.default' => [ - 'content' - ] + 'content', + ], ]; $config_updater = \Drupal::service('openy_upgrade_tool.param_updater'); @@ -531,12 +531,12 @@ function openy_loc_branch_update_8026() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_loc_branch') . '/config/install/'; // Update multiple configurations. $configs = [ - 'core.entity_form_display.node.branch.default' =>[ + 'core.entity_form_display.node.branch.default' => [ 'content.field_location_directions.settings', ], - 'field.field.node.branch.field_location_directions' =>[ + 'field.field.node.branch.field_location_directions' => [ 'description', - 'default_value' + 'default_value', ], ]; diff --git a/openy_location/modules/openy_loc_branch/openy_loc_branch.module b/openy_location/modules/openy_loc_branch/openy_loc_branch.module index 79462a71..5c9aa121 100644 --- a/openy_location/modules/openy_loc_branch/openy_loc_branch.module +++ b/openy_location/modules/openy_loc_branch/openy_loc_branch.module @@ -1,6 +1,8 @@ nodeStorage = $entity_type_manager->getStorage('node'); diff --git a/openy_location/modules/openy_loc_camp/openy_loc_camp.install b/openy_location/modules/openy_loc_camp/openy_loc_camp.install index 735a2fbe..f9e48afb 100644 --- a/openy_location/modules/openy_loc_camp/openy_loc_camp.install +++ b/openy_location/modules/openy_loc_camp/openy_loc_camp.install @@ -53,7 +53,7 @@ function openy_loc_camp_update_8001() { */ function openy_loc_camp_update_8002() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_loc_camp') . '/config/install/'; - // Import new configuration + // Import new configuration. $config_importer = \Drupal::service('openy_upgrade_tool.importer'); $config_importer->setDirectory($config_dir); $config_importer->importConfigs([ @@ -61,7 +61,7 @@ function openy_loc_camp_update_8002() { ]); // Update multiple configurations. $configs = [ - 'core.entity_form_display.node.camp.default' =>[ + 'core.entity_form_display.node.camp.default' => [ 'dependencies.config', 'third_party_settings.field_group.group_bottom_area', ], @@ -84,7 +84,7 @@ function openy_loc_camp_update_8002() { function openy_loc_camp_update_8003() { $module = 'openy_loc_camp'; $bundle = 'camp'; - // Field definitions + // Field definitions. $config_dir = \Drupal::service('extension.list.module')->getPath($module) . '/config/install'; $config_importer = \Drupal::service('openy_upgrade_tool.importer'); $config_importer->setDirectory($config_dir); @@ -92,15 +92,15 @@ function openy_loc_camp_update_8003() { 'field.field.node.' . $bundle . '.field_meta_tags', 'simple_sitemap.bundle_settings.' . $bundle . '.landing_page', ]); - // Dependencies + // Dependencies. $config = \Drupal::service('extension.list.module')->getPath($module) . $module . '.info.yml'; $config_importer = \Drupal::service('openy_upgrade_tool.param_updater'); $config_importer->update($config, $module . '.info', 'dependencies'); - // Entity form + // Entity form. $config = \Drupal::service('extension.list.module')->getPath($module) . '/config/install/core.entity_form_display.node.' . $bundle . '.default.yml'; $config_importer = \Drupal::service('openy_upgrade_tool.param_updater'); $config_importer->update($config, 'core.entity_form_display.node.' . $bundle . '.default', 'dependencies.config'); - // Entity view display + // Entity view display. $config = \Drupal::service('extension.list.module')->getPath($module) . '/config/install/core.entity_view_display.node.' . $bundle . '.default.yml'; $config_importer = \Drupal::service('openy_upgrade_tool.param_updater'); $config_importer->update($config, 'core.entity_view_display.node.' . $bundle . '.default', 'dependencies.config'); @@ -112,7 +112,7 @@ function openy_loc_camp_update_8003() { */ function openy_loc_camp_update_8004() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_loc_camp') . '/config/install/'; - // Import new configuration + // Import new configuration. $config_importer = \Drupal::service('openy_upgrade_tool.importer'); $config_importer->setDirectory($config_dir); $config_importer->importConfigs([ @@ -281,7 +281,7 @@ function openy_loc_camp_update_8011() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_loc_camp') . '/config/install/'; // Update multiple configurations. $configs = [ - 'core.entity_form_display.node.camp.default' =>[ + 'core.entity_form_display.node.camp.default' => [ 'content.field_camp_menu_links.settings.enabled_attributes', 'content.field_camp_menu_links.type', 'content.field_location_directions.settings.enabled_attributes', @@ -317,7 +317,7 @@ function openy_loc_camp_update_8014() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_loc_camp') . '/config/install/'; // Update multiple configurations. $configs = [ - 'field.field.node.camp.field_location_coordinates' =>[ + 'field.field.node.camp.field_location_coordinates' => [ 'required', ], ]; @@ -338,12 +338,12 @@ function openy_loc_camp_update_8015() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_loc_camp') . '/config/install/'; // Update multiple configurations. $configs = [ - 'core.entity_form_display.node.camp.default' =>[ + 'core.entity_form_display.node.camp.default' => [ 'content.field_location_directions.settings', ], - 'field.field.node.camp.field_location_directions' =>[ + 'field.field.node.camp.field_location_directions' => [ 'description', - 'default_value' + 'default_value', ], ]; diff --git a/openy_location/modules/openy_loc_camp/openy_loc_camp.module b/openy_location/modules/openy_loc_camp/openy_loc_camp.module index 60ce2c98..edb8ba6d 100644 --- a/openy_location/modules/openy_loc_camp/openy_loc_camp.module +++ b/openy_location/modules/openy_loc_camp/openy_loc_camp.module @@ -12,7 +12,6 @@ use Drupal\node\NodeInterface; */ function openy_loc_camp_theme_suggestions_page_alter(array &$suggestions, array $variables) { // Add content type suggestion for Landing pages related to a camp. - // Exit if not a node page, or if the 'openy_loc_camp.camp_service' is not available. if (!($node = \Drupal::request()->attributes->get('node')) || !($camp_service = \Drupal::service('openy_loc_camp.camp_service'))) { return; diff --git a/openy_location/modules/openy_loc_camp/src/CampAlertBuilder.php b/openy_location/modules/openy_loc_camp/src/CampAlertBuilder.php index 85f96a34..a6e7e272 100644 --- a/openy_location/modules/openy_loc_camp/src/CampAlertBuilder.php +++ b/openy_location/modules/openy_loc_camp/src/CampAlertBuilder.php @@ -21,7 +21,7 @@ class CampAlertBuilder implements AlertBuilderInterface { /** * Constructs the CampAlertBuilder. * - * @param EntityTypeManagerInterface $entity_type_manager + * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager */ public function __construct(EntityTypeManagerInterface $entity_type_manager) { $this->nodeStorage = $entity_type_manager->getStorage('node'); diff --git a/openy_location/modules/openy_loc_camp/src/CampService.php b/openy_location/modules/openy_loc_camp/src/CampService.php index 51cb466b..94ff8173 100644 --- a/openy_location/modules/openy_loc_camp/src/CampService.php +++ b/openy_location/modules/openy_loc_camp/src/CampService.php @@ -140,7 +140,7 @@ public function getLandingPageCampNode(NodeInterface $node) { // aliases are linked also. if ($aliases = $this->lookupPathAliases($system_path, $langcode)) { foreach ($aliases as $alias) { - if(empty($alias->alias->value)) { + if (empty($alias->alias->value)) { continue; } $group->condition('field_camp_menu_links', 'internal:' . $alias->alias->value); @@ -194,7 +194,8 @@ public function lookupPathAliases($path, $langcode) { try { return $this->entityTypeManager->getStorage('path_alias') ->loadByProperties(['path' => $path, 'langcode' => $langcode_list]); - } catch (\Exception $e) { + } + catch (\Exception $e) { return FALSE; } } diff --git a/openy_location/modules/openy_loc_facility/openy_loc_facility.install b/openy_location/modules/openy_loc_facility/openy_loc_facility.install index 91e283f0..0306533e 100644 --- a/openy_location/modules/openy_loc_facility/openy_loc_facility.install +++ b/openy_location/modules/openy_loc_facility/openy_loc_facility.install @@ -50,7 +50,7 @@ function openy_loc_facility_update_8001() { function openy_loc_facility_update_8002() { $module = 'openy_loc_facility'; $bundle = 'facility'; - // Field definitions + // Field definitions. $config_dir = \Drupal::service('extension.list.module')->getPath($module) . '/config/install'; $config_importer = \Drupal::service('openy_upgrade_tool.importer'); $config_importer->setDirectory($config_dir); @@ -254,7 +254,6 @@ function openy_loc_facility_update_8011() { } } - /** * Update Open Y Facility feature to use link attributes widget. */ @@ -262,7 +261,7 @@ function openy_loc_facility_update_8012() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_loc_facility') . '/config/install/'; // Update multiple configurations. $configs = [ - 'core.entity_form_display.node.facility.default' =>[ + 'core.entity_form_display.node.facility.default' => [ 'content.field_location_directions.settings.enabled_attributes', 'content.field_location_directions.type', ], @@ -296,7 +295,7 @@ function openy_loc_facility_update_8015() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_loc_facility') . '/config/install/'; // Update multiple configurations. $configs = [ - 'field.field.node.facility.field_location_coordinates' =>[ + 'field.field.node.facility.field_location_coordinates' => [ 'required', ], ]; @@ -317,12 +316,12 @@ function openy_loc_facility_update_8016() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_loc_facility') . '/config/install/'; // Update multiple configurations. $configs = [ - 'core.entity_form_display.node.facility.default' =>[ + 'core.entity_form_display.node.facility.default' => [ 'content.field_location_directions.settings', ], - 'field.field.node.facility.field_location_directions' =>[ + 'field.field.node.facility.field_location_directions' => [ 'description', - 'default_value' + 'default_value', ], ]; diff --git a/openy_location/modules/openy_loc_facility/src/FacilityAlertBuilder.php b/openy_location/modules/openy_loc_facility/src/FacilityAlertBuilder.php index b658c514..03489086 100644 --- a/openy_location/modules/openy_loc_facility/src/FacilityAlertBuilder.php +++ b/openy_location/modules/openy_loc_facility/src/FacilityAlertBuilder.php @@ -21,7 +21,7 @@ class FacilityAlertBuilder implements AlertBuilderInterface { /** * Constructs the FacilityAlertBuilder. * - * @param EntityTypeManagerInterface $entity_type_manager + * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager */ public function __construct(EntityTypeManagerInterface $entity_type_manager) { $this->nodeStorage = $entity_type_manager->getStorage('node'); diff --git a/openy_location/modules/openy_loc_filter/openy_loc_filter.module b/openy_location/modules/openy_loc_filter/openy_loc_filter.module index dce704e4..88e34d32 100644 --- a/openy_location/modules/openy_loc_filter/openy_loc_filter.module +++ b/openy_location/modules/openy_loc_filter/openy_loc_filter.module @@ -1,5 +1,9 @@ 'markup', + '#type' => 'markup', '#markup' => $this->t('On this page, you can limit the list of branches and camps, which displayed in popups and filters on the programs and schedules page. This form will affect only the filters which are related to the scheduling, classes, and sessions. By default, all branches diff --git a/openy_location/openy_location.install b/openy_location/openy_location.install index e03ab927..61037a37 100644 --- a/openy_location/openy_location.install +++ b/openy_location/openy_location.install @@ -1,6 +1,8 @@ getPath('openy_location') . '/config/install/'; - // Import new configuration + // Import new configuration. $config_importer = \Drupal::service('openy_upgrade_tool.importer'); $config_importer->setDirectory($config_dir); $config_importer->importConfigs([ diff --git a/openy_media/config/override/media_directories.settings.yml b/openy_media/config/override/media_directories.settings.yml index ed6e341d..7b8c19f9 100644 --- a/openy_media/config/override/media_directories.settings.yml +++ b/openy_media/config/override/media_directories.settings.yml @@ -1 +1 @@ -directory_taxonomy: media_folders \ No newline at end of file +directory_taxonomy: media_folders diff --git a/openy_media/modules/openy_media_document/openy_media_document.install b/openy_media/modules/openy_media_document/openy_media_document.install index 60e4c677..91e05905 100644 --- a/openy_media/modules/openy_media_document/openy_media_document.install +++ b/openy_media/modules/openy_media_document/openy_media_document.install @@ -18,9 +18,9 @@ function openy_media_document_install() { * Implements hook_update_dependencies(). */ function openy_media_document_update_dependencies() { - $dependencies['dropzonejs_eb_widget'][8101] = array( + $dependencies['dropzonejs_eb_widget'][8101] = [ 'openy_media_document' => 8005, - ); + ]; return $dependencies; } @@ -106,7 +106,7 @@ function openy_media_document_update_8003() { 'core.entity_view_display.media.document.default' => [ 'dependencies', 'content', - 'hidden' + 'hidden', ], ]; diff --git a/openy_media/modules/openy_media_document/src/Plugin/Field/FieldFormatter/FileIframeFormatter.php b/openy_media/modules/openy_media_document/src/Plugin/Field/FieldFormatter/FileIframeFormatter.php index 0758ebd6..883df5bd 100644 --- a/openy_media/modules/openy_media_document/src/Plugin/Field/FieldFormatter/FileIframeFormatter.php +++ b/openy_media/modules/openy_media_document/src/Plugin/Field/FieldFormatter/FileIframeFormatter.php @@ -23,7 +23,7 @@ class FileIframeFormatter extends FileFormatterBase { * {@inheritdoc} */ public function viewElements(FieldItemListInterface $items, $langcode) { - $elements = array(); + $elements = []; foreach ($this->getEntitiesToView($items, $langcode) as $delta => $file) { $image_uri = $file->getFileUri(); @@ -34,9 +34,9 @@ public function viewElements(FieldItemListInterface $items, $langcode) { '#context' => [ 'url' => $url, ], - '#cache' => array( + '#cache' => [ 'tags' => $file->getCacheTags(), - ), + ], ]; } diff --git a/openy_media/modules/openy_media_document/src/Plugin/Field/FieldFormatter/FileLinkFormatter.php b/openy_media/modules/openy_media_document/src/Plugin/Field/FieldFormatter/FileLinkFormatter.php index 1ecd4b5a..404db43c 100644 --- a/openy_media/modules/openy_media_document/src/Plugin/Field/FieldFormatter/FileLinkFormatter.php +++ b/openy_media/modules/openy_media_document/src/Plugin/Field/FieldFormatter/FileLinkFormatter.php @@ -23,7 +23,7 @@ class FileLinkFormatter extends FileFormatterBase { * {@inheritdoc} */ public function viewElements(FieldItemListInterface $items, $langcode) { - $elements = array(); + $elements = []; $title = $items->getEntity()->get('name')->value; foreach ($this->getEntitiesToView($items, $langcode) as $delta => $file) { @@ -34,9 +34,9 @@ public function viewElements(FieldItemListInterface $items, $langcode) { '#type' => 'link', '#url' => $url, '#attributes' => ['target' => '_blank'], - '#cache' => array( + '#cache' => [ 'tags' => $file->getCacheTags(), - ), + ], ]; } diff --git a/openy_media/modules/openy_media_image/openy_media_image.install b/openy_media/modules/openy_media_image/openy_media_image.install index 96ff26d8..90e0a97e 100644 --- a/openy_media/modules/openy_media_image/openy_media_image.install +++ b/openy_media/modules/openy_media_image/openy_media_image.install @@ -13,7 +13,7 @@ use Drupal\openy_media\EmbedButtonIconHelper; function openy_media_image_install() { EmbedButtonIconHelper::setEmbedButtonIcon('openy_media_image', 'image.png', 'embed_image'); $config_dir = \Drupal::service('extension.list.module')->getPath('openy_media_image') . '/config/override/'; - // Import new configuration + // Import new configuration. $config_importer = \Drupal::service('openy_upgrade_tool.importer'); $config_importer->setDirectory($config_dir); $config_importer->importConfigs([ @@ -38,9 +38,9 @@ function openy_media_image_update_dependencies() { ], ]; - $dependencies['dropzonejs_eb_widget'][8101] = array( + $dependencies['dropzonejs_eb_widget'][8101] = [ 'openy_media_image' => 8009, - ); + ]; return $dependencies; } @@ -52,7 +52,7 @@ function openy_media_image_update_8001() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_media_image') . '/config/install/'; // Update multiple configurations. $configs = [ - 'field.field.media.image.field_media_caption' =>[ + 'field.field.media.image.field_media_caption' => [ 'description', ], 'field.field.media.image.field_media_image' => [ @@ -82,10 +82,10 @@ function openy_media_image_update_8002() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_media_image') . '/config/install/'; // Update multiple configurations. $configs = [ - 'field.field.media.image.field_media_image' =>[ + 'field.field.media.image.field_media_image' => [ 'settings.alt_field_required', ], - 'entity_browser.browser.images_library' =>[ + 'entity_browser.browser.images_library' => [ 'widgets', ], 'entity_browser.browser.images_library_embed' => [ @@ -107,7 +107,7 @@ function openy_media_image_update_8002() { */ function openy_media_image_update_8003() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_media_image') . '/config/install/'; - // Import new configuration + // Import new configuration. $config_importer = \Drupal::service('openy_upgrade_tool.importer'); $config_importer->setDirectory($config_dir); $config_importer->importConfigs([ @@ -120,7 +120,7 @@ function openy_media_image_update_8003() { */ function openy_media_image_update_8004() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_media_image') . '/config/install/'; - // Import new configuration + // Import new configuration. $config_importer = \Drupal::service('openy_upgrade_tool.importer'); $config_importer->setDirectory($config_dir); $config_importer->importConfigs([ @@ -340,7 +340,7 @@ function openy_media_image_update_8014() { $original_image_styles = $config->get('type_settings.display_plugins'); $blazy_image_styles = [ 'view_mode:media.embedded_full', - 'view_mode:media.embedded_half' + 'view_mode:media.embedded_half', ]; // We should replace blazy image styles, instead of import config, for saving @@ -353,7 +353,7 @@ function openy_media_image_update_8014() { $image_styles_without_blazy = [ 'view_mode:media.full_without_blazy', - 'view_mode:media.half_without_blazy' + 'view_mode:media.half_without_blazy', ]; $updated_view_modes = array_merge($original_image_styles, $image_styles_without_blazy); @@ -371,13 +371,13 @@ function openy_media_image_update_8016() { 'image.style.media_full', 'image.style.media_half', 'image.style.thumbnail_focal_point', - 'image.style.thumbnail_for_preview' + 'image.style.thumbnail_for_preview', ]); $path = \Drupal::service('extension.list.module')->getPath('openy_media_image') . '/config/override'; $config_importer->setDirectory($path); $config_importer->importConfigs([ - 'image.style.browser_thumbnail' + 'image.style.browser_thumbnail', ]); } diff --git a/openy_media/modules/openy_media_video/openy_media_video.install b/openy_media/modules/openy_media_video/openy_media_video.install index 645cc4b9..334e4589 100644 --- a/openy_media/modules/openy_media_video/openy_media_video.install +++ b/openy_media/modules/openy_media_video/openy_media_video.install @@ -76,7 +76,7 @@ function openy_media_video_update_8003() { 'core.entity_view_display.media.video.default' => [ 'dependencies', 'content', - 'hidden' + 'hidden', ], ]; @@ -117,7 +117,6 @@ function openy_media_video_update_8004() { } } - /** * Update embed button label. */ diff --git a/openy_media/openy_media.install b/openy_media/openy_media.install index 53084b6e..4454bd58 100644 --- a/openy_media/openy_media.install +++ b/openy_media/openy_media.install @@ -10,13 +10,13 @@ */ function openy_media_install() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_media') . '/config/override/'; - // Import new configuration - $config_importer = \Drupal::service('openy_upgrade_tool.importer'); - $config_importer->setDirectory($config_dir); - $config_importer->importConfigs([ - 'blazy.settings', - 'media_directories.settings' - ]); + // Import new configuration. + $config_importer = \Drupal::service('openy_upgrade_tool.importer'); + $config_importer->setDirectory($config_dir); + $config_importer->importConfigs([ + 'blazy.settings', + 'media_directories.settings', + ]); } /** @@ -24,7 +24,7 @@ function openy_media_install() { */ function openy_media_update_8001() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_media') . '/config/install/'; - // Import new configuration + // Import new configuration. $config_importer = \Drupal::service('openy_upgrade_tool.importer'); $config_importer->setDirectory($config_dir); $config_importer->importConfigs([ @@ -37,7 +37,7 @@ function openy_media_update_8001() { */ function openy_media_update_8002() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_media') . '/config/install/'; - // Import new configuration + // Import new configuration. $config_importer = \Drupal::service('openy_upgrade_tool.importer'); $config_importer->setDirectory($config_dir); $config_importer->importConfigs([ @@ -50,7 +50,7 @@ function openy_media_update_8002() { */ function openy_media_update_8003() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_media') . '/config/install/'; - // Import new configuration + // Import new configuration. $config_importer = \Drupal::service('openy_upgrade_tool.importer'); $config_importer->setDirectory($config_dir); $config_importer->importConfigs([ @@ -77,7 +77,6 @@ function openy_media_update_8004() { } } - /** * Install media directories modules. */ @@ -86,7 +85,7 @@ function openy_media_update_8005() { 'openy', 'media_library', 'media_directories', - 'media_directories_ui' + 'media_directories_ui', ]; foreach ($extensions as $extension) { \Drupal::service('module_installer')->install([$extension]); diff --git a/openy_menu/modules/openy_menu_main/openy_menu_main.install b/openy_menu/modules/openy_menu_main/openy_menu_main.install index 2ec5c4c7..0c936abd 100644 --- a/openy_menu/modules/openy_menu_main/openy_menu_main.install +++ b/openy_menu/modules/openy_menu_main/openy_menu_main.install @@ -5,15 +5,15 @@ * Open Y Node install file. */ - /** +/** * Implement hook_install(). */ function openy_menu_main_install() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_menu_main') . '/config/override/'; - // Import new configuration - $config_importer = \Drupal::service('openy_upgrade_tool.importer'); - $config_importer->setDirectory($config_dir); - $config_importer->importConfigs([ - 'system.menu.main', - ]); + // Import new configuration. + $config_importer = \Drupal::service('openy_upgrade_tool.importer'); + $config_importer->setDirectory($config_dir); + $config_importer->importConfigs([ + 'system.menu.main', + ]); } diff --git a/openy_menu/openy_menu.install b/openy_menu/openy_menu.install index b16d164f..c095fc13 100644 --- a/openy_menu/openy_menu.install +++ b/openy_menu/openy_menu.install @@ -31,7 +31,7 @@ function openy_menu_update_8003() { } /** -* Update Menu management Tour. + * Update Menu management Tour. */ function openy_menu_update_8004() { $updates = [ diff --git a/openy_node/modules/openy_node_activity/openy_node_activity.install b/openy_node/modules/openy_node_activity/openy_node_activity.install index c55231d4..a961b11b 100644 --- a/openy_node/modules/openy_node_activity/openy_node_activity.install +++ b/openy_node/modules/openy_node_activity/openy_node_activity.install @@ -10,7 +10,7 @@ */ function openy_node_activity_update_8003() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_node_activity') . '/config/install/'; - // Import new configuration + // Import new configuration. $config_importer = \Drupal::service('openy_upgrade_tool.importer'); $config_importer->setDirectory($config_dir); $config_importer->importConfigs([ @@ -19,8 +19,7 @@ function openy_node_activity_update_8003() { // Update multiple configurations. $configs = [ - 'core.entity_form_display.node.activity.default' => [ - ], + 'core.entity_form_display.node.activity.default' => [], 'core.entity_view_display.node.activity.default' => [ 'content', ], @@ -46,7 +45,7 @@ function openy_node_activity_update_8004() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_node_activity') . '/config/install/'; // Update multiple configurations. $configs = [ - 'field.field.node.activity.field_activity_category' =>[ + 'field.field.node.activity.field_activity_category' => [ 'description', ], 'field.field.node.activity.field_activity_description' => [ diff --git a/openy_node/modules/openy_node_activity/openy_node_activity.module b/openy_node/modules/openy_node_activity/openy_node_activity.module index 00b4fa61..56c66a26 100644 --- a/openy_node/modules/openy_node_activity/openy_node_activity.module +++ b/openy_node/modules/openy_node_activity/openy_node_activity.module @@ -5,12 +5,14 @@ * OpenY Node Activity module file. */ +use Drupal\Core\Entity\EntityInterface; + /** * Implements hook_ENTITY_TYPE_update(). * * This will publish/unpublish Activity nodes when a Category is updated. */ -function openy_node_activity_node_update(Drupal\Core\Entity\EntityInterface $entity) { +function openy_node_activity_node_update(EntityInterface $entity) { // Only do this for Category nodes. if ($entity->getType() != 'program_subcategory') { return; @@ -26,11 +28,13 @@ function openy_node_activity_node_update(Drupal\Core\Entity\EntityInterface $ent if ($original_status && !$current_status) { // Going from published to unpublished. - $status = false; - } elseif (!$original_status && $current_status) { + $status = FALSE; + } + elseif (!$original_status && $current_status) { // Going from unpublished to published. - $status = true; - } else { + $status = TRUE; + } + else { // Status was unchanged. return; } @@ -64,7 +68,7 @@ function openy_node_activity_node_update(Drupal\Core\Entity\EntityInterface $ent * @param \Drupal\Core\Entity\EntityInterface $entity * The Category node who's Activity nodes will be retrieved. * - * @return array $activity_ids + * @return array * Array of Activity node ids. */ function _openy_node_activity_getactivitynodes(&$entity) { diff --git a/openy_node/modules/openy_node_blog/openy_node_blog.install b/openy_node/modules/openy_node_blog/openy_node_blog.install index 7abfbc17..5a5731de 100644 --- a/openy_node/modules/openy_node_blog/openy_node_blog.install +++ b/openy_node/modules/openy_node_blog/openy_node_blog.install @@ -53,7 +53,7 @@ function openy_node_blog_update_8001() { function openy_node_blog_update_8002() { $module = 'openy_node_blog'; $bundle = 'blog'; - // Field definitions + // Field definitions. $config_dir = \Drupal::service('extension.list.module')->getPath($module) . '/config/install'; $config_importer = \Drupal::service('openy_upgrade_tool.importer'); $config_importer->setDirectory($config_dir); @@ -61,15 +61,15 @@ function openy_node_blog_update_8002() { 'field.field.node.' . $bundle . '.field_meta_tags', 'simple_sitemap.bundle_settings.' . $bundle . '.landing_page', ]); - // Dependencies + // Dependencies. $config = \Drupal::service('extension.list.module')->getPath($module) . $module . '.info.yml'; $config_importer = \Drupal::service('openy_upgrade_tool.param_updater'); $config_importer->update($config, $module . '.info', 'dependencies'); - // Entity form + // Entity form. $config = \Drupal::service('extension.list.module')->getPath($module) . '/config/install/core.entity_form_display.node.' . $bundle . '.default.yml'; $config_importer = \Drupal::service('openy_upgrade_tool.param_updater'); $config_importer->update($config, 'core.entity_form_display.node.' . $bundle . '.default', 'dependencies.config'); - // Entity view display + // Entity view display. $config = \Drupal::service('extension.list.module')->getPath($module) . '/config/install/core.entity_view_display.node.' . $bundle . '.default.yml'; $config_importer = \Drupal::service('openy_upgrade_tool.param_updater'); $config_importer->update($config, 'core.entity_view_display.node.' . $bundle . '.default', 'dependencies.config'); @@ -115,7 +115,7 @@ function openy_node_blog_update_8004() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_node_blog') . '/config/install/'; // Update multiple configurations. $configs = [ - 'field.field.node.blog.field_blog_category' =>[ + 'field.field.node.blog.field_blog_category' => [ 'description', ], 'field.field.node.blog.field_blog_description' => [ @@ -263,7 +263,7 @@ function openy_node_blog_update_8010() { } /** -* Update feature configs for Drupal Core upgrade. + * Update feature configs for Drupal Core upgrade. */ function openy_node_blog_update_8011() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_node_blog') . '/config/install/'; @@ -295,12 +295,12 @@ function openy_node_blog_update_8012() { 'field.field.node.blog.field_blog_location' => [ 'settings', 'dependencies', - 'third_party_settings' + 'third_party_settings', ], 'field.field.node.blog.field_blog_related' => [ 'dependencies', 'description', - 'settings.auto_create_bundle' + 'settings.auto_create_bundle', ], ]; @@ -341,6 +341,6 @@ function openy_node_blog_update_8015() { $config_importer->setDirectory($path); $config_importer->importConfigs([ 'image.style.node_blog', - 'image.style.node_blog_teaser' + 'image.style.node_blog_teaser', ]); } diff --git a/openy_node/modules/openy_node_blog/openy_node_blog.module b/openy_node/modules/openy_node_blog/openy_node_blog.module index db7a203a..8d654289 100644 --- a/openy_node/modules/openy_node_blog/openy_node_blog.module +++ b/openy_node/modules/openy_node_blog/openy_node_blog.module @@ -19,7 +19,7 @@ function openy_node_blog_form_alter(&$form, FormStateInterface $form_state, $for ], ], ]; - $form['field_blog_color']['widget']['#states'] = $visible; + $form['field_blog_color']['widget']['#states'] = $visible; $form['field_blog_text_color']['widget']['#states'] = $visible; } } diff --git a/openy_node/modules/openy_node_blog/src/BlogAlertBuilder.php b/openy_node/modules/openy_node_blog/src/BlogAlertBuilder.php index 5e9ba012..8287977a 100644 --- a/openy_node/modules/openy_node_blog/src/BlogAlertBuilder.php +++ b/openy_node/modules/openy_node_blog/src/BlogAlertBuilder.php @@ -21,7 +21,7 @@ class BlogAlertBuilder implements AlertBuilderInterface { /** * Constructs the BlogAlertBuilder. * - * @param EntityTypeManagerInterface $entity_type_manager + * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager */ public function __construct(EntityTypeManagerInterface $entity_type_manager) { $this->nodeStorage = $entity_type_manager->getStorage('node'); diff --git a/openy_node/modules/openy_node_blog/src/BlogSimplePaginator.php b/openy_node/modules/openy_node_blog/src/BlogSimplePaginator.php index e8bc3a47..8b48bdf3 100644 --- a/openy_node/modules/openy_node_blog/src/BlogSimplePaginator.php +++ b/openy_node/modules/openy_node_blog/src/BlogSimplePaginator.php @@ -6,6 +6,9 @@ use Drupal\Core\Link; use Drupal\Core\Routing\RouteMatchInterface; +/** + * + */ class BlogSimplePaginator { /** @@ -25,7 +28,7 @@ class BlogSimplePaginator { /** * Constructs the BlogSimplePaginator. * - * @param EntityTypeManagerInterface $entity_type_manager + * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager */ public function __construct(EntityTypeManagerInterface $entity_type_manager, RouteMatchInterface $current_route_match) { $this->nodeStorage = $entity_type_manager->getStorage('node'); @@ -40,28 +43,28 @@ public function __construct(EntityTypeManagerInterface $entity_type_manager, Rou */ private function buildQuery($direction = 'prev') { $currentNode = $this->routeMatch->getParameter('node'); - + if (!$currentNode) { return NULL; } - + $query = $this->nodeStorage->getQuery(); $compare = '>'; $sort = 'ASC'; - + if ($direction == 'prev') { $compare = '<'; $sort = 'DESC'; } $result = $query->condition('created', $currentNode->getCreatedTime(), $compare) - ->condition('type', $currentNode->bundle()) - ->condition('status', 1) - ->condition('langcode', $currentNode->language()->getId()) - ->sort('created', $sort) - ->range(0, 1) - ->execute(); + ->condition('type', $currentNode->bundle()) + ->condition('status', 1) + ->condition('langcode', $currentNode->language()->getId()) + ->sort('created', $sort) + ->range(0, 1) + ->execute(); if (!empty($result) && is_array($result)) { $nid = array_shift($result); diff --git a/openy_node/modules/openy_node_campaign/openy_node_campaign.install b/openy_node/modules/openy_node_campaign/openy_node_campaign.install index b94625f0..3600d427 100644 --- a/openy_node/modules/openy_node_campaign/openy_node_campaign.install +++ b/openy_node/modules/openy_node_campaign/openy_node_campaign.install @@ -1,6 +1,7 @@ getPath('openy_node_category') . '/config/install/'; - // Import new configuration + // Import new configuration. $config_importer = \Drupal::service('openy_upgrade_tool.importer'); $config_importer->setDirectory($config_dir); $config_importer->importConfigs([ @@ -50,7 +50,7 @@ function openy_node_category_update_8002() { // Update multiple configurations. $configs = [ - 'core.entity_form_display.node.program_subcategory.default' =>[ + 'core.entity_form_display.node.program_subcategory.default' => [ 'dependencies.config', 'third_party_settings.field_group.group_bottom_area', ], @@ -342,6 +342,6 @@ function openy_node_category_update_8017() { $config_importer = \Drupal::service('config_import.importer'); $config_importer->setDirectory($path); $config_importer->importConfigs([ - 'image.style.node_program_subcategory_teaser' + 'image.style.node_program_subcategory_teaser', ]); } diff --git a/openy_node/modules/openy_node_category/openy_node_category.module b/openy_node/modules/openy_node_category/openy_node_category.module index 4ed227ad..54abdd58 100644 --- a/openy_node/modules/openy_node_category/openy_node_category.module +++ b/openy_node/modules/openy_node_category/openy_node_category.module @@ -5,12 +5,14 @@ * OpenY Node Category module file. */ +use Drupal\Core\Entity\EntityInterface; + /** * Implements hook_ENTITY_TYPE_update(). * * This will publish/unpublish Category nodes when a Program is updated. */ -function openy_node_category_node_update(Drupal\Core\Entity\EntityInterface $entity) { +function openy_node_category_node_update(EntityInterface $entity) { // Only do this for Program nodes. if ($entity->getType() != 'program') { return; @@ -26,11 +28,13 @@ function openy_node_category_node_update(Drupal\Core\Entity\EntityInterface $ent if ($original_status && !$current_status) { // Going from published to unpublished. - $status = false; - } elseif (!$original_status && $current_status) { + $status = FALSE; + } + elseif (!$original_status && $current_status) { // Going from unpublished to published. - $status = true; - } else { + $status = TRUE; + } + else { // Status was unchanged. return; } @@ -64,7 +68,7 @@ function openy_node_category_node_update(Drupal\Core\Entity\EntityInterface $ent * @param \Drupal\Core\Entity\EntityInterface $entity * The Program node who's Category nodes will be retrieved. * - * @return array $category_ids + * @return array * Array of Category node ids. */ function _openy_node_category_getcategorynodes(&$entity) { diff --git a/openy_node/modules/openy_node_class/openy_node_class.module b/openy_node/modules/openy_node_class/openy_node_class.module index f8bd713b..53fd4c82 100644 --- a/openy_node/modules/openy_node_class/openy_node_class.module +++ b/openy_node/modules/openy_node_class/openy_node_class.module @@ -5,12 +5,14 @@ * Open Y Node Class module file. */ +use Drupal\Core\Entity\EntityInterface; + /** * Implements hook_ENTITY_TYPE_update(). * * This will publish/unpublish Class nodes when an Activity is updated. */ -function openy_node_class_node_update(Drupal\Core\Entity\EntityInterface $entity) { +function openy_node_class_node_update(EntityInterface $entity) { // Only do this for Activity nodes. if ($entity->getType() != 'activity') { return; @@ -26,11 +28,13 @@ function openy_node_class_node_update(Drupal\Core\Entity\EntityInterface $entity if ($original_status && !$current_status) { // Going from published to unpublished. - $status = false; - } elseif (!$original_status && $current_status) { + $status = FALSE; + } + elseif (!$original_status && $current_status) { // Going from unpublished to published. - $status = true; - } else { + $status = TRUE; + } + else { // Status was unchanged. return; } @@ -64,7 +68,7 @@ function openy_node_class_node_update(Drupal\Core\Entity\EntityInterface $entity * @param \Drupal\Core\Entity\EntityInterface $entity * The Activity node who's Class nodes will be retrieved. * - * @return array $class_ids + * @return array * Array of Class node ids. */ function _openy_node_class_getclassnodes(&$entity) { diff --git a/openy_node/modules/openy_node_event/openy_node_event.install b/openy_node/modules/openy_node_event/openy_node_event.install index 5b1950db..7d9810b7 100644 --- a/openy_node/modules/openy_node_event/openy_node_event.install +++ b/openy_node/modules/openy_node_event/openy_node_event.install @@ -36,6 +36,6 @@ function openy_node_event_update_8003() { $config_importer = \Drupal::service('config_import.importer'); $config_importer->setDirectory($path); $config_importer->importConfigs([ - 'image.style.event_teaser' + 'image.style.event_teaser', ]); } diff --git a/openy_node/modules/openy_node_event/openy_node_event.module b/openy_node/modules/openy_node_event/openy_node_event.module index d16ef53d..eb2b227b 100644 --- a/openy_node/modules/openy_node_event/openy_node_event.module +++ b/openy_node/modules/openy_node_event/openy_node_event.module @@ -163,8 +163,8 @@ function openy_node_event_preprocess_node(&$variables) { $formatted_end_date = $endDt->format('g:i a'); // Display month and day if the event lasts several days. if ($startDt->format("Y-m-d") != $endDt->format("Y-m-d")) { - $formatted_start_date = $startDt->format(('M j, g:ia') ); - $formatted_end_date = $endDt->format(('M j, g:ia') ); + $formatted_start_date = $startDt->format(('M j, g:ia')); + $formatted_end_date = $endDt->format(('M j, g:ia')); } $variables['content']['event_converted_dates'] = [ diff --git a/openy_node/modules/openy_node_landing/openy_node_landing.install b/openy_node/modules/openy_node_landing/openy_node_landing.install index caf22476..34a4f85a 100644 --- a/openy_node/modules/openy_node_landing/openy_node_landing.install +++ b/openy_node/modules/openy_node_landing/openy_node_landing.install @@ -241,7 +241,7 @@ function openy_node_landing_update_8010() { } /** - * New column-left layout + * New column-left layout. */ function openy_node_landing_update_8011() { $config_importer = \Drupal::service('openy_upgrade_tool.param_updater'); @@ -308,8 +308,8 @@ function openy_node_landing_update_8014() { // Update multiple configurations. $configs = [ 'field.field.node.landing_page.field_lp_location' => [ - 'settings' - ] + 'settings', + ], ]; $config_updater = \Drupal::service('openy_upgrade_tool.param_updater'); foreach ($configs as $config_name => $params) { diff --git a/openy_node/modules/openy_node_landing/src/LandingPageAlertBuilder.php b/openy_node/modules/openy_node_landing/src/LandingPageAlertBuilder.php index a54e865c..2570cbfc 100644 --- a/openy_node/modules/openy_node_landing/src/LandingPageAlertBuilder.php +++ b/openy_node/modules/openy_node_landing/src/LandingPageAlertBuilder.php @@ -21,7 +21,7 @@ class LandingPageAlertBuilder implements AlertBuilderInterface { /** * Constructs the LandingPageAlertBuilder. * - * @param EntityTypeManagerInterface $entity_type_manager + * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager */ public function __construct(EntityTypeManagerInterface $entity_type_manager) { $this->nodeStorage = $entity_type_manager->getStorage('node'); diff --git a/openy_node/modules/openy_node_mbrshp/openy_node_mbrshp.install b/openy_node/modules/openy_node_mbrshp/openy_node_mbrshp.install index c6d3bedf..dcab0ad5 100644 --- a/openy_node/modules/openy_node_mbrshp/openy_node_mbrshp.install +++ b/openy_node/modules/openy_node_mbrshp/openy_node_mbrshp.install @@ -233,7 +233,7 @@ function openy_node_mbrshp_update_8012() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_node_mbrshp') . '/config/install/'; // Update multiple configurations. $configs = [ - 'core.entity_form_display.paragraph.membership_info.default' =>[ + 'core.entity_form_display.paragraph.membership_info.default' => [ 'content.field_mbrshp_link.settings.enabled_attributes', 'content.field_mbrshp_link.type', ], diff --git a/openy_node/modules/openy_node_news/openy_node_news.install b/openy_node/modules/openy_node_news/openy_node_news.install index 8002dec1..87f6fc7d 100644 --- a/openy_node/modules/openy_node_news/openy_node_news.install +++ b/openy_node/modules/openy_node_news/openy_node_news.install @@ -116,6 +116,6 @@ function openy_node_news_update_8007() { $config_importer->setDirectory($path); $config_importer->importConfigs([ 'image.style.node_news', - 'image.style.node_news_teaser' + 'image.style.node_news_teaser', ]); } diff --git a/openy_node/modules/openy_node_news/src/NewsAlertBuilder.php b/openy_node/modules/openy_node_news/src/NewsAlertBuilder.php index 41874173..d527923a 100644 --- a/openy_node/modules/openy_node_news/src/NewsAlertBuilder.php +++ b/openy_node/modules/openy_node_news/src/NewsAlertBuilder.php @@ -21,7 +21,7 @@ class NewsAlertBuilder implements AlertBuilderInterface { /** * Constructs the NewsAlertBuilder. * - * @param EntityTypeManagerInterface $entity_type_manager + * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager */ public function __construct(EntityTypeManagerInterface $entity_type_manager) { $this->nodeStorage = $entity_type_manager->getStorage('node'); diff --git a/openy_node/modules/openy_node_program/openy_node_program.install b/openy_node/modules/openy_node_program/openy_node_program.install index 60e397b3..6bb678f3 100644 --- a/openy_node/modules/openy_node_program/openy_node_program.install +++ b/openy_node/modules/openy_node_program/openy_node_program.install @@ -40,7 +40,7 @@ function openy_node_program_update_8001() { function openy_node_program_update_8002() { $module = 'openy_node_program'; $bundle = 'program'; - // Field definitions + // Field definitions. $config_dir = \Drupal::service('extension.list.module')->getPath($module) . '/config/install'; $config_importer = \Drupal::service('openy_upgrade_tool.importer'); $config_importer->setDirectory($config_dir); @@ -48,15 +48,15 @@ function openy_node_program_update_8002() { 'field.field.node.' . $bundle . '.field_meta_tags', 'simple_sitemap.bundle_settings.' . $bundle . '.landing_page', ]); - // Dependencies + // Dependencies. $config = \Drupal::service('extension.list.module')->getPath($module) . $module . '.info.yml'; $config_importer = \Drupal::service('openy_upgrade_tool.param_updater'); $config_importer->update($config, $module . '.info', 'dependencies'); - // Entity form + // Entity form. $config = \Drupal::service('extension.list.module')->getPath($module) . '/config/install/core.entity_form_display.node.' . $bundle . '.default.yml'; $config_importer = \Drupal::service('openy_upgrade_tool.param_updater'); $config_importer->update($config, 'core.entity_form_display.node.' . $bundle . '.default', 'dependencies.config'); - // Entity view display + // Entity view display. $config = \Drupal::service('extension.list.module')->getPath($module) . '/config/install/core.entity_view_display.node.' . $bundle . '.default.yml'; $config_importer = \Drupal::service('openy_upgrade_tool.param_updater'); $config_importer->update($config, 'core.entity_view_display.node.' . $bundle . '.default', 'dependencies.config'); @@ -105,7 +105,7 @@ function openy_node_program_update_8004() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_node_program') . '/config/install/'; // Update multiple configurations. $configs = [ - 'field.field.node.program.field_content' =>[ + 'field.field.node.program.field_content' => [ 'description', ], 'field.field.node.program.field_program_color' => [ @@ -228,7 +228,7 @@ function openy_node_program_update_8011() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_node_program') . '/config/install/'; // Update multiple configurations. $configs = [ - 'image.style.node_program_header' =>[ + 'image.style.node_program_header' => [ 'dependencies', 'effects', ], @@ -290,12 +290,12 @@ function openy_node_program_update_8013() { 'content.field_header_content', 'content.field_content.weight', 'content.field_sidebar_content.weight', - 'content.links.weight' + 'content.links.weight', ], 'core.entity_view_display.node.program.teaser' => [ 'dependencies.config', 'hidden.field_header_content', - ] + ], ]; $config_updater = \Drupal::service('openy_upgrade_tool.param_updater'); foreach ($configs as $config_name => $params) { @@ -321,6 +321,6 @@ function openy_node_program_update_8015() { $config_importer = \Drupal::service('config_import.importer'); $config_importer->setDirectory($path); $config_importer->importConfigs([ - 'image.style.node_program_header' + 'image.style.node_program_header', ]); } diff --git a/openy_node/modules/openy_node_social_post/openy_node_social_post.install b/openy_node/modules/openy_node_social_post/openy_node_social_post.install index 88bd4d5b..cb8d5041 100644 --- a/openy_node/modules/openy_node_social_post/openy_node_social_post.install +++ b/openy_node/modules/openy_node_social_post/openy_node_social_post.install @@ -5,6 +5,9 @@ * Open Y Node Social Post install file. */ +/** + * + */ function openy_node_social_post_install() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_node_social_post') . '/config/install/'; // Import configurations using upgrade tool to avoid Upgrade tool conflicts. @@ -47,7 +50,7 @@ function openy_node_social_post_update_8002() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_node_social_post') . '/config/install/'; // Update multiple configurations. $configs = [ - 'core.entity_form_display.node.social_post.default' =>[ + 'core.entity_form_display.node.social_post.default' => [ 'content.field_link.settings.enabled_attributes', 'content.field_link.type', ], @@ -70,6 +73,6 @@ function openy_node_social_post_update_8004() { $config_importer = \Drupal::service('config_import.importer'); $config_importer->setDirectory($path); $config_importer->importConfigs([ - 'image.style.social_post_preview' + 'image.style.social_post_preview', ]); } diff --git a/openy_node/openy_node.install b/openy_node/openy_node.install index 351c0d3a..4c6dd590 100644 --- a/openy_node/openy_node.install +++ b/openy_node/openy_node.install @@ -5,20 +5,19 @@ * Open Y Node install file. */ - /** +/** * Implement hook_install(). */ function openy_node_install() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_node') . '/config/override/'; - // Import new configuration - $config_importer = \Drupal::service('openy_upgrade_tool.importer'); - $config_importer->setDirectory($config_dir); - $config_importer->importConfigs([ - 'metatag.metatag_defaults.node', - ]); + // Import new configuration. + $config_importer = \Drupal::service('openy_upgrade_tool.importer'); + $config_importer->setDirectory($config_dir); + $config_importer->importConfigs([ + 'metatag.metatag_defaults.node', + ]); } - /** * Implements hook_update_dependencies(). */ @@ -26,7 +25,7 @@ function openy_node_update_dependencies() { $dependencies['openy_node'] = [ 8003 => [ 'openy' => 8012, - ] + ], ]; return $dependencies; @@ -37,7 +36,7 @@ function openy_node_update_dependencies() { */ function openy_node_update_8001() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_node') . '/config/install/'; - // Import new configuration + // Import new configuration. $config_importer = \Drupal::service('openy_upgrade_tool.importer'); $config_importer->setDirectory($config_dir); $config_importer->importConfigs([ @@ -60,7 +59,7 @@ function openy_node_update_8002() { * Enable Metatag, Redirect and Simple Sitemap modules. */ function openy_node_update_8003() { - // Image Style & OG Meta tags defaults + // Image Style & OG Meta tags defaults. $config_dir = \Drupal::service('extension.list.module')->getPath('openy_node') . '/config/install'; $config_importer = \Drupal::service('openy_upgrade_tool.importer'); $config_importer->setDirectory($config_dir); @@ -73,10 +72,9 @@ function openy_node_update_8003() { $config_importer->setDirectory($config_dir); $config_importer->importConfigs([ - 'metatag.metatag_defaults.node' + 'metatag.metatag_defaults.node', ]); - $config = \Drupal::service('extension.list.module')->getPath('openy_node') . 'openy_node.info.yml'; $config_importer = \Drupal::service('openy_upgrade_tool.param_updater'); $config_importer->update($config, 'openy_node.info', 'dependencies'); @@ -87,7 +85,7 @@ function openy_node_update_8003() { */ function openy_node_update_8004() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_node') . '/config/install/'; - // Import new configuration + // Import new configuration. $config_importer = \Drupal::service('openy_upgrade_tool.importer'); $config_importer->setDirectory($config_dir); $config_importer->importConfigs([ @@ -147,6 +145,6 @@ function openy_node_update_8009() { $config_importer = \Drupal::service('config_import.importer'); $config_importer->setDirectory($path); $config_importer->importConfigs([ - 'image.style.facebook' + 'image.style.facebook', ]); } diff --git a/openy_node/openy_node.module b/openy_node/openy_node.module index 122302bf..a124f8a2 100644 --- a/openy_node/openy_node.module +++ b/openy_node/openy_node.module @@ -1,5 +1,9 @@ getStorage('view')->load('frontpage'); diff --git a/openy_node/src/BatchNodeUpdate.php b/openy_node/src/BatchNodeUpdate.php index ac1b032d..bc941777 100644 --- a/openy_node/src/BatchNodeUpdate.php +++ b/openy_node/src/BatchNodeUpdate.php @@ -1,12 +1,10 @@ setPublished(); $node->save(); - } elseif (!$status && $node->isPublished()) { + } + elseif (!$status && $node->isPublished()) { // Unpublish all Category nodes. $node->setUnPublished(); $node->save(); @@ -76,7 +75,8 @@ public static function finished($success, $results, $operations) { if ($success) { if ($results['status']) { $status = 'published'; - } else { + } + else { $status = 'unpublished'; } $message = \Drupal::translation()->formatPlural( @@ -88,9 +88,11 @@ public static function finished($success, $results, $operations) { '@status' => $status, ] ); - } else { + } + else { $message = t('There was an error updating @type.', ['@type' => $results['type']]); } $messenger->addMessage($message); } + } diff --git a/openy_prgf/modules/openy_prgf_1c/openy_prgf_1c.install b/openy_prgf/modules/openy_prgf_1c/openy_prgf_1c.install index 22d0aeaf..3c1f02ab 100644 --- a/openy_prgf/modules/openy_prgf_1c/openy_prgf_1c.install +++ b/openy_prgf/modules/openy_prgf_1c/openy_prgf_1c.install @@ -27,6 +27,7 @@ function openy_prgf_1c_update_8001() { /** * Change view mode for column field to full. + * * @see https://github.com/ymcatwincities/openy/issues/824 */ function openy_prgf_1c_update_8002() { diff --git a/openy_prgf/modules/openy_prgf_2c/openy_prgf_2c.install b/openy_prgf/modules/openy_prgf_2c/openy_prgf_2c.install index 1aff9bde..f7cd46c4 100644 --- a/openy_prgf/modules/openy_prgf_2c/openy_prgf_2c.install +++ b/openy_prgf/modules/openy_prgf_2c/openy_prgf_2c.install @@ -34,6 +34,7 @@ function openy_prgf_2c_update_8002() { /** * Change view mode for columns fields to full. + * * @see https://github.com/ymcatwincities/openy/issues/824 */ function openy_prgf_2c_update_8003() { diff --git a/openy_prgf/modules/openy_prgf_4c/openy_prgf_4c.install b/openy_prgf/modules/openy_prgf_4c/openy_prgf_4c.install index 73295e3f..c7cc9c32 100644 --- a/openy_prgf/modules/openy_prgf_4c/openy_prgf_4c.install +++ b/openy_prgf/modules/openy_prgf_4c/openy_prgf_4c.install @@ -36,6 +36,7 @@ function openy_prgf_4c_update_8003() { /** * Change view mode for columns fields to full. + * * @see https://github.com/ymcatwincities/openy/issues/824 */ function openy_prgf_4c_update_8004() { @@ -73,7 +74,7 @@ function openy_prgf_4c_update_8006() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_prgf_4c') . '/config/install/'; // Update multiple configurations. $configs = [ - 'core.entity_form_display.paragraph.4c.default' =>[ + 'core.entity_form_display.paragraph.4c.default' => [ 'content.field_prgf_4c_button.settings.enabled_attributes', 'content.field_prgf_4c_button.type', ], diff --git a/openy_prgf/modules/openy_prgf_banner/openy_prgf_banner.install b/openy_prgf/modules/openy_prgf_banner/openy_prgf_banner.install index 3752a957..e7df62c7 100644 --- a/openy_prgf/modules/openy_prgf_banner/openy_prgf_banner.install +++ b/openy_prgf/modules/openy_prgf_banner/openy_prgf_banner.install @@ -28,7 +28,7 @@ function openy_prgf_banner_update_8001() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_prgf_banner') . '/config/install/'; // Update multiple configurations. $configs = [ - 'core.entity_form_display.paragraph.banner.default' =>[ + 'core.entity_form_display.paragraph.banner.default' => [ 'dependencies.config', ], 'core.entity_view_display.paragraph.banner.default' => [ @@ -44,6 +44,7 @@ function openy_prgf_banner_update_8001() { } } } + /** * Update description for fields. */ @@ -85,7 +86,7 @@ function openy_prgf_banner_update_8003() { * Update entity reference for field image. */ function openy_prgf_banner_update_8004() { - // This is outdated update and exist in next hooks, no need to import config twice. + // This is outdated update and exist in next hooks, no need to import config twice. } /** @@ -173,7 +174,7 @@ function openy_prgf_banner_update_8009() { 'paragraphs.paragraphs_type.banner', 'core.entity_form_display.paragraph.banner.default', 'image.style.prgf_banner', - 'crop.type.crop_960_600' + 'crop.type.crop_960_600', ]); } @@ -184,7 +185,7 @@ function openy_prgf_banner_update_8010() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_prgf_banner') . '/config/install/'; // Update multiple configurations. $configs = [ - 'core.entity_form_display.paragraph.banner.default' =>[ + 'core.entity_form_display.paragraph.banner.default' => [ 'content.field_prgf_link.settings.enabled_attributes', 'content.field_prgf_link.type', ], @@ -208,7 +209,7 @@ function openy_prgf_banner_update_8011() { $config_importer = \Drupal::service('openy_upgrade_tool.importer'); $config_importer->setDirectory($config_dir); $config_importer->importConfigs([ - 'image.style.carnation_banner_1920_700' + 'image.style.carnation_banner_1920_700', ]); } @@ -221,6 +222,6 @@ function openy_prgf_banner_update_8013() { $config_importer->setDirectory($path); $config_importer->importConfigs([ 'image.style.carnation_banner_1920_700', - 'image.style.prgf_banner' + 'image.style.prgf_banner', ]); } diff --git a/openy_prgf/modules/openy_prgf_blog_branch/openy_prgf_blog_branch.install b/openy_prgf/modules/openy_prgf_blog_branch/openy_prgf_blog_branch.install index 9f1c2962..1e72b38c 100644 --- a/openy_prgf/modules/openy_prgf_blog_branch/openy_prgf_blog_branch.install +++ b/openy_prgf/modules/openy_prgf_blog_branch/openy_prgf_blog_branch.install @@ -9,7 +9,7 @@ * Update Paragraph Latest Blog Posts (Branch) field_prgf_block. */ function openy_prgf_blog_branch_update_8001() { - // This is outdated update and exist in next hooks, no need to import config twice. + // This is outdated update and exist in next hooks, no need to import config twice. } /** diff --git a/openy_prgf/modules/openy_prgf_blog_camp/openy_prgf_blog_camp.install b/openy_prgf/modules/openy_prgf_blog_camp/openy_prgf_blog_camp.install index f87b5086..6256cd8f 100644 --- a/openy_prgf/modules/openy_prgf_blog_camp/openy_prgf_blog_camp.install +++ b/openy_prgf/modules/openy_prgf_blog_camp/openy_prgf_blog_camp.install @@ -9,7 +9,7 @@ * Update Paragraph Latest Blog Posts (Camp) field_prgf_block. */ function openy_prgf_blog_camp_update_8001() { - // This is outdated update and exist in next hooks, no need to import config twice. + // This is outdated update and exist in next hooks, no need to import config twice. } /** diff --git a/openy_prgf/modules/openy_prgf_blog_listing/openy_prgf_blog_listing.install b/openy_prgf/modules/openy_prgf_blog_listing/openy_prgf_blog_listing.install index 795657ee..d3ca0916 100644 --- a/openy_prgf/modules/openy_prgf_blog_listing/openy_prgf_blog_listing.install +++ b/openy_prgf/modules/openy_prgf_blog_listing/openy_prgf_blog_listing.install @@ -29,7 +29,7 @@ function openy_prgf_blog_listing_update_8002() { // Update multiple configurations. $configs = [ - 'core.entity_view_display.paragraph.blog_posts_listing.default' =>[ + 'core.entity_view_display.paragraph.blog_posts_listing.default' => [ 'content.field_prgf_block.region', ], ]; @@ -50,7 +50,7 @@ function openy_prgf_blog_listing_update_8003() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_prgf_blog_listing'); $config_dir .= '/config/install/'; - // Import new configuration + // Import new configuration. $config_importer = \Drupal::service('openy_upgrade_tool.importer'); $config_importer->setDirectory($config_dir); $config_importer->importConfigs([ diff --git a/openy_prgf/modules/openy_prgf_blog_listing/openy_prgf_blog_listing.module b/openy_prgf/modules/openy_prgf_blog_listing/openy_prgf_blog_listing.module index 2fd1cc5f..3be3675d 100644 --- a/openy_prgf/modules/openy_prgf_blog_listing/openy_prgf_blog_listing.module +++ b/openy_prgf/modules/openy_prgf_blog_listing/openy_prgf_blog_listing.module @@ -5,10 +5,12 @@ * OpenY Paragraph Blog Listing module file. */ +use Drupal\Core\Form\FormStateInterface; + /** * Implements hook_form_alter(). */ -function openy_prgf_blog_listing_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $form_state, $form_id) { +function openy_prgf_blog_listing_form_alter(&$form, FormStateInterface $form_state, $form_id) { if ($form['#id'] == 'views-exposed-form-listing-blog-posts-block') { $form['combine']['#attributes']['placeholder'] = t('Search the blog...'); } diff --git a/openy_prgf/modules/openy_prgf_camp_menu/openy_prgf_camp_menu.install b/openy_prgf/modules/openy_prgf_camp_menu/openy_prgf_camp_menu.install index 75a6e2e8..03cba1ec 100644 --- a/openy_prgf/modules/openy_prgf_camp_menu/openy_prgf_camp_menu.install +++ b/openy_prgf/modules/openy_prgf_camp_menu/openy_prgf_camp_menu.install @@ -15,7 +15,6 @@ function openy_prgf_camp_menu_uninstall() { ->removeEntityBundle('paragraph', 'paragraphs_type', 'camp_menu'); } - /** * Update Paragraph Camp Menu field_prgf_block. */ diff --git a/openy_prgf/modules/openy_prgf_camp_menu/src/Plugin/Block/CampMenu.php b/openy_prgf/modules/openy_prgf_camp_menu/src/Plugin/Block/CampMenu.php index 4d855be9..82e55143 100644 --- a/openy_prgf/modules/openy_prgf_camp_menu/src/Plugin/Block/CampMenu.php +++ b/openy_prgf/modules/openy_prgf_camp_menu/src/Plugin/Block/CampMenu.php @@ -8,7 +8,6 @@ use Drupal\Core\Routing\RouteMatchInterface; use Drupal\Core\Url; use Drupal\Core\Link; -use Drupal\node\NodeInterface; use Drupal\openy_prgf_camp_menu\CampMenuServiceInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -46,9 +45,9 @@ class CampMenu extends BlockBase implements ContainerFactoryPluginInterface { * The plugin ID for the plugin instance. * @param mixed $plugin_definition * The plugin implementation definition. - * @param CampMenuServiceInterface $camp_menu_service + * @param \Drupal\openy_prgf_camp_menu\CampMenuServiceInterface $camp_menu_service * The Camp menu service. - * @param RouteMatchInterface $route_match + * @param \Drupal\Core\Routing\RouteMatchInterface $route_match * The Camp menu service. */ public function __construct(array $configuration, $plugin_id, $plugin_definition, CampMenuServiceInterface $camp_menu_service, RouteMatchInterface $route_match) { @@ -84,7 +83,7 @@ public function build() { return []; } - /* @var NodeInterface $camp */ + /** @var NodeInterface $camp */ $camp = $this->campMenuService->getNodeCampNode($node); $tags = $camp->getCacheTags(); if ($node != $camp) { diff --git a/openy_prgf/modules/openy_prgf_categories_listing/openy_prgf_categories_listing.install b/openy_prgf/modules/openy_prgf_categories_listing/openy_prgf_categories_listing.install index 7a9e53c5..a55b5efb 100644 --- a/openy_prgf/modules/openy_prgf_categories_listing/openy_prgf_categories_listing.install +++ b/openy_prgf/modules/openy_prgf_categories_listing/openy_prgf_categories_listing.install @@ -14,7 +14,7 @@ function openy_prgf_categories_listing_update_8001() { // Update multiple configurations. $configs = [ - 'core.entity_view_display.paragraph.categories_listing.default' =>[ + 'core.entity_view_display.paragraph.categories_listing.default' => [ 'content.field_prgf_block.region', ], ]; diff --git a/openy_prgf/modules/openy_prgf_class_location/openy_prgf_class_location.install b/openy_prgf/modules/openy_prgf_class_location/openy_prgf_class_location.install index 6ac25274..598e002e 100644 --- a/openy_prgf/modules/openy_prgf_class_location/openy_prgf_class_location.install +++ b/openy_prgf/modules/openy_prgf_class_location/openy_prgf_class_location.install @@ -1,7 +1,8 @@ getPath('openy_prgf_class_location') . '/config/install/'; - // Import new configuration + // Import new configuration. $config_importer = \Drupal::service('openy_upgrade_tool.importer'); $config_importer->setDirectory($config_dir); $config_importer->importConfigs([ diff --git a/openy_prgf/modules/openy_prgf_class_location/openy_prgf_class_location.module b/openy_prgf/modules/openy_prgf_class_location/openy_prgf_class_location.module index a880fbed..c6a4667a 100644 --- a/openy_prgf/modules/openy_prgf_class_location/openy_prgf_class_location.module +++ b/openy_prgf/modules/openy_prgf_class_location/openy_prgf_class_location.module @@ -1,7 +1,8 @@ classLocationService->getLocationNode($location_id), 'Drupal\node\Entity\Node')) { $viewBuilder = $this->entityTypeManager->getViewBuilder('node'); $location_renderable = $viewBuilder->view($location, 'class_location'); diff --git a/openy_prgf/modules/openy_prgf_class_sessions/openy_prgf_class_sessions.module b/openy_prgf/modules/openy_prgf_class_sessions/openy_prgf_class_sessions.module index ff319f9d..ae6aee64 100644 --- a/openy_prgf/modules/openy_prgf_class_sessions/openy_prgf_class_sessions.module +++ b/openy_prgf/modules/openy_prgf_class_sessions/openy_prgf_class_sessions.module @@ -1,7 +1,8 @@ getLocation(), 'Drupal\node\Entity\Node')) { @@ -82,7 +81,7 @@ public function getSessionInstancesRows($session_instances, &$tags) { $tags_location = $location->getCacheTags(); $tags = Cache::mergeTags($tags, $tags_location); - // Add session cache tags + // Add session cache tags. $tags_session = $session->getCacheTags(); $tags = Cache::mergeTags($tags, $tags_session); @@ -111,12 +110,12 @@ public function getSessionInstancesRows($session_instances, &$tags) { 'in_membership' => $this->getSessionInMembership($session), ]; - // Min Age + // Min Age. if (!empty($session_instance->get('min_age')->value)) { $row['age_min'] = $session_instance->get('min_age')->value; } - // Max Age + // Max Age. if (!empty($session_instance->get('max_age')->value)) { $row['age_max'] = $session_instance->get('max_age')->value; } diff --git a/openy_prgf/modules/openy_prgf_class_sessions/src/ClassSessionsServiceInterface.php b/openy_prgf/modules/openy_prgf_class_sessions/src/ClassSessionsServiceInterface.php index 3221a159..57d76efd 100644 --- a/openy_prgf/modules/openy_prgf_class_sessions/src/ClassSessionsServiceInterface.php +++ b/openy_prgf/modules/openy_prgf_class_sessions/src/ClassSessionsServiceInterface.php @@ -3,7 +3,6 @@ namespace Drupal\openy_prgf_class_sessions; use Drupal\node\NodeInterface; -use Drupal\openy_session_instance\Entity\SessionInstance; /** * Class ClassSessionsService. @@ -32,7 +31,7 @@ public function getClassNodeSessionInstances(NodeInterface $node, $conditions = * @param array $session_instances * Array of \Drupal\openy_session_instance\Entity\SessionInstance. * - * @param $tags string[] + * @param string[] $tags * Cache tags array. * * @return array @@ -43,7 +42,7 @@ public function getSessionInstancesRows($session_instances, &$tags); /** * Build render array of registation link. * - * @param $session \Drupal\node\Entity\Node + * @param \Drupal\node\Entity\Node $session * * @return null|Link */ @@ -52,7 +51,7 @@ public function getSessionRegistrationLink($session); /** * Get session online value. * - * @param $session \Drupal\node\Entity\Node + * @param \Drupal\node\Entity\Node $session * * @return bool */ @@ -61,7 +60,7 @@ public function getSessionOnlineRegistration($session); /** * Get session ticket value. * - * @param $session \Drupal\node\Entity\Node + * @param \Drupal\node\Entity\Node $session * * @return bool */ @@ -70,7 +69,7 @@ public function getSessionTicketRequired($session); /** * Get in membership value. * - * @param $session \Drupal\node\Entity\Node + * @param \Drupal\node\Entity\Node $session * * @return bool */ diff --git a/openy_prgf/modules/openy_prgf_class_sessions/src/Plugin/Block/ClassSessions.php b/openy_prgf/modules/openy_prgf_class_sessions/src/Plugin/Block/ClassSessions.php index 26bbed8d..5a16a146 100644 --- a/openy_prgf/modules/openy_prgf_class_sessions/src/Plugin/Block/ClassSessions.php +++ b/openy_prgf/modules/openy_prgf_class_sessions/src/Plugin/Block/ClassSessions.php @@ -43,9 +43,9 @@ class ClassSessions extends BlockBase implements ContainerFactoryPluginInterface * The plugin ID for the plugin instance. * @param mixed $plugin_definition * The plugin implementation definition. - * @param ClassSessionsServiceInterface $class_sessions_service + * @param \Drupal\openy_prgf_class_sessions\ClassSessionsServiceInterface $class_sessions_service * The Class Sessions service. - * @param RouteMatchInterface $route_match + * @param \Drupal\Core\Routing\RouteMatchInterface $route_match * The Route match service. */ public function __construct(array $configuration, $plugin_id, $plugin_definition, ClassSessionsServiceInterface $class_sessions_service, RouteMatchInterface $route_match) { @@ -119,6 +119,9 @@ public function build() { return $class_sessions; } + /** + * + */ private function getQueryParamInt($param) { // Get request object for query param. $request = \Drupal::request(); diff --git a/openy_prgf/modules/openy_prgf_classes_listing/openy_prgf_classes_listing.module b/openy_prgf/modules/openy_prgf_classes_listing/openy_prgf_classes_listing.module index 75caea2a..8beec6c4 100644 --- a/openy_prgf/modules/openy_prgf_classes_listing/openy_prgf_classes_listing.module +++ b/openy_prgf/modules/openy_prgf_classes_listing/openy_prgf_classes_listing.module @@ -1,9 +1,12 @@ 'camps', ]; - $query = \Drupal::entityQuery('node')->accessCheck(FALSE) + $query = \Drupal::entityQuery('node')->accessCheck(FALSE) ->condition('status', 1) ->condition('type', ['branch', 'camp'], 'IN'); $entity_ids = $query->execute(); - $nodes = \Drupal\node\Entity\Node::loadMultiple($entity_ids); + $nodes = Node::loadMultiple($entity_ids); foreach ($nodes as $id => $node) { $options[$map[$node->bundle()]][$id] = $node->getTitle(); diff --git a/openy_prgf/modules/openy_prgf_embedded_groupexpro_schedule/openy_prgf_embedded_groupexpro_schedule.install b/openy_prgf/modules/openy_prgf_embedded_groupexpro_schedule/openy_prgf_embedded_groupexpro_schedule.install index 4802b718..35d657dd 100644 --- a/openy_prgf/modules/openy_prgf_embedded_groupexpro_schedule/openy_prgf_embedded_groupexpro_schedule.install +++ b/openy_prgf/modules/openy_prgf_embedded_groupexpro_schedule/openy_prgf_embedded_groupexpro_schedule.install @@ -35,7 +35,8 @@ function openy_prgf_embedded_groupexpro_schedule_update_8001() { * Enable openy_gxp if not enabled. */ function openy_prgf_embedded_groupexpro_schedule_update_8002() { - $module_handler = \Drupal::moduleHandler();; + $module_handler = \Drupal::moduleHandler(); + ; if ($module_handler->moduleExists('openy_gxp')) { return; } diff --git a/openy_prgf/modules/openy_prgf_event_latest/openy_prgf_event_latest.install b/openy_prgf/modules/openy_prgf_event_latest/openy_prgf_event_latest.install index 65b13b5b..a38ad93e 100644 --- a/openy_prgf/modules/openy_prgf_event_latest/openy_prgf_event_latest.install +++ b/openy_prgf/modules/openy_prgf_event_latest/openy_prgf_event_latest.install @@ -13,7 +13,7 @@ function openy_prgf_event_latest_update_8001() { $config_importer = \Drupal::service('openy_upgrade_tool.importer'); $config_importer->setDirectory($config_dir); $config_importer->importConfigs([ - 'views.view.latest_event_posts' + 'views.view.latest_event_posts', ]); } @@ -25,6 +25,6 @@ function openy_prgf_event_latest_update_8002() { $config_importer = \Drupal::service('openy_upgrade_tool.importer'); $config_importer->setDirectory($config_dir); $config_importer->importConfigs([ - 'views.view.latest_event_posts' + 'views.view.latest_event_posts', ]); } diff --git a/openy_prgf/modules/openy_prgf_event_listing/openy_prgf_event_listing.install b/openy_prgf/modules/openy_prgf_event_listing/openy_prgf_event_listing.install index a5000e08..bc1fa86b 100644 --- a/openy_prgf/modules/openy_prgf_event_listing/openy_prgf_event_listing.install +++ b/openy_prgf/modules/openy_prgf_event_listing/openy_prgf_event_listing.install @@ -26,7 +26,7 @@ function openy_prgf_event_listing_update_8002() { $config_importer->setDirectory($config_dir); $config_importer->importConfigs([ 'paragraphs.paragraphs_type.event_posts_listing', - 'views.view.listing_event_posts' + 'views.view.listing_event_posts', ]); } @@ -38,6 +38,6 @@ function openy_prgf_event_listing_update_8003() { $config_importer = \Drupal::service('openy_upgrade_tool.importer'); $config_importer->setDirectory($config_dir); $config_importer->importConfigs([ - 'views.view.listing_event_posts' + 'views.view.listing_event_posts', ]); } diff --git a/openy_prgf/modules/openy_prgf_event_listing/openy_prgf_event_listing.module b/openy_prgf/modules/openy_prgf_event_listing/openy_prgf_event_listing.module index 33b38698..46a75558 100644 --- a/openy_prgf/modules/openy_prgf_event_listing/openy_prgf_event_listing.module +++ b/openy_prgf/modules/openy_prgf_event_listing/openy_prgf_event_listing.module @@ -1,9 +1,19 @@ getStorage(); /** @var \Drupal\views\Entity\View $view */ $view = $storage['view']; @@ -11,8 +21,8 @@ function openy_prgf_event_listing_form_views_exposed_form_alter(&$form, \Drupal\ return; } - // Add placeholder to views exposed form + // Add placeholder to views exposed form. if ($view->id() == 'listing_event_posts' && $view->current_display == 'events_listing_block') { $form['combine']['#attributes']['placeholder'] = t('Search the events...'); } -} \ No newline at end of file +} diff --git a/openy_prgf/modules/openy_prgf_faq/openy_prgf_faq.install b/openy_prgf/modules/openy_prgf_faq/openy_prgf_faq.install index 1ad6742c..c01f85ad 100644 --- a/openy_prgf/modules/openy_prgf_faq/openy_prgf_faq.install +++ b/openy_prgf/modules/openy_prgf_faq/openy_prgf_faq.install @@ -5,7 +5,6 @@ * OpenY Paragraph FAQ install file. */ - /** * Update config for OpenY FAQ paragraph after decoupling. */ @@ -27,7 +26,7 @@ function openy_prgf_faq_update_8001() { ], 'field.storage.paragraph.field_qa' => [ 'dependencies.module', - 'module' + 'module', ], ]; diff --git a/openy_prgf/modules/openy_prgf_featured_content/openy_prgf_featured_content.install b/openy_prgf/modules/openy_prgf_featured_content/openy_prgf_featured_content.install index c6c904f4..c0fd0d3f 100644 --- a/openy_prgf/modules/openy_prgf_featured_content/openy_prgf_featured_content.install +++ b/openy_prgf/modules/openy_prgf_featured_content/openy_prgf_featured_content.install @@ -12,7 +12,7 @@ function openy_prgf_featured_content_update_8001() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_prgf_featured_content') . '/config/install/'; // Update multiple configurations. $configs = [ - 'core.entity_form_display.paragraph.featured_content.default' =>[ + 'core.entity_form_display.paragraph.featured_content.default' => [ 'content.field_prgf_headline.settings.placeholder', 'content.field_prgf_link.settings.placeholder_url', 'content.field_prgf_link.settings.placeholder_title', @@ -50,7 +50,7 @@ function openy_prgf_featured_content_update_8002() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_prgf_featured_content') . '/config/install/'; // Update multiple configurations. $configs = [ - 'core.entity_form_display.paragraph.featured_content.default' =>[ + 'core.entity_form_display.paragraph.featured_content.default' => [ 'content.field_prgf_link.settings.enabled_attributes', 'content.field_prgf_link.type', ], diff --git a/openy_prgf/modules/openy_prgf_featured_highlights/openy_prgf_featured_highlights.info.yml b/openy_prgf/modules/openy_prgf_featured_highlights/openy_prgf_featured_highlights.info.yml index ce6c0046..5bad4b49 100644 --- a/openy_prgf/modules/openy_prgf_featured_highlights/openy_prgf_featured_highlights.info.yml +++ b/openy_prgf/modules/openy_prgf_featured_highlights/openy_prgf_featured_highlights.info.yml @@ -15,4 +15,3 @@ dependencies: - openy_prgf:openy_prgf - options:options - paragraphs:paragraphs - diff --git a/openy_prgf/modules/openy_prgf_featured_highlights/openy_prgf_featured_highlights.module b/openy_prgf/modules/openy_prgf_featured_highlights/openy_prgf_featured_highlights.module index 53a82470..35848b1b 100644 --- a/openy_prgf/modules/openy_prgf_featured_highlights/openy_prgf_featured_highlights.module +++ b/openy_prgf/modules/openy_prgf_featured_highlights/openy_prgf_featured_highlights.module @@ -53,12 +53,15 @@ function openy_prgf_featured_highlights_preprocess_paragraph(&$variables) { case 'featured_highlights_block': $variables['content']['field_prgf_block_ref_unlim'][$key]['#theme'] = 'openy_featured_highlights_block'; break; + case 'basic_block': $variables['content']['field_prgf_block_ref_unlim'][$key]['#theme'] = 'openy_basic_block'; break; + case 'simple_block': $variables['content']['field_prgf_block_ref_unlim'][$key]['#theme'] = 'openy_simple_block'; break; + case 'date_block': $variables['content']['field_prgf_block_ref_unlim'][$key]['#theme'] = 'openy_date_block'; break; diff --git a/openy_prgf/modules/openy_prgf_gallery/openy_prgf_gallery.install b/openy_prgf/modules/openy_prgf_gallery/openy_prgf_gallery.install index dc38b2a3..a95100ea 100644 --- a/openy_prgf/modules/openy_prgf_gallery/openy_prgf_gallery.install +++ b/openy_prgf/modules/openy_prgf_gallery/openy_prgf_gallery.install @@ -75,7 +75,7 @@ function openy_prgf_gallery_update_8004() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_prgf_gallery') . '/config/install/'; // Update multiple configurations. $configs = [ - 'image.style.prgf_gallery' =>[ + 'image.style.prgf_gallery' => [ 'dependencies', 'effects', ], @@ -102,7 +102,7 @@ function openy_prgf_gallery_update_8005() { 'paragraphs.paragraphs_type.gallery', 'core.entity_form_display.paragraph.gallery.default', 'image.style.prgf_gallery', - 'crop.type.crop_1920_700' + 'crop.type.crop_1920_700', ]); } @@ -113,7 +113,7 @@ function openy_prgf_gallery_update_8006() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_prgf_gallery') . '/config/install/'; // Update multiple configurations. $configs = [ - 'core.entity_form_display.paragraph.gallery.default' =>[ + 'core.entity_form_display.paragraph.gallery.default' => [ 'content.field_prgf_link.settings.enabled_attributes', 'content.field_prgf_link.type', ], @@ -169,7 +169,7 @@ function openy_prgf_gallery_update_8010() { $config_importer = \Drupal::service('config_import.importer'); $config_importer->setDirectory($path); $config_importer->importConfigs([ - 'image.style.gallery_thumbnail' + 'image.style.gallery_thumbnail', ]); } @@ -181,18 +181,18 @@ function openy_prgf_gallery_update_8012() { $config_importer = \Drupal::service('config_import.importer'); $config_importer->setDirectory($path); $config_importer->importConfigs([ - 'image.style.prgf_gallery' + 'image.style.prgf_gallery', ]); } /** - * Update Open Y paragraph Gallery - field image is required + * Update Open Y paragraph Gallery - field image is required. */ function openy_prgf_gallery_update_8013() { $path = \Drupal::service('extension.list.module')->getPath('openy_prgf_gallery') . '/config/install'; $config_importer = \Drupal::service('config_import.importer'); $config_importer->setDirectory($path); $config_importer->importConfigs([ - 'field.field.paragraph.gallery.field_prgf_images' + 'field.field.paragraph.gallery.field_prgf_images', ]); } diff --git a/openy_prgf/modules/openy_prgf_grid_content/openy_prgf_grid_content.install b/openy_prgf/modules/openy_prgf_grid_content/openy_prgf_grid_content.install index ed5cc411..6515f369 100644 --- a/openy_prgf/modules/openy_prgf_grid_content/openy_prgf_grid_content.install +++ b/openy_prgf/modules/openy_prgf_grid_content/openy_prgf_grid_content.install @@ -79,7 +79,7 @@ function openy_prgf_grid_content_update_8003() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_prgf_grid_content') . '/config/install/'; // Update multiple configurations. $configs = [ - 'core.entity_form_display.paragraph.grid_columns.default' =>[ + 'core.entity_form_display.paragraph.grid_columns.default' => [ 'content.field_prgf_clm_link.settings.enabled_attributes', 'content.field_prgf_clm_link.type', ], diff --git a/openy_prgf/modules/openy_prgf_group_schedules/openy_prgf_group_schedules.install b/openy_prgf/modules/openy_prgf_group_schedules/openy_prgf_group_schedules.install index d6daa8be..f60b9fe1 100644 --- a/openy_prgf/modules/openy_prgf_group_schedules/openy_prgf_group_schedules.install +++ b/openy_prgf/modules/openy_prgf_group_schedules/openy_prgf_group_schedules.install @@ -34,7 +34,8 @@ function openy_prgf_group_schedules_update_8001() { * Enable openy_gxp if not enabled. */ function openy_prgf_group_schedules_update_8002() { - $module_handler = \Drupal::moduleHandler();; + $module_handler = \Drupal::moduleHandler(); + ; if ($module_handler->moduleExists('openy_gxp')) { return; } diff --git a/openy_prgf/modules/openy_prgf_loc_finder/openy_prgf_loc_finder.install b/openy_prgf/modules/openy_prgf_loc_finder/openy_prgf_loc_finder.install index fd4dbfc8..8aecd65f 100644 --- a/openy_prgf/modules/openy_prgf_loc_finder/openy_prgf_loc_finder.install +++ b/openy_prgf/modules/openy_prgf_loc_finder/openy_prgf_loc_finder.install @@ -45,7 +45,7 @@ function openy_prgf_loc_finder_update_8003() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_prgf_loc_finder') . '/config/install/'; // Update multiple configurations. $configs = [ - 'field.field.paragraph.prgf_location_finder.field_prgf_location_finder' =>[ + 'field.field.paragraph.prgf_location_finder.field_prgf_location_finder' => [ 'description', ], 'field.field.paragraph.prgf_location_finder_filters.field_prgf_lf_tags_style' => [ diff --git a/openy_prgf/modules/openy_prgf_lto/openy_prgf_lto.install b/openy_prgf/modules/openy_prgf_lto/openy_prgf_lto.install index da1a7a02..85cf69b9 100644 --- a/openy_prgf/modules/openy_prgf_lto/openy_prgf_lto.install +++ b/openy_prgf/modules/openy_prgf_lto/openy_prgf_lto.install @@ -12,7 +12,7 @@ function openy_prgf_lto_update_8001() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_prgf_lto') . '/config/install/'; // Update multiple configurations. $configs = [ - 'core.entity_form_display.paragraph.lto.default' =>[ + 'core.entity_form_display.paragraph.lto.default' => [ 'content.field_link.settings.enabled_attributes', 'content.field_link.type', 'content.field_lto_link.settings.enabled_attributes', diff --git a/openy_prgf/modules/openy_prgf_mbrshp_calc/openy_prgf_mbrshp_calc.install b/openy_prgf/modules/openy_prgf_mbrshp_calc/openy_prgf_mbrshp_calc.install index 503f557b..0bcd3e38 100644 --- a/openy_prgf/modules/openy_prgf_mbrshp_calc/openy_prgf_mbrshp_calc.install +++ b/openy_prgf/modules/openy_prgf_mbrshp_calc/openy_prgf_mbrshp_calc.install @@ -89,6 +89,6 @@ function openy_prgf_mbrshp_calc_update_8006() { $config_importer->setDirectory($path); $config_importer->importConfigs([ 'image.style.node_mbrshp_calc_preview', - 'image.style.node_mbrshp_calc_summary' + 'image.style.node_mbrshp_calc_summary', ]); } diff --git a/openy_prgf/modules/openy_prgf_news_listing/openy_prgf_news_listing.module b/openy_prgf/modules/openy_prgf_news_listing/openy_prgf_news_listing.module index 0eeb6167..c8674532 100644 --- a/openy_prgf/modules/openy_prgf_news_listing/openy_prgf_news_listing.module +++ b/openy_prgf/modules/openy_prgf_news_listing/openy_prgf_news_listing.module @@ -5,10 +5,12 @@ * OpenY Paragraph News Listing module file. */ +use Drupal\Core\Form\FormStateInterface; + /** * Implements hook_form_alter(). */ -function openy_prgf_news_listing_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $form_state, $form_id) { +function openy_prgf_news_listing_form_alter(&$form, FormStateInterface $form_state, $form_id) { if ($form['#id'] == 'views-exposed-form-listing-news-posts-block') { $form['combine']['#attributes']['placeholder'] = t('Search the news...'); } diff --git a/openy_prgf/modules/openy_prgf_pgm_reg/openy_prgf_pgm_reg.module b/openy_prgf/modules/openy_prgf_pgm_reg/openy_prgf_pgm_reg.module index bffb195f..40b5ad77 100644 --- a/openy_prgf/modules/openy_prgf_pgm_reg/openy_prgf_pgm_reg.module +++ b/openy_prgf/modules/openy_prgf_pgm_reg/openy_prgf_pgm_reg.module @@ -1,5 +1,9 @@ getPath('openy_prgf_promo_card') . '/config/install/'; // Update multiple configurations. $configs = [ - 'core.entity_form_display.paragraph.promo_card.default' =>[ + 'core.entity_form_display.paragraph.promo_card.default' => [ 'content.field_prgf_link.settings.enabled_attributes', 'content.field_prgf_link.type', ], diff --git a/openy_prgf/modules/openy_prgf_repeat_schedules/openy_prgf_repeat_schedules.install b/openy_prgf/modules/openy_prgf_repeat_schedules/openy_prgf_repeat_schedules.install index 77536490..6500fd1d 100644 --- a/openy_prgf/modules/openy_prgf_repeat_schedules/openy_prgf_repeat_schedules.install +++ b/openy_prgf/modules/openy_prgf_repeat_schedules/openy_prgf_repeat_schedules.install @@ -60,7 +60,7 @@ function openy_prgf_repeat_schedules_update_8004() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_prgf_repeat_schedules') . '/config/install/'; // Update multiple configurations. $configs = [ - 'core.entity_form_display.paragraph.repeat_schedules.default' =>[ + 'core.entity_form_display.paragraph.repeat_schedules.default' => [ 'content.field_prgf_repeat_schedules_pdf.settings.enabled_attributes', 'content.field_prgf_repeat_schedules_pdf.type', ], @@ -82,7 +82,7 @@ function openy_prgf_repeat_schedules_update_8005() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_prgf_repeat_schedules') . '/config/install/'; // Update multiple configurations. $configs = [ - 'field.field.paragraph.repeat_schedules.field_prgf_repeat_loc' =>[ + 'field.field.paragraph.repeat_schedules.field_prgf_repeat_loc' => [ 'settings', ], ]; diff --git a/openy_prgf/modules/openy_prgf_small_banner/openy_prgf_small_banner.install b/openy_prgf/modules/openy_prgf_small_banner/openy_prgf_small_banner.install index f061d3d3..a1646499 100644 --- a/openy_prgf/modules/openy_prgf_small_banner/openy_prgf_small_banner.install +++ b/openy_prgf/modules/openy_prgf_small_banner/openy_prgf_small_banner.install @@ -26,7 +26,7 @@ function openy_prgf_small_banner_dependencies() { */ function openy_prgf_small_banner_update_8001() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_prgf_small_banner') . '/config/install/'; - // Import new configuration + // Import new configuration. $config_importer = \Drupal::service('openy_upgrade_tool.importer'); $config_importer->setDirectory($config_dir); $config_importer->importConfigs([ @@ -35,7 +35,7 @@ function openy_prgf_small_banner_update_8001() { // Update multiple configurations. $configs = [ - 'core.entity_form_display.paragraph.small_banner.default' =>[ + 'core.entity_form_display.paragraph.small_banner.default' => [ 'dependencies.config', 'content.field_prgf_description', 'content.field_prgf_color.weight', @@ -182,7 +182,7 @@ function openy_prgf_small_banner_update_8008() { 'paragraphs.paragraphs_type.small_banner', 'core.entity_form_display.paragraph.small_banner.default', 'crop.type.crop_760_400', - 'image.style.prgf_small_banner' + 'image.style.prgf_small_banner', ]); } @@ -194,6 +194,6 @@ function openy_prgf_small_banner_update_8010() { $config_importer = \Drupal::service('config_import.importer'); $config_importer->setDirectory($path); $config_importer->importConfigs([ - 'image.style.prgf_small_banner' + 'image.style.prgf_small_banner', ]); } diff --git a/openy_prgf/modules/openy_prgf_story_card/openy_prgf_story_card.install b/openy_prgf/modules/openy_prgf_story_card/openy_prgf_story_card.install index be27f288..105e1e3a 100644 --- a/openy_prgf/modules/openy_prgf_story_card/openy_prgf_story_card.install +++ b/openy_prgf/modules/openy_prgf_story_card/openy_prgf_story_card.install @@ -12,7 +12,7 @@ function openy_prgf_story_card_update_8001() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_prgf_story_card') . '/config/install/'; // Update multiple configurations. $configs = [ - 'core.entity_form_display.paragraph.story_card.default' =>[ + 'core.entity_form_display.paragraph.story_card.default' => [ 'content.field_prgf_link.settings.enabled_attributes', 'content.field_prgf_link.type', ], diff --git a/openy_prgf/modules/openy_prgf_teaser/openy_prgf_teaser.install b/openy_prgf/modules/openy_prgf_teaser/openy_prgf_teaser.install index d67e53a3..275eb385 100644 --- a/openy_prgf/modules/openy_prgf_teaser/openy_prgf_teaser.install +++ b/openy_prgf/modules/openy_prgf_teaser/openy_prgf_teaser.install @@ -105,7 +105,7 @@ function openy_prgf_teaser_update_8005() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_prgf_teaser') . '/config/install/'; // Update multiple configurations. $configs = [ - 'image.style.prgf_teaser' =>[ + 'image.style.prgf_teaser' => [ 'dependencies', 'effects', ], @@ -143,7 +143,7 @@ function openy_prgf_teaser_update_8007() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_prgf_teaser') . '/config/install/'; // Update multiple configurations. $configs = [ - 'core.entity_form_display.paragraph.teaser.default' =>[ + 'core.entity_form_display.paragraph.teaser.default' => [ 'content.field_prgf_link.settings.enabled_attributes', 'content.field_prgf_link.type', ], @@ -203,18 +203,18 @@ function openy_prgf_teaser_update_8011() { $config_importer->setDirectory($path); $config_importer->importConfigs([ 'image.style.paragraph_teaser_520_440', - 'image.style.prgf_teaser' + 'image.style.prgf_teaser', ]); } /** - * Update Open Y paragraph teaser - field image is required + * Update Open Y paragraph teaser - field image is required. */ function openy_prgf_teaser_update_8012() { $path = \Drupal::service('extension.list.module')->getPath('openy_prgf_teaser') . '/config/install'; $config_importer = \Drupal::service('config_import.importer'); $config_importer->setDirectory($path); $config_importer->importConfigs([ - 'field.field.paragraph.teaser.field_prgf_image' + 'field.field.paragraph.teaser.field_prgf_image', ]); } diff --git a/openy_prgf/openy_prgf.install b/openy_prgf/openy_prgf.install index 150d1068..ed0b0d64 100644 --- a/openy_prgf/openy_prgf.install +++ b/openy_prgf/openy_prgf.install @@ -12,7 +12,7 @@ function openy_prgf_update_dependencies() { $dependencies['openy_prgf'] = [ 8007 => [ 'openy' => 8062, - ] + ], ]; return $dependencies; diff --git a/openy_prgf/openy_prgf.module b/openy_prgf/openy_prgf.module index 4dd06f22..af6d8db4 100644 --- a/openy_prgf/openy_prgf.module +++ b/openy_prgf/openy_prgf.module @@ -5,7 +5,7 @@ * OpneY Paragraph module file. */ -use \Drupal\Core\Form\FormStateInterface; +use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Render\Element; /** diff --git a/openy_taxonomy/openy_taxonomy.install b/openy_taxonomy/openy_taxonomy.install index 57b08469..67b00bad 100644 --- a/openy_taxonomy/openy_taxonomy.install +++ b/openy_taxonomy/openy_taxonomy.install @@ -5,7 +5,7 @@ * Open Y Taxonomy install file. */ - /** +/** * Implement hook_install(). */ function openy_taxonomy_install() { @@ -18,7 +18,7 @@ function openy_taxonomy_install() { } else { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_taxonomy') . '/config/override/'; - // Import new configuration + // Import new configuration. $config_importer = \Drupal::service('openy_upgrade_tool.importer'); $config_importer->setDirectory($config_dir); $config_importer->importConfigs([ @@ -52,7 +52,7 @@ function openy_taxonomy_update_8003() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_taxonomy') . '/config/optional/'; // Update multiple configurations. $configs = [ - 'tour.tour.openy-taxonomy-overview' =>[ + 'tour.tour.openy-taxonomy-overview' => [ 'tips', ], 'tour.tour.openy-taxonomy-term' => [ @@ -86,7 +86,7 @@ function openy_taxonomy_update_8005() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_taxonomy') . '/config/install/'; // Update multiple configurations. $configs = [ - 'field.storage.taxonomy_term.field_taxonomy_content' =>[ + 'field.storage.taxonomy_term.field_taxonomy_content' => [ 'persist_with_no_fields', ], ]; diff --git a/openy_taxonomy/src/Plugin/views/filter/BetterTaxonomyIndexTid.php b/openy_taxonomy/src/Plugin/views/filter/BetterTaxonomyIndexTid.php index ab96d0a5..a7da4c65 100644 --- a/openy_taxonomy/src/Plugin/views/filter/BetterTaxonomyIndexTid.php +++ b/openy_taxonomy/src/Plugin/views/filter/BetterTaxonomyIndexTid.php @@ -197,7 +197,7 @@ protected function valueForm(&$form, FormStateInterface $form_state) { if ($tree) { foreach ($tree as $term) { - + if (!$term->isPublished() && !$this->currentUser->hasPermission('administer taxonomy')) { continue; } diff --git a/openy_user/src/Plugin/ConfigEventIgnore/Role.php b/openy_user/src/Plugin/ConfigEventIgnore/Role.php index 2999e676..825fa0fd 100644 --- a/openy_user/src/Plugin/ConfigEventIgnore/Role.php +++ b/openy_user/src/Plugin/ConfigEventIgnore/Role.php @@ -22,7 +22,7 @@ class Role extends ConfigEventIgnoreBase { public function fullIgnore() { // No need to track roles config customizations, on each website // they can be different. - // TODO: We need to improve this part, for now we have one reason to track + // @todo We need to improve this part, for now we have one reason to track // roles customization - in case of Open Y in the future will add a new // hook_update in the openy_user module all customization // can be overridden, so let's leave default logic for now. From fb508b9167f924508152b8fefee422448a61e991 Mon Sep 17 00:00:00 2001 From: Andrii Podanenko Date: Thu, 29 Jun 2023 10:37:38 +0300 Subject: [PATCH 02/10] Update openy_prgf/modules/openy_prgf_embedded_groupexpro_schedule/openy_prgf_embedded_groupexpro_schedule.install Co-authored-by: Avi Schwab --- .../openy_prgf_embedded_groupexpro_schedule.install | 1 - 1 file changed, 1 deletion(-) diff --git a/openy_prgf/modules/openy_prgf_embedded_groupexpro_schedule/openy_prgf_embedded_groupexpro_schedule.install b/openy_prgf/modules/openy_prgf_embedded_groupexpro_schedule/openy_prgf_embedded_groupexpro_schedule.install index 35d657dd..9b38eae1 100644 --- a/openy_prgf/modules/openy_prgf_embedded_groupexpro_schedule/openy_prgf_embedded_groupexpro_schedule.install +++ b/openy_prgf/modules/openy_prgf_embedded_groupexpro_schedule/openy_prgf_embedded_groupexpro_schedule.install @@ -36,7 +36,6 @@ function openy_prgf_embedded_groupexpro_schedule_update_8001() { */ function openy_prgf_embedded_groupexpro_schedule_update_8002() { $module_handler = \Drupal::moduleHandler(); - ; if ($module_handler->moduleExists('openy_gxp')) { return; } From 0193404efd5465bf90fbb07d1156b7a9b5ceec92 Mon Sep 17 00:00:00 2001 From: Andrii Podanenko Date: Thu, 29 Jun 2023 10:37:44 +0300 Subject: [PATCH 03/10] Update openy_node/modules/openy_node_blog/src/BlogSimplePaginator.php Co-authored-by: Avi Schwab --- openy_node/modules/openy_node_blog/src/BlogSimplePaginator.php | 1 + 1 file changed, 1 insertion(+) diff --git a/openy_node/modules/openy_node_blog/src/BlogSimplePaginator.php b/openy_node/modules/openy_node_blog/src/BlogSimplePaginator.php index 8b48bdf3..fa9cb979 100644 --- a/openy_node/modules/openy_node_blog/src/BlogSimplePaginator.php +++ b/openy_node/modules/openy_node_blog/src/BlogSimplePaginator.php @@ -64,6 +64,7 @@ private function buildQuery($direction = 'prev') { ->condition('langcode', $currentNode->language()->getId()) ->sort('created', $sort) ->range(0, 1) + ->accessCheck(FALSE) ->execute(); if (!empty($result) && is_array($result)) { From b0b1df7baf134aa70718e9ae16dc0540055bf7d9 Mon Sep 17 00:00:00 2001 From: Andrii Podanenko Date: Thu, 29 Jun 2023 10:37:51 +0300 Subject: [PATCH 04/10] Update openy_egym_iwatch/openy_egym_iwatch.install Co-authored-by: Avi Schwab --- openy_egym_iwatch/openy_egym_iwatch.install | 3 --- 1 file changed, 3 deletions(-) diff --git a/openy_egym_iwatch/openy_egym_iwatch.install b/openy_egym_iwatch/openy_egym_iwatch.install index e05cc1a7..cdc889c6 100644 --- a/openy_egym_iwatch/openy_egym_iwatch.install +++ b/openy_egym_iwatch/openy_egym_iwatch.install @@ -15,9 +15,6 @@ use Drupal\Core\File\FileSystemInterface; * Open Y eGym iWatch install file. */ -/** - * - */ function openy_egym_iwatch_install() { module_set_weight('openy_egym_iwatch', 30); From 37376ad642368e4c0731b7b78f98ef466b6e5a2d Mon Sep 17 00:00:00 2001 From: Andrii Podanenko Date: Thu, 29 Jun 2023 10:37:59 +0300 Subject: [PATCH 05/10] Update openy_prgf/modules/openy_prgf_class_sessions/src/Plugin/Block/ClassSessions.php Co-authored-by: Avi Schwab --- .../src/Plugin/Block/ClassSessions.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/openy_prgf/modules/openy_prgf_class_sessions/src/Plugin/Block/ClassSessions.php b/openy_prgf/modules/openy_prgf_class_sessions/src/Plugin/Block/ClassSessions.php index 5a16a146..668cbd36 100644 --- a/openy_prgf/modules/openy_prgf_class_sessions/src/Plugin/Block/ClassSessions.php +++ b/openy_prgf/modules/openy_prgf_class_sessions/src/Plugin/Block/ClassSessions.php @@ -119,9 +119,6 @@ public function build() { return $class_sessions; } - /** - * - */ private function getQueryParamInt($param) { // Get request object for query param. $request = \Drupal::request(); From c7959b992c69dc29b88930a6b7bec0aac358490b Mon Sep 17 00:00:00 2001 From: Andrii Podanenko Date: Thu, 29 Jun 2023 10:38:07 +0300 Subject: [PATCH 06/10] Update openy_prgf/modules/openy_prgf_event_listing/openy_prgf_event_listing.module Co-authored-by: Avi Schwab --- .../openy_prgf_event_listing/openy_prgf_event_listing.module | 3 --- 1 file changed, 3 deletions(-) diff --git a/openy_prgf/modules/openy_prgf_event_listing/openy_prgf_event_listing.module b/openy_prgf/modules/openy_prgf_event_listing/openy_prgf_event_listing.module index 46a75558..f166f880 100644 --- a/openy_prgf/modules/openy_prgf_event_listing/openy_prgf_event_listing.module +++ b/openy_prgf/modules/openy_prgf_event_listing/openy_prgf_event_listing.module @@ -10,9 +10,6 @@ use Drupal\Core\Form\FormStateInterface; -/** - * - */ function openy_prgf_event_listing_form_views_exposed_form_alter(&$form, FormStateInterface $form_state) { $storage = $form_state->getStorage(); /** @var \Drupal\views\Entity\View $view */ From 199f9e93e66b88f8b1ffa4388e6b9860490062a7 Mon Sep 17 00:00:00 2001 From: Andrii Podanenko Date: Thu, 29 Jun 2023 10:38:14 +0300 Subject: [PATCH 07/10] Update openy_node/modules/openy_node_blog/src/BlogSimplePaginator.php Co-authored-by: Avi Schwab --- openy_node/modules/openy_node_blog/src/BlogSimplePaginator.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/openy_node/modules/openy_node_blog/src/BlogSimplePaginator.php b/openy_node/modules/openy_node_blog/src/BlogSimplePaginator.php index fa9cb979..8a15409a 100644 --- a/openy_node/modules/openy_node_blog/src/BlogSimplePaginator.php +++ b/openy_node/modules/openy_node_blog/src/BlogSimplePaginator.php @@ -6,9 +6,6 @@ use Drupal\Core\Link; use Drupal\Core\Routing\RouteMatchInterface; -/** - * - */ class BlogSimplePaginator { /** From ecbaf91aa7fd9ca70b049e78008c5245f11aab9b Mon Sep 17 00:00:00 2001 From: Andrii Podanenko Date: Thu, 29 Jun 2023 10:38:26 +0300 Subject: [PATCH 08/10] Update openy_node/modules/openy_node_social_post/openy_node_social_post.install Co-authored-by: Avi Schwab --- .../openy_node_social_post/openy_node_social_post.install | 3 --- 1 file changed, 3 deletions(-) diff --git a/openy_node/modules/openy_node_social_post/openy_node_social_post.install b/openy_node/modules/openy_node_social_post/openy_node_social_post.install index cb8d5041..b699549e 100644 --- a/openy_node/modules/openy_node_social_post/openy_node_social_post.install +++ b/openy_node/modules/openy_node_social_post/openy_node_social_post.install @@ -5,9 +5,6 @@ * Open Y Node Social Post install file. */ -/** - * - */ function openy_node_social_post_install() { $config_dir = \Drupal::service('extension.list.module')->getPath('openy_node_social_post') . '/config/install/'; // Import configurations using upgrade tool to avoid Upgrade tool conflicts. From fbdb61778a502cdcfa2ce2760b988935c7615998 Mon Sep 17 00:00:00 2001 From: Andrii Podanenko Date: Thu, 29 Jun 2023 10:38:33 +0300 Subject: [PATCH 09/10] Update openy_node/src/BatchNodeUpdate.php Co-authored-by: Avi Schwab --- openy_node/src/BatchNodeUpdate.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/openy_node/src/BatchNodeUpdate.php b/openy_node/src/BatchNodeUpdate.php index bc941777..3920691d 100644 --- a/openy_node/src/BatchNodeUpdate.php +++ b/openy_node/src/BatchNodeUpdate.php @@ -2,9 +2,6 @@ namespace Drupal\openy_node; -/** - * - */ class BatchNodeUpdate { /** From b429e058d21fd94f7035cf31891b31991c04543a Mon Sep 17 00:00:00 2001 From: Andrii Podanenko Date: Thu, 29 Jun 2023 10:38:41 +0300 Subject: [PATCH 10/10] Update openy_prgf/modules/openy_prgf_group_schedules/openy_prgf_group_schedules.install Co-authored-by: Avi Schwab --- .../openy_prgf_group_schedules.install | 1 - 1 file changed, 1 deletion(-) diff --git a/openy_prgf/modules/openy_prgf_group_schedules/openy_prgf_group_schedules.install b/openy_prgf/modules/openy_prgf_group_schedules/openy_prgf_group_schedules.install index f60b9fe1..cfdb4a0b 100644 --- a/openy_prgf/modules/openy_prgf_group_schedules/openy_prgf_group_schedules.install +++ b/openy_prgf/modules/openy_prgf_group_schedules/openy_prgf_group_schedules.install @@ -35,7 +35,6 @@ function openy_prgf_group_schedules_update_8001() { */ function openy_prgf_group_schedules_update_8002() { $module_handler = \Drupal::moduleHandler(); - ; if ($module_handler->moduleExists('openy_gxp')) { return; }