summaryrefslogtreecommitdiffstats
path: root/lib/private/appframework/utility
diff options
context:
space:
mode:
Diffstat (limited to 'lib/private/appframework/utility')
-rw-r--r--lib/private/appframework/utility/controllermethodreflector.php (renamed from lib/private/appframework/utility/methodannotationreader.php)52
-rw-r--r--lib/private/appframework/utility/timefactory.php2
2 files changed, 47 insertions, 7 deletions
diff --git a/lib/private/appframework/utility/methodannotationreader.php b/lib/private/appframework/utility/controllermethodreflector.php
index 42060a08529..c9cdadcca4a 100644
--- a/lib/private/appframework/utility/methodannotationreader.php
+++ b/lib/private/appframework/utility/controllermethodreflector.php
@@ -4,7 +4,7 @@
* ownCloud - App Framework
*
* @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2014 Bernhard Posselt <dev@bernhard-posselt.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -28,23 +28,63 @@ namespace OC\AppFramework\Utility;
/**
* Reads and parses annotations from doc comments
*/
-class MethodAnnotationReader {
+class ControllerMethodReflector {
private $annotations;
+ private $types;
+ private $parameters;
+
+ public function __construct() {
+ $this->types = array();
+ $this->parameters = array();
+ $this->annotations = array();
+ }
+
/**
* @param object $object an object or classname
- * @param string $method the method which we want to inspect for annotations
+ * @param string $method the method which we want to inspect
*/
- public function __construct($object, $method){
- $this->annotations = array();
-
+ public function reflect($object, $method){
$reflection = new \ReflectionMethod($object, $method);
$docs = $reflection->getDocComment();
// extract everything prefixed by @ and first letter uppercase
preg_match_all('/@([A-Z]\w+)/', $docs, $matches);
$this->annotations = $matches[1];
+
+ // extract type parameter information
+ preg_match_all('/@param (?<type>\w+) \$(?<var>\w+)/', $docs, $matches);
+ $this->types = array_combine($matches['var'], $matches['type']);
+
+ // get method parameters
+ foreach ($reflection->getParameters() as $param) {
+ $this->parameters[] = $param->name;
+ }
+ }
+
+
+ /**
+ * Inspects the PHPDoc parameters for types
+ * @param string $parameter the parameter whose type comments should be
+ * parsed
+ * @return string|null type in the type parameters (@param int $something)
+ * would return int or null if not existing
+ */
+ public function getType($parameter) {
+ if(array_key_exists($parameter, $this->types)) {
+ return $this->types[$parameter];
+ } else {
+ return null;
+ }
+ }
+
+
+ /**
+ * @return array the arguments of the method
+ */
+ public function getParameters() {
+ return $this->parameters;
}
diff --git a/lib/private/appframework/utility/timefactory.php b/lib/private/appframework/utility/timefactory.php
index 2c3dd6cf5e3..a9b07a356e3 100644
--- a/lib/private/appframework/utility/timefactory.php
+++ b/lib/private/appframework/utility/timefactory.php
@@ -4,7 +4,7 @@
* ownCloud - App Framework
*
* @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE