Throw on accessing an undeclared property

Summary: Currently, `Phobject` throws when trying to //set// an undeclared property but not when trying to //get// an undeclared property. It seems reasonable to add this functionality. Test Plan: Added unit tests. Reviewers: epriestley, #blessed_reviewers Reviewed By: epriestley, #blessed_reviewers Subscribers: epriestley, Korvin Differential Revision: https://secure.phabricator.com/D13493
phacility · Jul 6, 2015 · fffe7e4 · fffe7e4
1 parent 112843f
commit fffe7e4
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
@@ -76,6 +76,7 @@
     'PhagePHPAgent' => 'phage/agent/PhagePHPAgent.php',
     'PhagePHPAgentBootloader' => 'phage/bootloader/PhagePHPAgentBootloader.php',
     'Phobject' => 'object/Phobject.php',
+    'PhobjectTestCase' => 'object/__tests__/PhobjectTestCase.php',
     'PhutilAPCKeyValueCache' => 'cache/PhutilAPCKeyValueCache.php',
     'PhutilAWSEC2Future' => 'future/aws/PhutilAWSEC2Future.php',
     'PhutilAWSException' => 'future/aws/PhutilAWSException.php',
@@ -258,7 +259,6 @@
     'PhutilPersonTest' => 'internationalization/__tests__/PhutilPersonTest.php',
     'PhutilPersonaAuthAdapter' => 'auth/PhutilPersonaAuthAdapter.php',
     'PhutilPhabricatorAuthAdapter' => 'auth/PhutilPhabricatorAuthAdapter.php',
-    'PhutilPhobjectTestCase' => 'object/__tests__/PhutilPhobjectTestCase.php',
     'PhutilPhtTestCase' => 'internationalization/__tests__/PhutilPhtTestCase.php',
     'PhutilProcessGroupDaemon' => 'daemon/torture/PhutilProcessGroupDaemon.php',
     'PhutilProtocolChannel' => 'channel/PhutilProtocolChannel.php',
@@ -568,6 +568,7 @@
     'PhagePHPAgent' => 'Phobject',
     'PhagePHPAgentBootloader' => 'PhageAgentBootloader',
     'Phobject' => 'Iterator',
+    'PhobjectTestCase' => 'PhutilTestCase',
     'PhutilAPCKeyValueCache' => 'PhutilKeyValueCache',
     'PhutilAWSEC2Future' => 'PhutilAWSFuture',
     'PhutilAWSException' => 'Exception',
@@ -762,7 +763,6 @@
     ),
     'PhutilPersonaAuthAdapter' => 'PhutilAuthAdapter',
     'PhutilPhabricatorAuthAdapter' => 'PhutilOAuthAuthAdapter',
-    'PhutilPhobjectTestCase' => 'PhutilTestCase',
     'PhutilPhtTestCase' => 'PhutilTestCase',
     'PhutilProcessGroupDaemon' => 'PhutilTortureTestDaemon',
     'PhutilProtocolChannel' => 'PhutilChannelChannel',

diff --git a/src/object/Phobject.php b/src/object/Phobject.php
@@ -19,6 +19,13 @@
  */
 abstract class Phobject implements Iterator {
 
+  public function __get($name) {
+    throw new DomainException(
+      pht(
+        'Attempt to read from undeclared property %s.',
+        get_class($this).'::'.$name));
+    }
+
   public function __set($name, $value) {
     throw new DomainException(
       pht(

diff --git a/...ject/__tests__/PhutilPhobjectTestCase.php → src/object/__tests__/PhobjectTestCase.php b/...ject/__tests__/PhutilPhobjectTestCase.php → src/object/__tests__/PhobjectTestCase.php
@@ -1,17 +1,24 @@
 <?php
 
-final class PhutilPhobjectTestCase extends PhutilTestCase {
+final class PhobjectTestCase extends PhutilTestCase {
 
   public function testThrowOnUndeclaredProperty() {
     $object = new PhutilTestPhobject();
 
     $caught = null;
     try {
-      $object->duck = 'quack';
+      $object->duck;
     } catch (Exception $ex) {
       $caught = $ex;
     }
+    $this->assertTrue($caught instanceof DomainException);
 
+    $caught = null;
+    try {
+      $object->duck = 'quack';
+    } catch (Exception $ex) {
+      $caught = $ex;
+    }
     $this->assertTrue($caught instanceof DomainException);
   }