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.

Sign up for GitHub

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

Jump to bottom

DO NOT MERGE - REFERENCE - branch:omg-8.3 #2

Draft
wants to merge 38 commits into
base: master
Choose a base branch
from
Draft

DO NOT MERGE - REFERENCE - branch:omg-8.3 #2

wants to merge 38 commits into from

Conversation

permanuno
Copy link
Member

@permanuno permanuno commented Aug 10, 2024 •
edited
Loading

How this was created:

git checkout omg-7.4
git checkout -b omg-8.3
git merge origin/master

Conflict resolution

  • accept all non-conflicting changes in theirs
  • manually reconcile remaining changes

Diff should be functionally equivalent to propelorm/Propel@master...OrderMyGear:Propel:omg-7.4

e1himself and others added 30 commits February 17, 2016 10:25
Do not forbit to use native Postgres arrays
ee7af27
Make DBPostgres quote identifiers (where possible)
147131f
@akalongman
Fix for PHP 7.1 error "A non-numeric value encountered"
d0ac94c
Fix a way it determines first PK
91ad55e 
Previously, it was producing an invalid order in case we're using
a many-to-many cross-ref table referencing to the same table twice.
Thus checking for a table name is not reliable.
Now we just check if the first PK is the same as a give FK. That's it.
Don't limit column name to 5 chars
a38b071 
Sometimes culture codes can be longer.
Example: `zh_Hant` -- Chinese Traditional.
Storage-wise there's no difference between VARCHAR(255) and VARCHAR(5)
@e1himself
Rename package, keeping "provide" section for BC
3169139
@e1himself
Merge pull request #2 from prezly-forks/fix/many-to-many-self-referen…
5d82328 
…cing-bug

Fix - Many-to-many self-referencing relations bug
@e1himself
Merge pull request #1 from prezly-forks/fix/i18n-behavior-locale-colu…
113d913 
…mn-length

Fix - Remove `locale` column size limit
@e1himself
Merge pull request propelorm#3 from prezly-forks/patch/php-7.1
8972313 
Fix - PHP 7.1 compatibility
@e1himself
Merge remote-tracking branch 'origin/master'
f1f1716
@e1himself
Restrict PHP to 5.6+
f308f7e
@e1himself
Replace create_function with inline closure function
274edb5
Merge pull request propelorm#4 from prezly-forks/better-postgres-support
59125b1 
Feature - Better Postgres support
@e1himself
Merge remote-tracking branch 'origin/master'
f7b5890
@e1himself
Update changelog
757123e
@e1himself
Fix warning on "continue targeting switch statement"
e59f03a 
@see https://www.php.net/manual/en/migration73.incompatible.php#migration73.incompatible.core.continue-targeting-switch
@e1himself
Merge pull request propelorm#5 from rock-symphony/fix/php-7.3-compati…
ef41ee3 
…bility

Fix - PHP 7.3 compatibility
@e1himself
Release v1.8.1
71691a9
@e1himself
Update composer.json
8dc9206
@e1himself
Fix ModelCriteria::select() PHP 7.3 incompatibility
e968086
@e1himself
Release v1.8.2
37cce1e
@e1himself
Fix unneeded write to collXxxPartial for cross-ref relations
18c70f4 
Fixes propelorm#6
@e1himself
Fix composer.json error
ee7aacc
@e1himself
Fix array item access curly braces syntax
b715ac7 
It throws a warning in PHP 7.4
@e1himself
Fix inverse implode() arguments order
5b8b65b 
It throws a warning on PHP 7.4
@e1himself
Try to fix Travis CI config
05f16b6
@e1himself
Completely drop PEAR-related functionality
3024127
@e1himself
Fix i18n tests
8c213d7 
See #1
@e1himself
Fix usages of deprecated getMock() test methods
6aa1ee8
Merge pull request propelorm#7 from rock-symphony/fix/php-7.4-compati…
118ac2c 
…bility

Fix - PHP 7.4 compatibility
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@permanuno @akalongman @e1himself