Merge branch 'master' into no-css-js-delivery-via-php

2 files changed, 5 insertions, 0 deletions

diff --git a/lib/private/template/base.php b/lib/private/template/base.php
index e698d855a91..232a29939cc 100644
--- a/lib/private/template/base.php
+++ b/lib/private/template/base.php
@@ -30,6 +30,8 @@ class Base {
 	/**
 	 * @param string $serverroot
 	 * @param string|false $app_dir
+	 * @param string $theme
+	 * @param string $app
 	 */
 	protected function getAppTemplateDirs($theme, $app, $serverroot, $app_dir) {
 		// Check if the app is in the app folder or in the root
@@ -47,6 +49,7 @@ class Base {
 
 	/**
 	 * @param string $serverroot
+	 * @param string $theme
 	 */
 	protected function getCoreTemplateDirs($theme, $serverroot) {
 		return array(
@@ -119,6 +122,7 @@ class Base {
 
 	/**
 	 * @brief doing the actual work
+	 * @param string $file
 	 * @return string content
 	 *
 	 * Includes the template file, fetches its output
diff --git a/lib/private/template/templatefilelocator.php b/lib/private/template/templatefilelocator.php
index 05cd752cd4f..4676fceb37d 100644
--- a/lib/private/template/templatefilelocator.php
+++ b/lib/private/template/templatefilelocator.php
@@ -15,6 +15,7 @@ class TemplateFileLocator {
 
 	/**
 	 * @param string[] $dirs
+	 * @param string $form_factor
 	 */
 	public function __construct( $form_factor, $dirs ) {
 		$this->form_factor = $form_factor;