add drupal 9 support #152
Open
add drupal 9 support #152
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
|
What's the status of this? Looks like using Related Drupal core issues: |
|
Thank you for this, we are currently in the process of updating Warden Server to Symfony 5.4 LTS, this PR will be included as part of this update. |
| return 'bundles/deesonwardendrupal/images/drupal7-logo.png'; | ||
| } | ||
| // Grab first digits before first dot | ||
| preg_match("/^(\d)*?\./", $this->getCoreVersion(), $matches); |
There was a problem hiding this comment.
I suspect it fails with Drupal 10, because the regex would capture only 0, skipping 1.
I suggest to use /^(\d+)\./. It's also easier to read.
Another alternative would be:
$version = $explode('.', $this->getCoreVersion())[0];
$version = empty($version) ? 8 : $version;
| @@ -193,6 +193,11 @@ public function processRequestData($requestData) { | |||
| $recommendedMajorVersion = (string) $requestXmlObject->recommended_major; | |||
| $supportedMajor = (string) $requestXmlObject->supported_majors; | |||
| $supportedMajorVersions = explode(',', $supportedMajor); | |||
| } else { | |||
| // TODO This will need to be reworked once Drupal 10 is out | |||
| // In the current xml file, supported_majors key doesn't exist | |||
| @@ -210,6 +215,10 @@ public function processRequestData($requestData) { | |||
| /*if (!is_null($versionInfo['extra'])) { | |||
| continue; | |||
| }*/ | |||
| }elseif(preg_match('/^(' . implode('|', $supportedMajorVersions) . ')/', $release->version, $matches)){ | |||
There was a problem hiding this comment.
This RX is hard to read.
I suggest:
$rx = implode('|', $supportedMajorVersions);
$rx = "/^($rx)/";
...
} elseif (preg_match($rx, $release->version, $matches)) {
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.
Minor changes to enable drupal 9 updates. Update XML file for /9.x doesn't exist, needed to fallback to /current instead. This solution might be temporary but it works at the moment.