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

Run vs build time version #580

Merged
merged 3 commits into from Feb 13, 2013
Merged

Run vs build time version #580

merged 3 commits into from Feb 13, 2013

Conversation

staabm
Copy link
Member

@staabm staabm commented Jan 26, 2013

added warning when build-time propel version and runtime-propel version do not match

see #577

@willdurand
Copy link
Contributor

yay, bad rebase?

@staabm
Copy link
Member Author

staabm commented Jan 26, 2013

soo, after some hardcore rebase action the PR should be clean

@@ -30,7 +30,7 @@ class Propel
/**
* The Propel version.
*/
const VERSION = '1.6.7';
const VERSION = '1.6.8-PRE';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@willdurand is this a wanted modification ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is required for the check to work properly, because otherwise the git version and the latest stable version could not be differentiated (dont't know if propel defines its version also in other places?)

@staabm
Copy link
Member Author

staabm commented Jan 27, 2013

the first commit showed that the feature works as expected and the second fixes the version constants for the unit tests to pass.

the implemented check does not work when propel is initialized using the runtime-conf.xml, because it does not define the generator version. should I just add an isset-check, since it will be available after the xml-conf was converted into a php-file...?

@staabm
Copy link
Member Author

staabm commented Feb 12, 2013

ready to go.

willdurand added a commit that referenced this pull request Feb 13, 2013
@willdurand willdurand merged commit dd9d189 into propelorm:master Feb 13, 2013
@willdurand
Copy link
Contributor

Thanks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants