Merge pull request #5847 from nextcloud/make-phan-config-more-strict-2

Phan fixes

2 files changed, 2 insertions, 2 deletions

diff --git a/lib/private/AppFramework/DependencyInjection/DIContainer.php b/lib/private/AppFramework/DependencyInjection/DIContainer.php
index b233f3ca9b6..d0c69c3bf32 100644
--- a/lib/private/AppFramework/DependencyInjection/DIContainer.php
+++ b/lib/private/AppFramework/DependencyInjection/DIContainer.php
@@ -75,7 +75,7 @@ class DIContainer extends SimpleContainer implements IAppContainer {
 	 * Put your class dependencies in here
 	 * @param string $appName the name of the app
 	 * @param array $urlParams
-	 * @param ServerContainer $server
+	 * @param ServerContainer|null $server
 	 */
 	public function __construct($appName, $urlParams = array(), ServerContainer $server = null){
 		parent::__construct();
diff --git a/lib/private/AppFramework/Http/Request.php b/lib/private/AppFramework/Http/Request.php
index 09e18f74177..956744e5d5e 100644
--- a/lib/private/AppFramework/Http/Request.php
+++ b/lib/private/AppFramework/Http/Request.php
@@ -721,7 +721,7 @@ class Request implements \ArrayAccess, \Countable, IRequest {
 
 		// strip off the script name's dir and file name
 		// FIXME: Sabre does not really belong here
-		list($path, $name) = \Sabre\HTTP\URLUtil::splitPath($scriptName);
+		list($path, $name) = \Sabre\Uri\split($scriptName);
 		if (!empty($path)) {
 			if($path === $pathInfo || strpos($pathInfo, $path.'/') === 0) {
 				$pathInfo = substr($pathInfo, strlen($path));