# This is a combination of 2 commits.
# The first commit's message is:

Allow associations inline with contain specify their own finder methods

# This is the 2nd commit message:

Updating how I'm doing this
Updating detached head
This will make it so anywhere a finder is specified it can be an array. Table::callFinder infers the finder and its options from $type, if it's an array.

Fixing Association default options to pass finder into dummy find

Adding a test for contain finder options

Also fixing the scenario in ORM\Association that made it impossible for belongsTo to specify a custom finder.

Cleaning up Cake\ORM\Table:: _inferFinderTypeAndOptions
Merge branch '3.0-contain-with-finder' of https://github.com/patrickconroy/cakephp into 3.0-contain-with-finder

Conflicts:
	tests/TestCase/ORM/QueryTest.php