Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix PHP7.2 warning when re-generating schema files #232

Merged
merged 2 commits into from
Nov 21, 2018

Conversation

seamuslee001
Copy link
Contributor

This just fixes an issue when running either ./bin/setup.sh -Dg or ./bin/regen.sh where a warning would be displayed in PHP7.2

@civibot
Copy link

civibot bot commented Nov 19, 2018

(Standard links)

@civibot civibot bot added the master label Nov 19, 2018
@eileenmcnaughton
Copy link
Contributor

eileenmcnaughton commented Nov 19, 2018

@seamuslee001 this looks more correct with your change.

However, I get a small style regression after running GenCode after applying it

diff --git a/CRM/Core/I18n/SchemaStructure.php b/CRM/Core/I18n/SchemaStructure.php
index 2c7f442856..fc9ccafc03 100644
--- a/CRM/Core/I18n/SchemaStructure.php
+++ b/CRM/Core/I18n/SchemaStructure.php
@@ -710,5 +710,5 @@ class CRM_Core_I18n_SchemaStructure {
     }
     return $result;
   }
-
-}
+  }
+  

@seamuslee001
Copy link
Contributor Author

@eileenmcnaughton just pushing a fix for that now i think, not sure how this function ever actually worked sensibly

@eileenmcnaughton
Copy link
Contributor

@seamuslee001 agree this results in no change. Adding merge on pass but I'm not sure what to make of the test fails

@seamuslee001
Copy link
Contributor Author

Jenkins re test this please

@eileenmcnaughton eileenmcnaughton merged commit d968f13 into civicrm:master Nov 21, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants