Problem/Motivation

Hello project maintainers,

This is an automated issue to help make this module compatible with Drupal 10.

To read more about this effort by the Drupal Association, please read: The project update bot is being refreshed to support Drupal 10 readiness of contributed projects

Patches will periodically be added to this issue that remove Drupal 10 deprecated API uses. To stop further patches from being posted, change the status to anything other than Active, Needs review, Needs work or Reviewed and tested by the community. Alternatively, you can remove the "ProjectUpdateBotD10" tag from the issue to stop the bot from posting updates.

The patches will be posted by the Project Update Bot official user account. This account will not receive any issue credit contributions for itself or any company.

Proposed resolution

You have a few options for how to use this issue:

  1. Accept automated patches until this issue is closed

    If this issue is left open (status of Active, Needs review, Needs work or Reviewed and tested by the community) and the "ProjectUpdateBotD10" tag is left on this issue, new patches will be posted periodically if new deprecation fixes are needed.

    As the Drupal Rector project improves and is able to fix more deprecated API uses, the patches posted here will cover more of the deprecated API uses in the module.

    Patches and/or merge requests posted by others are ignored by the bot, and general human interactions in the issue do not stop the bot from posting updates, so feel free to use this issue to refine bot patches. The bot will still post new patches then if there is a change in the new generated patch compared to the patch that the bot posted last. Those changes are then up to humans to integrate.

  2. Leave open but stop new automated patches.

    If you want to use this issue as a starting point to remove deprecated API uses but then don't want new automated patches, remove the "ProjectUpdateBotD10" tag from the issue and use it like any other issue (the status does not matter then). If you want to receive automated patches again, add back the "ProjectUpdateBotD10" tag.

  3. Close it and don't use it

    If the maintainers of this project don't find this issue useful, they can close this issue (any status besides Active, Needs review, Needs work and Reviewed and tested by the community) and no more automated patches will be posted here.

    If the issue is reopened, then new automated patches will be posted.

    If you are using another issue(s) to work on Drupal 10 compatibility it would be very useful to other contributors to add those issues as "Related issues" when closing this issue.

Remaining tasks

Using the patches

  1. Apply the latest patch in the comments by Project Update Bot or human contributors that made it better.
  2. Thoroughly test the patch. These patches are automatically generated so they haven't been tested manually or automatically.
  3. Provide feedback about how the testing went. If you can improve the patch, post an updated patch here.

Providing feedback

If there are problems with one of the patches posted by the Project Update Bot, such as it does not correctly replace a deprecation, you can file an issue in the Drupal Rector issue queue. For other issues with the bot, for instance if the issue summary created by the bot is unclear, use the Project analysis issue queue.

CommentFileSizeAuthor
#17 3286695-17.patch3.88 KBnkoporec
#11 3286695-10.patch21 KBLal_
#10 3286695-9.patch20.97 KBLal_
#9 3286695-8.patch20.52 KBLal_
#7 3286695-7.patch16.86 KBLal_
#6 3286695-6.patch16.43 KBLal_
#5 3286695-5.patch16.41 KBLal_
#4 3286695-4.patch16.41 KBLal_
#3 conflict.2.x-dev.rector.patch2.4 KBproject update bot
#3 interdiff-last-bot.6642221.txt1.39 KBproject update bot
#2 conflict.2.x-dev.rector.patch1.83 KBproject update bot

Issue fork conflict-3286695

Command icon Show commands

Start within a Git clone of the project using the version control instructions.

Or, if you do not have SSH keys set up on git.drupalcode.org:

About issue forks

Comments

Project Update Bot created an issue. See original summary.

project update bot’s picture

project update bot commented
Status: Active » Needs review
StatusFileSize
new conflict.2.x-dev.rector.patch1.83 KB

This is an automated patch generated by Drupal Rector. Please see the issue summary for more details.

It is important that any automated tests available are run with this patch and that you manually test this patch.

Drupal 10 Compatibility

According to the Upgrade Status module, even with this patch, this module is not yet compatible with Drupal 10.

Currently Drupal Rector, version 0.12.0, cannot fix all Drupal 10 compatibility problems.

This patch does not update the info.yml file for Drupal 10 compatibility.

Leaving this issue open, even after committing the current patch, will allow the Project Update Bot to post additional Drupal 10 compatibility fixes as they become available in Drupal Rector.

Debug info

Bot run #127

This patch was created using these packages:

  1. mglaman/phpstan-drupal: 1.1.9
  2. palantirnet/drupal-rector: 0.12.0
project update bot’s picture

project update bot commented
StatusFileSize
new interdiff-last-bot.6642221.txt1.39 KB
new conflict.2.x-dev.rector.patch2.4 KB

This is an automated patch generated by Drupal Rector. Please see the issue summary for more details.

It is important that any automated tests available are run with this patch and that you manually test this patch.

Drupal 10 Compatibility

According to the Upgrade Status module, even with this patch, this module is not yet compatible with Drupal 10.

Currently Drupal Rector, version 0.13.0, cannot fix all Drupal 10 compatibility problems.

This patch does not update the info.yml file for Drupal 10 compatibility.

Leaving this issue open, even after committing the current patch, will allow the Project Update Bot to post additional Drupal 10 compatibility fixes as they become available in Drupal Rector.

Debug info

Bot run #139

This patch was created using these packages:

  1. mglaman/phpstan-drupal: 1.1.24
  2. palantirnet/drupal-rector: 0.13.0
Lal_’s picture

Lal_
He\Him
commented
Issue summary: View changes
StatusFileSize
new 3286695-4.patch16.41 KB
Lal_’s picture

Lal_
He\Him
commented
StatusFileSize
new 3286695-5.patch16.41 KB
Lal_’s picture

Lal_
He\Him
commented
StatusFileSize
new 3286695-6.patch16.43 KB
Lal_’s picture

Lal_
He\Him
commented
StatusFileSize
new 3286695-7.patch16.86 KB
Lal_’s picture

Lal_
He\Him
commented

remaining phpstan issues 

29/29 [▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓] 100%

 ------ --------------------------------------------------------------------------------------------------------- 
  Line   conflict.module                                                                                          
 ------ --------------------------------------------------------------------------------------------------------- 
  78     Access to an undefined property Drupal\Core\Entity\ContentEntityInterface::$conflictEntityOriginal.      
  82     Access to an undefined property Drupal\Core\Entity\ContentEntityInterface::$conflictEntityOriginalHash.  
  172    Access to an undefined property Drupal\Core\Entity\EntityInterface::$conflictFormDisplay.                
 ------ --------------------------------------------------------------------------------------------------------- 

 ------ ----------------------------------------------------------------------------------- 
  Line   modules/conflict_paragraphs/src/ConflictResolution/MergeRemoteStructure.php        
 ------ ----------------------------------------------------------------------------------- 
  65     Access to an undefined property Drupal\Core\Field\FieldItemInterface::$target_id.  
  77     Access to an undefined property Drupal\Core\Field\FieldItemInterface::$entity.     
  135    Access to an undefined property Drupal\Core\Field\FieldItemInterface::$target_id.  
  137    Access to an undefined property Drupal\Core\Field\FieldItemInterface::$entity.     
  186    Variable $new_paragraph_ids in empty() always exists and is not falsy.             
 ------ ----------------------------------------------------------------------------------- 

 ------ ------------------------------------------------------------------------------------------------------------ 
  Line   modules/conflict_paragraphs/src/Plugin/Conflict/FieldComparator/FieldComparatorParagraphReference.php       
 ------ ------------------------------------------------------------------------------------------------------------ 
  242    Access to an undefined property Drupal\Core\Field\FieldItemListInterface::$conflictWidget.                  
  257    Access to an undefined property Drupal\Core\Field\FieldItemListInterface::$conflictingRemovedParagraphIds.  
 ------ ------------------------------------------------------------------------------------------------------------ 

 ------ ---------------------------------------------------------------------------------------------------------------------------------- 
  Line   src/Entity/ContentEntityConflictHandler.php                                                                                       
 ------ ---------------------------------------------------------------------------------------------------------------------------------- 
  139    Access to an undefined property Drupal\Core\Entity\EntityInterface::$conflictEntityOriginalHash.                                  
  244    Access to an undefined property Drupal\Core\Field\FieldItemListInterface<Drupal\Core\Field\FieldItemInterface>::$conflictWidget.  
  416    Call to an undefined method Drupal\Core\Entity\ContentEntityInterface::getChangedTime().                                          
  416    Call to an undefined method Drupal\Core\Entity\ContentEntityInterface::getChangedTime().                                          
  528    Call to an undefined method Drupal\Core\Entity\ContentEntityInterface::getChangedTime().                                          
  529    Call to an undefined method Drupal\Core\Entity\ContentEntityInterface::getChangedTime().                                          
  613    Call to an undefined method Drupal\Core\Entity\EntityInterface::getTranslation().                                                 
  614    Call to an undefined method Drupal\Core\Entity\EntityInterface::getTranslation().                                                 
  622    Call to an undefined method Drupal\Core\Entity\EntityInterface::getFields().                                                      
 ------ ---------------------------------------------------------------------------------------------------------------------------------- 

 ------ ------------------------------------------------------------------------------------------------------------- 
  Line   src/Form/ConflictResolutionInlineFormBuilder.php                                                             
 ------ ------------------------------------------------------------------------------------------------------------- 
  68     Access to an undefined property Drupal\Core\Entity\ContentEntityInterface::$conflictEntityNeedsManualMerge.  
  76     Access to an undefined property Drupal\Core\Entity\ContentEntityInterface::$conflictEntityOriginal.          
  77     Access to an undefined property Drupal\Core\Entity\ContentEntityInterface::$conflictEntityServer.            
 ------ ------------------------------------------------------------------------------------------------------------- 

 [ERROR] Found 22 errors
Lal_’s picture

Lal_
He\Him
commented
StatusFileSize
new 3286695-8.patch20.52 KB

Remaining phpstan errors 

------ --------------------------------------------------------------------------------------------------------- 
  Line   conflict.module                                                                                          
 ------ --------------------------------------------------------------------------------------------------------- 
  78     Access to an undefined property Drupal\Core\Entity\ContentEntityInterface::$conflictEntityOriginal.      
  82     Access to an undefined property Drupal\Core\Entity\ContentEntityInterface::$conflictEntityOriginalHash.  
  172    Access to an undefined property Drupal\Core\Entity\EntityInterface::$conflictFormDisplay.                
 ------ --------------------------------------------------------------------------------------------------------- 

 ------ ----------------------------------------------------------------------------- 
  Line   modules/conflict_paragraphs/src/ConflictResolution/MergeRemoteStructure.php  
 ------ ----------------------------------------------------------------------------- 
  188    Variable $new_paragraph_ids in empty() always exists and is not falsy.       
 ------ ----------------------------------------------------------------------------- 

 ------ ------------------------------------------------------------------------------------------------------------ 
  Line   modules/conflict_paragraphs/src/Plugin/Conflict/FieldComparator/FieldComparatorParagraphReference.php       
 ------ ------------------------------------------------------------------------------------------------------------ 
  242    Access to an undefined property Drupal\Core\Field\FieldItemListInterface::$conflictWidget.                  
  257    Access to an undefined property Drupal\Core\Field\FieldItemListInterface::$conflictingRemovedParagraphIds.  
 ------ ------------------------------------------------------------------------------------------------------------ 

 ------ ---------------------------------------------------------------------------------------------------------------------------------- 
  Line   src/Entity/ContentEntityConflictHandler.php                                                                                       
 ------ ---------------------------------------------------------------------------------------------------------------------------------- 
  139    Access to an undefined property Drupal\Core\Entity\EntityInterface::$conflictEntityOriginalHash.                                  
  244    Access to an undefined property Drupal\Core\Field\FieldItemListInterface<Drupal\Core\Field\FieldItemInterface>::$conflictWidget.  
 ------ ---------------------------------------------------------------------------------------------------------------------------------- 

 ------ ------------------------------------------------------------------------------------------------------------- 
  Line   src/Form/ConflictResolutionInlineFormBuilder.php                                                             
 ------ ------------------------------------------------------------------------------------------------------------- 
  68     Access to an undefined property Drupal\Core\Entity\ContentEntityInterface::$conflictEntityNeedsManualMerge.  
  76     Access to an undefined property Drupal\Core\Entity\ContentEntityInterface::$conflictEntityOriginal.          
  77     Access to an undefined property Drupal\Core\Entity\ContentEntityInterface::$conflictEntityServer.            
 ------ -------------------------------------------------------------------------------------------------------------
