Merge branch '3.0-matching-fixes' of github.com:cakephp/cakephp into 3.0-matching-fixes

Conflicts:
	src/ORM/EagerLoadable.php
	src/ORM/EagerLoader.php

src/ORM/EagerLoadable.php

@@ -19,6 +19,8 @@ namespace Cake\ORM;
  * for a specific query. This contains all the information required to
  * fetch the results from the database from an associations and all its children
  * levels.
+ *
+ * @internal
  */
 class EagerLoadable
 {
@@ -69,14 +71,14 @@ class EagerLoadable
     protected $_propertyPath;
 
     /**
-     * Weather or not this level can be fetched using a join.
+     * Whether or not this level can be fetched using a join.
      *
      * @var bool
      */
     protected $_canBeJoined = false;
 
     /**
-     * Weather or not this level was meant for a "matching" fetch
+     * Whether or not this level was meant for a "matching" fetch
      * operation
      *
      * @var bool
@@ -147,7 +149,7 @@ class EagerLoadable
     }
 
     /**
-     * Gets a dotted separated string representing the path of associations
+     * Gets a dot separated string representing the path of associations
      * that should be followed to fetch this level.
      *
      * @return string|null
@@ -158,7 +160,7 @@ class EagerLoadable
     }
 
     /**
-     * Gets a dotted separated string representing the path of entity properties
+     * Gets a dot separated string representing the path of entity properties
      * in which results for this level should be placed.
      *
      * @return string|null
@@ -169,10 +171,9 @@ class EagerLoadable
     }
 
     /**
-     * Sets weather or not this level can be fetched using a join.
+     * Sets whether or not this level can be fetched using a join.
      *
-     * If called with no arguments it returns the current
-     * value.
+     * If called with no arguments it returns the current value.
      *
      * @param bool|null $possible The value to set.
      * @return bool|null
@@ -204,7 +205,7 @@ class EagerLoadable
     }
 
     /**
-     * Gets weather or not this level was meant for a
+     * Gets whether or not this level was meant for a
      * "matching" fetch operation.
      *
      * @return bool|null