From 8f84c99e3f4455867d588eaeba29603e44ab1c31 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 5 Jul 2016 22:45:05 +0200
Subject: [PATCH] Fix undefined properties

---
 apps/dav/lib/CalDAV/BirthdayService.php          | 6 ++++++
 apps/dav/lib/CardDAV/ContactsManager.php         | 2 ++
 apps/dav/lib/Server.php                          | 6 ++++++
 apps/federation/lib/DbHandler.php                | 4 ++--
 apps/files_external/lib/Lib/Storage/AmazonS3.php | 3 +++
 apps/files_external/lib/Lib/Storage/Swift.php    | 4 ++++
 6 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/apps/dav/lib/CalDAV/BirthdayService.php b/apps/dav/lib/CalDAV/BirthdayService.php
index 26e3d22ce4..573713d2a9 100644
--- a/apps/dav/lib/CalDAV/BirthdayService.php
+++ b/apps/dav/lib/CalDAV/BirthdayService.php
@@ -35,6 +35,12 @@ class BirthdayService {
 	/** @var GroupPrincipalBackend */
 	private $principalBackend;
 
+	/** @var CalDavBackend  */
+	private $calDavBackEnd;
+
+	/** @var CardDavBackend  */
+	private $cardDavBackEnd;
+
 	/**
 	 * BirthdayService constructor.
 	 *
diff --git a/apps/dav/lib/CardDAV/ContactsManager.php b/apps/dav/lib/CardDAV/ContactsManager.php
index ad633483fd..a9f35d53d7 100644
--- a/apps/dav/lib/CardDAV/ContactsManager.php
+++ b/apps/dav/lib/CardDAV/ContactsManager.php
@@ -25,6 +25,8 @@ use OCP\Contacts\IManager;
 use OCP\IURLGenerator;
 
 class ContactsManager {
+	/** @var CardDavBackend  */
+	private $backend;
 
 	/**
 	 * ContactsManager constructor.
diff --git a/apps/dav/lib/Server.php b/apps/dav/lib/Server.php
index 7fa1b13783..ddfd84d436 100644
--- a/apps/dav/lib/Server.php
+++ b/apps/dav/lib/Server.php
@@ -43,6 +43,12 @@ class Server {
 	/** @var IRequest */
 	private $request;
 
+	/** @var  string */
+	private $baseUri;
+
+	/** @var Connector\Sabre\Server  */
+	protected $server;
+
 	public function __construct(IRequest $request, $baseUri) {
 		$this->request = $request;
 		$this->baseUri = $baseUri;
diff --git a/apps/federation/lib/DbHandler.php b/apps/federation/lib/DbHandler.php
index 015a06c035..5cfbc9f021 100644
--- a/apps/federation/lib/DbHandler.php
+++ b/apps/federation/lib/DbHandler.php
@@ -43,7 +43,7 @@ class DbHandler {
 	private $connection;
 
 	/** @var  IL10N */
-	private $l;
+	private $IL10N;
 
 	/** @var string  */
 	private $dbTable = 'trusted_servers';
@@ -87,7 +87,7 @@ class DbHandler {
 			return (int)$this->connection->lastInsertId('*PREFIX*'.$this->dbTable);
 		} else {
 			$message = 'Internal failure, Could not add ownCloud as trusted server: ' . $url;
-			$message_t = $this->l->t('Could not add server');
+			$message_t = $this->IL10N->t('Could not add server');
 			throw new HintException($message, $message_t);
 		}
 	}
diff --git a/apps/files_external/lib/Lib/Storage/AmazonS3.php b/apps/files_external/lib/Lib/Storage/AmazonS3.php
index 4bb4312a54..d67db9858c 100644
--- a/apps/files_external/lib/Lib/Storage/AmazonS3.php
+++ b/apps/files_external/lib/Lib/Storage/AmazonS3.php
@@ -74,6 +74,9 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 	 */
 	private $rescanDelay = 10;
 
+	/** @var string  */
+	private $id;
+
 	/**
 	 * @param string $path
 	 * @return string correctly encoded path
diff --git a/apps/files_external/lib/Lib/Storage/Swift.php b/apps/files_external/lib/Lib/Storage/Swift.php
index d015e71f9d..b7f833f9e7 100644
--- a/apps/files_external/lib/Lib/Storage/Swift.php
+++ b/apps/files_external/lib/Lib/Storage/Swift.php
@@ -68,6 +68,10 @@ class Swift extends \OC\Files\Storage\Common {
 	 * @var array
 	 */
 	private $params;
+
+	/** @var string  */
+	private $id;
+
 	/**
 	 * @var array
 	 */