Merge pull request UnionOfRAD#980 from jails/refactor/model-inherited…

…-typo

Change naming for model attribute inheritance.

data/Model.php

@@ -338,10 +338,10 @@ class Model extends \lithium\core\StaticObject {
 	/**
 	 * Holds an array of attributes to be inherited.
 	 *
-	 * @see lithium\data\Model::_getInheritedAttributes()
+	 * @see lithium\data\Model::_inherited()
 	 * @var array
 	 */
-	protected $_inherit = array();
+	protected $_inherits = array();
 
 	/**
 	 * Configures the model for use. This method will set the `Model::$_schema`, `Model::$_meta`,
@@ -393,7 +393,7 @@ protected static function _initialize($class) {
 		}
 		static::$_initialized[$class] = true;
 
-		$self->_applyAttrsInheritance();
+		$self->_inherit();
 
 		$source = array(
 			'classes' => array(), 'meta' => array(), 'finders' => array(), 'schema' => array()
@@ -444,9 +444,9 @@ protected static function _initialize($class) {
 	/**
 	 * Merge parent class attributes to the current instance.
 	 */
-	protected function _applyAttrsInheritance() {
+	protected function _inherit() {
 
-		$inherited = array_fill_keys($this->_getInheritedAttrs(), array());
+		$inherited = array_fill_keys($this->_inherited(), array());
 
 		foreach (static::_parents() as $parent) {
 			$parentConfig = get_class_vars($parent);
@@ -477,8 +477,8 @@ protected function _applyAttrsInheritance() {
 	 *
 	 * @param array
 	 */
-	protected function _getInheritedAttrs() {
-		return array_merge($this->_inherit, array(
+	protected function _inherited() {
+		return array_merge($this->_inherits, array(
 			'validates',
 			'belongsTo',
 			'hasMany',

tests/mocks/data/MockProduct.php

@@ -12,7 +12,7 @@ class MockProduct extends \lithium\data\Model {
 
 	protected $_meta = array('source' => 'mock_products', 'connection' => false);
 
-	protected $_inherit = array('_custom');
+	protected $_inherits = array('_custom');
 
 	protected $_custom = array(
 		'prop1' => 'value1'