Merge pull request #2399 from cakephp/3.0-propertyName

Rename property -> propertyName
cakephp · Nov 28, 2013 · f669d8c · f669d8c
2 parents dd95ba9 + 29f27bb
commit f669d8c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/Cake/ORM/Association.php b/Cake/ORM/Association.php
@@ -129,7 +129,7 @@ abstract class Association {
  *
  * @var string
  */
-	protected $_property;
+	protected $_propertyName;
 
 /**
  * The strategy name to be used to fetch associated records. Some association
@@ -157,7 +157,7 @@ public function __construct($name, array $options = []) {
 			'sourceTable',
 			'targetTable',
 			'joinType',
-			'property'
+			'propertyName'
 		];
 		foreach ($defaults as $property) {
 			if (isset($options[$property])) {
@@ -306,12 +306,12 @@ public function joinType($type = null) {
  */
 	public function property($name = null) {
 		if ($name !== null) {
-			$this->_property = $name;
+			$this->_propertyName = $name;
 		}
-		if ($name === null && !$this->_property) {
-			$this->_property = Inflector::underscore($this->_name);
+		if ($name === null && !$this->_propertyName) {
+			$this->_propertyName = Inflector::underscore($this->_name);
 		}
-		return $this->_property;
+		return $this->_propertyName;
 	}
 
 /**

diff --git a/Cake/ORM/Association/BelongsTo.php b/Cake/ORM/Association/BelongsTo.php
@@ -80,10 +80,10 @@ public function property($name = null) {
 		if ($name !== null) {
 			return parent::property($name);
 		}
-		if ($name === null && !$this->_property) {
-			$this->_property = Inflector::underscore(Inflector::singularize($this->_name));
+		if ($name === null && !$this->_propertyName) {
+			$this->_propertyName = Inflector::underscore(Inflector::singularize($this->_name));
 		}
-		return $this->_property;
+		return $this->_propertyName;
 	}
 
 /**

diff --git a/Cake/ORM/Association/HasOne.php b/Cake/ORM/Association/HasOne.php
@@ -76,10 +76,10 @@ public function property($name = null) {
 		if ($name !== null) {
 			return parent::property($name);
 		}
-		if ($name === null && !$this->_property) {
-			$this->_property = Inflector::underscore(Inflector::singularize($this->_name));
+		if ($name === null && !$this->_propertyName) {
+			$this->_propertyName = Inflector::underscore(Inflector::singularize($this->_name));
 		}
-		return $this->_property;
+		return $this->_propertyName;
 	}
 
 /**

diff --git a/Cake/Test/TestApp/Model/Repository/TagsTable.php b/Cake/Test/TestApp/Model/Repository/TagsTable.php
@@ -22,7 +22,7 @@ class TagsTable extends Table {
 	public function initialize(array $config) {
 		$this->belongsTo('authors');
 		$this->belongsToMany('tags');
-		$this->hasMany('articlesTags', ['property' => 'extraInfo']);
+		$this->hasMany('articlesTags', ['propertyName' => 'extraInfo']);
 	}
 
 }