some fixes

contributte · Nov 19, 2019 · ffc5d12 · ffc5d12
1 parent 42ece28
commit ffc5d12
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/src/Generator.php b/src/Generator.php
@@ -85,13 +85,13 @@ public function generateAll(IRouter $router): void
 	}
 
 
-	public function generateTarget(ApiRoute $route, Request $request): void
+	public function generateTarget(ApiRoute $route, array $parameters): void
 	{
 		$template = $this->createTemplate('api_docu_matched.latte');
 
 		$template->setParameters([
 			'route' => $route,
-			'request' => $request,
+			'requestParameters' => $parameters,
 			'httpRequest' => $this->httpRequest,
 		]);
 

diff --git a/src/Starter.php b/src/Starter.php
@@ -53,20 +53,20 @@ public function __construct(
 	/**
 	 * Event thatis firex when particular ApiRoute is matched
 	 */
-	public function routeMatched(ApiRoute $route, Request $request): void
+	public function routeMatched(ApiRoute $route, array $parameters): void
 	{
-		$format = $request->getParameter(self::API_DOCU_STARTER_QUERY_KEY_GENERATE);
+		$format = $parameters[self::API_DOCU_STARTER_QUERY_KEY_GENERATE] ?? null;
 
 		if ($format !== null) {
 			$this->generator->generateAll($this->router);
 
 			exit(0);
 		}
 
-		$format = $request->getParameter(self::API_DOCU_STARTER_QUERY_KEY_TARGET);
+		$format = $parameters[self::API_DOCU_STARTER_QUERY_KEY_TARGET] ?? null;
 
 		if ($format !== null) {
-			$this->generator->generateTarget($route, $request);
+			$this->generator->generateTarget($route, $parameters);
 
 			exit(0);
 		}

diff --git a/src/TemplateFilters.php b/src/TemplateFilters.php
@@ -29,8 +29,9 @@ public static function common(string $filter): ?string
 	}
 
 
-	public static function description(string $text): string
+	public static function description(array $text): string
 	{
+		$text = reset($text);
 		$text = nl2br($text);
 		$text = str_replace(["\n", "\n\r", "\r\n", "\r"], '', $text);
 

diff --git a/src/templates/api_docu_matched.latte b/src/templates/api_docu_matched.latte
@@ -2,17 +2,17 @@
 
 {**
  * @param $route Ublaboo\ApiRouter\ApiRoute
- * @param $request Nette\Application\Request
+ * @param $requestParameters array
  *}
 
 {var $parameters = $route->getParameters()}
 {var $query_parameters = []}
 
-{foreach $request->getParameters() as $name => $parameter}
+{foreach $requestParameters as $name => $parameter}
 	{continueIf in_array($name, $route->getPlacehodlerParameters())}
-	{continueIf $name == 'action'}
+	{continueIf in_array($name, ['action', 'presenter', 'method', 'post', 'files', 'secured'], true)}
 
-	{var $query_parameters[$name] = \Tracy\Debugger::dump($request->getParameter($name), TRUE)}
+	{var $query_parameters[$name] = \Tracy\Debugger::dump($parameter, TRUE)}
 {/foreach}
 
 {block title}{$route->getPath()}{/block}
@@ -66,7 +66,7 @@
 							</div>
 						</th>
 						<td>
-							{var $value = \Tracy\Debugger::dump($request->getParameter($parameter), TRUE)}
+							{var $value = \Tracy\Debugger::dump($requestParameters[$parameter] ?? null, TRUE)}
 							{$value|noescape}
 						</td>
 					</tr>