[Do not merge] Revert merge master into 2.2

[teohhanhui]

Q	A
Bug fix?	no
New feature?	no
BC breaks?	no
Deprecations?	no
Tests pass?	yes
Fixed tickets	#1850 (comment)
License	MIT
Doc PR	N/A

Relevant merged PRs (that should actually go into 2.2) since #1850:

• Fix the Behat test suite with low dependencies #1853 Fix the Behat test suite with low dependencies (@meyerbaptiste)
• Page number int casting #1871 Page number int casting (@IonBazan)
• Add missing doctrine alias removed in [email protected] #1876 Add missing doctrine alias removed in [email protected] (@soyuka)
• fix exists filter #1861 fix exists filter (@IonBazan)
• Enable item route on collection subresources #1875 Enable item route on collection subresources (@soyuka)
• Forward operation name in the iri converter #1874 Forward operation name in the iri converter (@soyuka)
• Allow GraphQL to filter on nested property #1868 Allow GraphQL to filter on nested property (@antograssiot)
• The OrderFilter is still triggering bad deprecation/function calls #1866 The OrderFilter is still triggering bad deprecation/function calls (@antograssiot)
• Revert 3465b41 (@soyuka) (pushed to 2.2 branch without PR)
• [GraphQL] Remove useless double check of access_control in resolvers #1883 [GraphQL] Remove useless double check of access_control in resolvers (@alanpoulain)
• Move coverage jobs to CircleCI #1888 Move coverage jobs to CircleCI (@teohhanhui)
• add some local caches where they are missing #1892 add some local caches where they are missing (@bendavies)
• Allow subresource items in the iri converter #1877 Allow subresource items in the iri converter (@soyuka)
• fix normalizer cache key generation #1894 fix normalizer cache key generation (@bendavies)
• EagerLoadingExtension: respect fetchEager=false on an association #1897 EagerLoadingExtension: respect fetchEager=false on an association (@bendavies)
• Simplify boolean filter #1905 Simplify boolean filter (@bendavies)
• Revert "Simplify boolean filter" #1907 Revert "Simplify boolean filter" (@teohhanhui)
• RFC: Cache trait #1908 RFC: Cache trait (@bendavies)
• [GraphQL] Fix introspection (graphql-php / GraphiQL) #1886 [GraphQL] Fix introspection (graphql-php / GraphiQL) (@alanpoulain)

d34fba5...2.2
(start from after d611aa0 and 3fdd546 which was when #1850 was merged)

This is done with git cherry-pick, so it's not meant for merging. If everything looks good, I will use this to create a revert commit and open another PR.

Unfortunately for @soyuka, you'll probably have to resubmit your 2 PRs if they're appropriate for 2.2. (Unless they can be rebased here.) Do you think that's okay?

[sroze]

Seems better than my approach of git revert -m 1 d611aa0991c90ca36d90318eff3f689eb3a98e5a and then manually fixing the conflicts:
https://github.com/api-platform/core/compare/2.2...sroze:2.2-but-better?expand=1

[teohhanhui]

@sroze I told you so 😛

[sroze]

We had to try both ways 🤷‍♂️

[soyuka]

Nice work ❤️

Could you quickly explain what you did? (I'm assuming reset [bad_sha1]~1 and cherry-pick correct ranges?)

Unfortunately for @soyuka, you'll probably have to resubmit your 2 PRs if they're appropriate for 2.2. (Unless they can be rebased here.) Do you think that's okay?

Which ones? Yeah it's okay I just need to make sure I have the work locally somewhere :P.

This is done with git cherry-pick, so it's not meant for merging. If everything looks good, I will use this to create a revert commit and open another PR.

Smart move although we could force push 😈

[teohhanhui]

@soyuka See the checklist above. And you can rebase them based on the old commits in this repo. We're not going to rebase. This is only how I come up with the manual revert commit. =P

[soyuka]

• Forward operation name in the iri converter #1874 Forward operation name in the iri converter (@soyuka)
• Allow subresource items in the iri converter #1877 Allow subresource items in the iri converter (@soyuka)

Are both fixes to the 2.2 branch.

Only #1899 should've been merged on master instead of 2.2.

[teohhanhui]

Travis is passing: https://travis-ci.org/teohhanhui/api-platform-core/builds/373994838

The merge conflicts here are to be ignored. 😄

[sroze]

Yeah it's okay I just need to make sure I have the work locally somewhere :P.

@soyuka I'm happy to help you re-submit #1899, I'm pretty knowledgeable about last 20 days changes now xD

[sroze]

Let's have one revert commit instead. I know you have it ready @teohhanhui, thank you ❤️

[sroze]

Closed in favor of #1924