Lal_’s picture

Lal_
He\Him
commented
StatusFileSize
new 3286695-9.patch20.97 KB
Lal_’s picture

Lal_
He\Him
commented
StatusFileSize
new 3286695-10.patch21 KB
kristen pol’s picture

kristen pol
she/her
Primary language English
Location Santa Cruz, CA, USA
commented

@Lal_ Thanks for updating the patch! Curious if you were you doing this as part of the porting day event or just as regular maintenance?

Lal_’s picture

Lal_
He\Him
commented

@Kristen Pol working along with Acquia for their Drupal 10 readiness initiative

kristen pol’s picture

kristen pol
she/her
Primary language English
Location Santa Cruz, CA, USA
commented

Gotcha! Thanks for the work :)

nkoporec’s picture

nkoporec
Primary language English
Location Slovenia
commented
Status: Needs review » Needs work

This patch has a lot of changes that are not D10 compatibly related, we should only focus on that and opened up a follow up issue that fixes the phpcs/phpstan issues.

kristen pol’s picture

kristen pol
she/her
Primary language English
Location Santa Cruz, CA, USA
commented

@nkoporec Curious if you were working on this as part of the Drupal 10 Global Porting Day?

nkoporec’s picture

nkoporec
Primary language English
Location Slovenia
commented
Status: Needs work » Needs review
StatusFileSize
new 3286695-17.patch3.88 KB

Added a new patch that only focus on D10 compatibility changes.

@Kristen Pol yea.

kristen pol’s picture

kristen pol
she/her
Primary language English
Location Santa Cruz, CA, USA
commented
Issue tags: +Drupal 10 porting day

@nkoporec Thanks for letting me know! Tagging :)

project update bot’s picture

project update bot commented
Issue summary: View changes

phenaproxima made their first commit to this issue’s fork.

phenaproxima opened merge request !5

phenaproxima’s picture

phenaproxima
he/him
Primary language English
Location Massachusetts
commented
Issue summary: View changes

Hiding patches in favor of the merge request.

kristen pol’s picture

kristen pol
she/her
Primary language English
Location Santa Cruz, CA, USA
commented
Issue tags: +Needs manual testing

Working during porting day.

Tagging for testing #21 on Drupal 10. Here is some documentation for testing on Drupal 10:

https://www.drupal.org/community-initiatives/contribution-events-initiat...

hchonov’s picture

hchonov
Primary language Bulgarian
Location Burgas
commented
Status: Needs review » Fixed

I've just merged the MR. Thank you all for the work!

kristen pol’s picture

kristen pol
she/her
Primary language English
Location Santa Cruz, CA, USA
commented

Yay! Thanks :)

Status: Fixed » Closed (fixed)

Automatically closed - issue fixed for 2 weeks with no activity.