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

Upgrade 2.0 from 1.0 #1199

Merged
merged 67 commits into from Aug 6, 2019
Merged

Upgrade 2.0 from 1.0 #1199

merged 67 commits into from Aug 6, 2019

Conversation

franmomu
Copy link
Contributor

@franmomu franmomu commented Aug 3, 2019

Q A
Branch? 2.0
Bug fix? yes
New feature? yes
BC breaks? no
Deprecations? no
Tests pass? yes
Fixed tickets #1181, #1011
License MIT
Doc PR

I tried to merge 1.0 in 2.0 as in #1011 to bring back some lost commits

robfrawley and others added 30 commits May 21, 2017 16:31
@robfrawley
change symfony kernel version comparison mechanism
46c7db1
@robfrawley
code style fixes
6cef67f
@robfrawley
remove symfony 3.3 from allowed failures
4c313a2
@makasim
[enqueue] Improve doc.
251006a
@makasim
Merge pull request #942 from formapro-forks/enqueue-doc
73c780c 
[enqueue] Improve doc.
@robfrawley
move to trusty for travis except for php 5.3
6857ef5
@cedricziel
Merge pull request #945 from robfrawley/bugfix-travis
d586411 
Move to trusty for travis except for php 5.3
Typo at log message
a045553
@imanalopher
return filter function String
f57164f
@cedricziel
Merge pull request #951 from imanalopher/1.0
6e43896 
return filter function String
@cedricziel
Merge pull request #947 from you-ser/1.0
5c9c7e8 
Typo at log message
@cedricziel
Merge pull request #940 from robfrawley/feature-remove-symfony-33-fro…
45835f4 
…m-allowed-failures

Remove Symfony 3.3 from allowed failures
@robfrawley
add chain loader implementation
6e8ec6d
@cedricziel
Merge pull request #953 from robfrawley/feature-add-chain-data-loader
6e1be77 
Add chain loader implementation
@robfrawley
add chain loader documentation
2301d94
@cedricziel
Merge pull request #957 from robfrawley/feature-document-chain-loader
ef1d95a 
Add chain loader documentation
@robfrawley
add support for latest imagine library version 0.7.0
6d82293
@robfrawley
Merge pull request #939 from robfrawley/feature-use-version-id-instea…
f65a530 
…d-of-version-numbers

Use simplified Symfony version comparison operation and CS fixes
@robfrawley
add resample filter implementation
309690d
@alexwilson
Merge pull request #958 from robfrawley/feature-use-latest-imagine-lib
c13bb62 
[Composer] Allow imagine-library version 0.7.0
@rpkamp @robfrawley
Pass roots to LocatorInterface directly instead
52eeb9b 
- Allow construction of Locator without data roots for BC
- Mark FilesystemLocator::setOptions deprecated
@robfrawley
cleanup of pr
2dffd96
Modify some PHP Annotations
5e321d2
@robfrawley
enable functional testing of resample filter with both imagick and gm…
22d874c 
…agick
@robfrawley
add comment about supported method signitures for FileSystemLoader::_…
23e79a7 
…_construct()
@lstrojny
Allow to configure the HTTP response code for redirects
39a3c14
@cmodijk
Added support for centerright and centerleft position to the Backgrou…
3413e7c 
…ndFilterLoader
@cedricziel
Merge pull request #965 from imanalopher/1.0
a4fd34a 
Modify some PHP Annotations
@cedricziel
Merge pull request #974 from JCID/patch-1
8e636c6 
Added support for centerright and centerleft position
@cmodijk
Updated the docs for #974
145133a
bocharsky-bw and others added 20 commits September 18, 2017 12:32
@bocharsky-bw
Fix nested level of bucket parameter
4971bf8
@dbu
test with php 7.2
4a69a44
@dbu
Merge pull request #1009 from liip/php-72
713e36f 
test with php 7.2
@peter-gribanov
create fixed filter
e2c8c52
@peter-gribanov
use old array format
41cb286
@qkdreyer
Update png-quant.rst
a69ac5b 
Updated documentation according to quality values
@lsmith77
Merge pull request #1020 from qkdreyer/patch-1
09ccee5 
Update png-quant.rst
@bruno-ds
Update png-quant.rst
8a25c70 
typo:
``/usr/bin/pnquant`` instead of ``/usr/bin/pngquant`` (missing `g`)
@lsmith77
Merge pull request #1026 from bruno-ds/patch-1
153808a 
Update png-quant.rst
@lsmith77
Merge pull request #996 from bocharsky-bw/patch-1
44ea861 
Fix nested level of bucket parameter
@peter-gribanov
Merge remote-tracking branch 'liip/1.0' into 1.0
82ce051
@peter-gribanov
Merge branch '1.0' into fixed_filter
28bdb71
@peter-gribanov
add docs for fixed size filter
9377ac0
@auipga
fix annotation
7cb259a
@cedricziel
Just use inheritdoc tag
376139c
@maximgubar
Merge pull request #1072 from auipga/patch-1
199cc53 
fix annotation
@maximgubar
Merge pull request #1015 from peter-gribanov/fixed_filter
d24e34c 
[Filter] Add "fixed-size" filter implementation
@franmomu
Merge branch '1.0' into merge_from_1_to_2
6683cac
@franmomu
fix tests
33c290f
@franmomu
apply cs fixer
db8c347
dbu
dbu approved these changes Aug 5, 2019
View reviewed changes
Copy link
Member

@dbu dbu left a comment

Choose a reason for hiding this comment

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

looks good to me. the lowest version build seems to be ending up with a too old version of the phpunit-bridge that loads the wrong phpunit. (i guess the problem is not related to this pull request)

@franmomu
Copy link
Contributor Author

franmomu commented Aug 5, 2019 •
edited

It's fixed in the latest version of the library and as the docs says, it's not dependent on the project's symfony version:

The PHPUnit bridge is designed to work with all maintained versions of Symfony components, even across different major versions of them. You should always use its very latest stable major version to get the most accurate deprecation report.

So I increased the version to 4.2, what I'm not sure is if this should be done in another PR... 🤔

@dbu
Copy link
Member

dbu commented Aug 6, 2019

looks good to me, thanks!

@dbu dbu merged commit 715e567 into liip:2.0 Aug 6, 2019
@franmomu
Copy link
Contributor Author

franmomu commented Aug 6, 2019

you're welcome! should I do the same now merging 2.0 into master? so everything is in sync

@franmomu franmomu deleted the merge_from_1_to_2 branch August 6, 2019 06:40
@franmomu franmomu mentioned this pull request Aug 6, 2019
Merged
@dbu dbu mentioned this pull request Aug 9, 2019
Closed
@robfrawley robfrawley mentioned this pull request Oct 4, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dbu dbu dbu approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet