summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2016-11-15 11:15:44 +0100
committerRoeland Jago Douma <roeland@famdouma.nl>2017-01-06 09:42:13 +0100
commit1f769e6e76c3741d322b8856929f723f755c9f79 (patch)
tree86eb04d493678aa46c18358e88d0d0c2d7929ebe
parent6380d503af3252e0fea8d25e8bbe2f91d5aee1da (diff)
downloadnextcloud-server-1f769e6e76c3741d322b8856929f723f755c9f79.tar.gz
nextcloud-server-1f769e6e76c3741d322b8856929f723f755c9f79.zip
Fix php docs
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
-rw-r--r--lib/private/AppFramework/DependencyInjection/DIContainer.php1
-rw-r--r--lib/private/CssManager.php1
-rw-r--r--lib/private/Server.php2
-rwxr-xr-xlib/private/Template/SCSSCacher.php38
4 files changed, 21 insertions, 21 deletions
diff --git a/lib/private/AppFramework/DependencyInjection/DIContainer.php b/lib/private/AppFramework/DependencyInjection/DIContainer.php
index 57e7749ca86..3e514ca533d 100644
--- a/lib/private/AppFramework/DependencyInjection/DIContainer.php
+++ b/lib/private/AppFramework/DependencyInjection/DIContainer.php
@@ -95,7 +95,6 @@ class DIContainer extends SimpleContainer implements IAppContainer {
return $this->getServer()->getAvatarManager();
});
-
$this->registerService('OCP\\ICssManager', function($c) {
return $this->getServer()->getCssManager();
});
diff --git a/lib/private/CssManager.php b/lib/private/CssManager.php
index e22cb069306..8ab9a778b1c 100644
--- a/lib/private/CssManager.php
+++ b/lib/private/CssManager.php
@@ -50,6 +50,7 @@ class CssManager implements ICssManager {
* @param string $fileName css filename with extension
* @param string $appName css app name
* @return ISimpleFile
+ * @throws NotFoundException
*/
public function getCss($fileName, $appName) {
try {
diff --git a/lib/private/Server.php b/lib/private/Server.php
index a8825f9ff24..381ac3fa983 100644
--- a/lib/private/Server.php
+++ b/lib/private/Server.php
@@ -903,7 +903,6 @@ class Server extends ServerContainer implements IServerContainer {
return $this->query('SystemTagObjectMapper');
}
-
/**
* Returns the avatar manager, used for avatar functionality
*
@@ -913,7 +912,6 @@ class Server extends ServerContainer implements IServerContainer {
return $this->query('AvatarManager');
}
-
/**
* Returns the css manager
*
diff --git a/lib/private/Template/SCSSCacher.php b/lib/private/Template/SCSSCacher.php
index e72e122155c..0b22e44d7c6 100755
--- a/lib/private/Template/SCSSCacher.php
+++ b/lib/private/Template/SCSSCacher.php
@@ -28,27 +28,29 @@ use OCP\IURLGenerator;
class SCSSCacher {
- protected $root;
- protected $folder;
- protected $file;
- protected $fileNameSCSS;
- protected $fileNameCSS;
- protected $fileLoc;
- protected $rootCssLoc;
-
- /** @var \OCP\ILogger */
- protected $logger;
- /** @var \OCP\Files\IAppData */
- protected $appData;
- /** @var \OCP\IURLGenerator */
- protected $urlGenerator;
- /** @var \OC\SystemConfig */
- protected $systemConfig;
+ /**
+ * @var string The root path to the nextcloud installation
+ * @var array The exploded absolute path to the file
+ * @var string The scss filename with extension
+ * @var string The css filename with extension
+ * @var string Absolute path to scss file location folder
+ * @var string Path to scss file from the root installation
+ * @var OC\Files\SimpleFS\SimpleFolder The folder we're putting our compiled css files
+ */
+ protected $root, $file, $fileNameSCSS, $fileNameCSS, $fileLoc, $rootCssLoc, $folder;
+
+ /**
+ * @var \OCP\ILogger
+ * @var \OCP\Files\IAppData
+ * @var \OCP\IURLGenerator
+ * @var \OC\SystemConfig
+ */
+ protected $logger, $appData, $urlGenerator, $systemConfig;
/**
* @param \OCP\ILogger $logger
- * @param string $root
- * @param string $file
+ * @param string $root Root path to the nextcloud installation
+ * @param string $file
* @param \OCP\Files\IAppData $appData
* @param \OCP\IURLGenerator $urlGenerator
* @param \OC\SystemConfig $systemConfig