Using AccessorTrait

lib/LocalizedObject.php

@@ -11,8 +11,6 @@
 
 namespace ICanBoogie\CLDR;
 
-use ICanBoogie\PropertyNotDefined;
-
 /**
  * Representation of a localized object.
  *
@@ -36,6 +34,9 @@ static public function from($source, Locale $locale, array $options=[])
 		return new static($source, $locale, $options);
 	}
 
+	use AccessorTrait;
+	use LocalePropertyTrait;
+
 	/**
 	 * The object to localize.
 	 *
@@ -48,8 +49,6 @@ protected function get_target()
 		return $this->target;
 	}
 
-	use LocalePropertyTrait;
-
 	/**
 	 * Options.
 	 *
@@ -70,25 +69,4 @@ public function __construct($target, Locale $locale, array $options=[])
 		$this->locale = $locale;
 		$this->options = $options;
 	}
-
-	/**
-	 * Support for the {@link $target}, {@link $locale}, and {@link $formatter} properties.
-	 *
-	 * @param string $property
-	 *
-	 * @throws PropertyNotDefined in attempt to get a property that is not supported.
-	 *
-	 * @return mixed
-	 */
-	public function __get($property)
-	{
-		$method = 'get_' . $property;
-
-		if (method_exists($this, $method))
-		{
-			return $this->$method();
-		}
-
-		throw new PropertyNotDefined([ $property, $this ]);
-	}
 }

tests/LocalizedDateTimeTest.php

@@ -38,7 +38,7 @@ public function test_get_locale()
 	}
 
 	/**
-	 * @expectedException \ICanBoogie\PropertyNotDefined
+	 * @expectedException \ICanBoogie\PropertyNotReadable
 	 */
 	public function test_get_options()
 	{