Problem/Motivation
While working on #3230826: Expose API to sort arbitrary config arrays: TypedConfigManager::getCanonicalRepresentation() should override its parent, I noticed that \Drupal\Core\TypedData\PrimitiveBase::setValue() and \Drupal\Core\TypedData\TypedData::setValue() are identical. Character-for-character.
Steps to reproduce
N/A
Proposed resolution
Since PrimitiveBase extends TypedData, we can safely remove PrimitiveBase::setValue().
Merge request link
Remaining tasks
User interface changes
None.
API changes
None.
Data model changes
None.
Release notes snippet
None.
| Comment | File | Size | Author |
|---|---|---|---|
| #10 | core-remove-useless-code-3418678-10.patch | 2.45 KB | kalpanajaiswal |
Issue fork drupal-3418678
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:
Comments
Comment #2
ksere commentedI'll be taking this as part of a Symetris contribution workshop.
Comment #3
nbeaucage commentedI'll be working on this.
Comment #5
nbeaucage commentedThe test pipeline seems to be failing without much information, so I'll leave this as "Needs work" for now.
Also I'm not sure if this requires a Change Record, feel free to ask for one if needed.
Comment #6
borisson_it's only failing in the javascript tests, looks like a random failure to me. I think this is actually good to go.
Comment #7
longwaveIf we are going to do this we should at least remove
getValue()as well, as that's also the same as the parent implementation. If this is the only change this doesn't need a change record, there is no functional change here, just removing useless code.But having said that, having the getter and setter in the abstract base class refer to a property that doesn't exist is a bit of a strange design, and PHPStan is already complaining about this:
Would it be better to remove getValue/setValue from the abstract class and implement them only in PrimitiveBase? We would need to implement backward compatibility here though.
Comment #8
longwaveAlso this is a duplicate of #3385629: Useless method overrides in \Drupal\Core\TypedData\PrimitiveBase and missing property definition in TypedData
Comment #9
wim leersThat'd indeed be a BC break. That's why I proposed this.
The simpler and lower-risk change is to remove both
::setValue()and::getValue(), and define theprotected $valueproperty inabstract class TypedData.P.S.: Sorry for not finding #3385629: Useless method overrides in \Drupal\Core\TypedData\PrimitiveBase and missing property definition in TypedData 😬.
Comment #10
kalpanajaiswal commentedUnwanted code has been removed based on the last comment.
Comment #12
shalini_jha commentedFixed Pipeline failure issues and added #10 changes in this Mr against 11.x .
Please review.
Comment #13
wim leersClose, but not quite 😅 Too many changes, some of which constitute a BC break.
Also: we need to update the PHPStan baseline, that's what the MR pipeline is currently failing on. Some errors no longer need to be ignored! 🎉
Comment #14
nbeaucage commentedI would like to propose we simply remove the superfluous getter and setter within PrimitiveBase. This would solve the adjustments requested by this issue. I took the liberty of reverting the previous commit, and having only the getter and setter removed. Please feel free to revert my revert if that should not have been done.
The rework related to having a base $value property within the TypedData base class can be addressed in the other related issue (https://www.drupal.org/project/drupal/issues/3385629), since it might be more complex than the fix that was proposed here.
For example, the \Drupal\Core\TypedData\Plugin\DataType\Map class, which also extends TypedData, does not possess nor makes use of a $value property, but instead uses a $values property (plural, since it's a key/value store of data).
So we can't really add a $value property to the base TypedData class, since it is not relevant to all of its extending children. Also note the comment at the top of the TypedData class:
In our current case, PrimitiveBase declares the $value property as instructed, while Map overrides the ::getValue() method from TypedData. Both solutions are following the defined instructions, so I would leave them as-is within this specific issue, while they could be addressed in the related issue instead.
What I usually do when implementing base classes for my teams is the following (which I am 100% open to discuss if it is a viable solution or not):
Anyway, those are my two cents!
Now, I am not sure what to do regarding the PHPStan baseline (where adjustments/updates should be made).
Comment #15
nbeaucage commentedComment #16
smustgrave commentedCan confirm that the setValue and getValue are the exact same as TypedData
So cleanup looks fine to me.
Comment #17
alexpottI think we should deprecate \Drupal\Core\TypedData\TypedData::getValue() and \Drupal\Core\TypedData\TypedData::setValue() and tell people to either extend PrimitiveBase or implement it themselves.
Comment #19
karanpagare commentedAddded the change as per #17 but i think we may need to fix php standards for that as well.
Comment #20
wim leersThis still needs the deprecation #17 asked for.
Comment #21
magakiI will work on this.
Comment #22
magakiI added deprecations and tests and reverted the commit that removed the functions to deprecation.
However, PHPStan warns of making a deprecated call by adding the deprecations.
The following classes directly inherit TypedData and have no overridden function implementations.
- core/lib/Drupal/Core/TypedData/Plugin/DataType/Any.php
- core/lib/Drupal/Core/Config/Schema/Element.php
- core/modules/layout_builder/src/Plugin/DataType/SectionData.php
- core/modules/system/tests/modules/entity_test/src/TypedData/ComputedString.php
- core/tests/Drupal/Tests/Core/Plugin/Fixtures/Plugin/DataType/TestDataType.php
If change it to inherit from PrimitiveBase, I should implement PrimitiveInterface::getCastedValue().
How should I fix it?
Comment #23
smustgrave commentedNeed to make sure no code in core is calling the deprecated functions. So when we remove it'll be a simple delete.
Comment #24
magakiI removed the methods from TypedData and reimplemented them in TypedData inherited classes that did not implement the method.
And, I removed ignoreErrors item from .phpstan-baseline.php since $value is no longer used in TypedData.
Comment #25
smustgrave commentedBelieve feedback has been addressed.
Comment #26
catchThis is removing 29 lines of code to add 88 lines which are mostly duplicated, I think it needs more discussion. Why not a trait?
Comment #27
magakiWe could use a Trait, but there are concerns.
PrimitiveBase::setValue uses properties ($name and $parent) defined in the parent TypedData class.
These properties should also be implemented in a new Trait, as the Trait defines the setValue function.
Since it is assumed that the Trait will be used by classes that inherit TypedData, classes that use the Trait will redefine the properties of TypedData.
Currently, there is no problem as the final values are the same and no errors have occurred.
However, if changes $name or $parent in TypedData in the future, the changes will no longer directly follow the properties in the Trait by redefinition, and the values of properties in classes that use the Trait may not be set appropriately.
Is this an unnecessary concern?