Starting to make the base entity's properties accessible by default

cakephp · Mar 16, 2014 · a3eb624 · a3eb624
1 parent c380a0a
commit a3eb624
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/Datasource/EntityTrait.php b/src/Datasource/EntityTrait.php
@@ -95,7 +95,7 @@ trait EntityTrait {
  *
  * @var array
  */
-	protected $_accessible = [];
+	protected $_accessible = ['*' => true];
 
 /**
  * Magic getter to access properties that has be set in this entity
@@ -644,7 +644,11 @@ protected function _nestedErrors($field) {
  */
 	public function accessible($property, $set = null) {
 		if ($set === null) {
-			return !empty($this->_accessible[$property]) || !empty($this->_accessible['*']);
+			$value = isset($this->_accessible[$property]) ?
+				$this->_accessible[$property] :
+				null;
+
+			return ($value === null && !empty($this->_accessible['*'])) || $value;
 		}
 
 		if ($property === '*') {

diff --git a/tests/TestCase/ORM/EntityTest.php b/tests/TestCase/ORM/EntityTest.php
@@ -860,6 +860,7 @@ public function testCleanRemovesErrors() {
  */
 	public function testAccessible() {
 		$entity = new Entity;
+		$entity->accessible('*', false);
 		$this->assertFalse($entity->accessible('foo'));
 		$this->assertFalse($entity->accessible('bar'));