ENH Remove code that had been retained for backwards compatibility #11541
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 tasks
GuySartorelli
commented
Jan 9, 2025
Comment on lines
-1344
to
-1346
| public function loadDataFrom($data, $mergeStrategy = 0, $fieldList = null) | ||
| public function loadDataFrom(object|array $data, int $mergeStrategy = 0, array $fieldList = []) | ||
| { | ||
| if (!is_object($data) && !is_array($data)) { | ||
| user_error("Form::loadDataFrom() not passed an array or an object", E_USER_WARNING); | ||
| return $this; | ||
| } |
There was a problem hiding this comment.
Adding strong typing here seems sensible.
object|arrayis already enforced for$databy the user_error.intis now the only valid type for$mergeStrategyarrayis already enforced for$fieldListby its use inin_array()
GuySartorelli
commented
Jan 9, 2025
Comment on lines
-210
to
+212
| // Always ensure that only pages with ShowInSearch = 1 can be searched | ||
| // Always ensure that only pages/files with ShowInSearch = 1 can be searched | ||
| $extraFilters[$pageClass] .= " AND ShowInSearch <> 0"; | ||
|
|
||
| // File.ShowInSearch was added later, keep the database driver backwards compatible | ||
| // by checking for its existence first | ||
| $fileTable = DataObject::getSchema()->tableName($fileClass); | ||
| $fields = $this->getSchemaManager()->fieldList($fileTable); | ||
| if (array_key_exists('ShowInSearch', $fields ?? [])) { | ||
| $extraFilters[$fileClass] .= " AND ShowInSearch <> 0"; | ||
| } | ||
| $extraFilters[$fileClass] .= " AND ShowInSearch <> 0"; |
There was a problem hiding this comment.
That db column will always be present now.
We don't need to retain this compatibility anymore. Some of this is dead code, and some is just tech debt that should have been properly deprecated.
GuySartorelli
force-pushed
the
pulls/6.0/remove-bc
branch
from
3a86562 to
acc3fd1
Compare
emteknetnz
approved these changes
Jan 9, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We don't need to retain this compatibility anymore. Some of this is dead code, and some is just tech debt that should have been properly deprecated.
Issue