Resolve #110 Sync repo with CiviCRM-Drupal repo #115
Merged
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
|
(Standard links)
|
…nd fix file generation
This version requirement officially went up to PHP 7.0 circa Civi 5.14.
However, at that time, the upgrade metadata was kept at PHP 5.6 to allow
somewhat softer landing for stragglers. That's no longer possible in Civi
5.16+,
This just gives a clearer error when someone tries to upgrade with PHP 5.x.
Before
------
When upgrading via drush or Drupal web UI on PHP 5.6, the Civi class-loader fails to initialize.
```
Parse error: syntax error, unexpected ':', expecting '{' in /Users/totten/bknix/build/dmaster/web/sites/all/modules/civicrm/vendor/league/csv/src/functions.php on line 33
```
(Approximate call-path: `civicrm.drush.inc | civicrm.module` =>
`civicrm.settings.php` => `CRM_Core_ClassLoader` => `vendor/autoload.php` =>
`vendor/league/csv/src/functions.php`)
After
-----
When upgrading via drush on PHP 5.6, the error points to the actual problem.
```
[bknix-old:~/bknix/build/dmaster/web/sites/all/modules/civicrm] drush civicrm-upgrade-db
CiviCRM requires PHP 7.0.0+. Drush is running PHP 5.6.38. [error]
```
When upgrading via web UI on PHP 5.6, the error message is similar:
```
CiviCRM requires PHP 7.0.0+. The web server is running PHP 5.6.38.
```
(Note: I tweaked the text to emphasize that the PHP version is determined by
the "drush" or "web server" environment - in some systems, these are
different environments with different PHP versions. A phrase like "your
version" can be confusing/misleading in those cases.)
Comments
--------
The canonical representation of the minimum PHP version is in
`$civicrm_root/CRM/Upgrade/Form.php`. However, correctly reading that
metadata requires loading `civicrm.settings.php`, which triggers the crash.
To work around this, we reproduce the constant and use a unit-test to ensure
its continued accuracy.
Also, it seems useful to put the same metadata in `civicrm.info`. I'm not
sure if D7 uses this in a meaningful way, but it's good to be accurate.
…or phpunit6 compatability
6a9b325 to
3bb9376
Compare
3bb9376 to
ddd653c
Compare
herbdool
reviewed
Mar 14, 2020
herbdool
reviewed
Mar 14, 2020
herbdool
requested changes
Mar 14, 2020
|
I guess we're still getting the error with
|
|
yeh neither PR has been merged |
|
@herbdool made those changes |
|
Looks good to me now |
|
Jenkins re test this please |
|
@herbdool should this get merged now? |
|
This dropped off my radar, oops. You want to merge it or I could on Tuesday when I'm back at work. |
|
I'm happy to merge it if your still ok with it @herbdool |
|
Yup ok with me. I took another look. Go ahead @seamuslee001 thanks! |
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.
No description provided.