Merge branch 'master' into refactor/OC-Server-getShareManager

Signed-off-by: John Molakvoæ <skjnldsv@users.noreply.github.com>

diff --cc lib/private/Template/JSConfigHelper.php
index 9cf0838e43a4213550994a63fe636c45a61640b4,8cba93f1f4e693d121fc73f5c6b2739fe02b953b..d2cd536fa9f903d96743c24a9fddc9c237566061
--- 1/lib/private/Template/JSConfigHelper.php
--- 2/lib/private/Template/JSConfigHelper.php
+++ b/lib/private/Template/JSConfigHelper.php
@@@ -45,11 -45,10 +45,11 @@@ use OCP\IConfig
  use OCP\IGroupManager;
  use OCP\IInitialStateService;
  use OCP\IL10N;
+ use OCP\ILogger;
  use OCP\ISession;
  use OCP\IURLGenerator;
- use OCP\ILogger;
  use OCP\IUser;
 +use OCP\Share\IManager as IShareManager;
  use OCP\User\Backend\IPasswordConfirmationBackend;
  use OCP\Util;
  

diff --cc lib/public/Util.php
index 34ccc61074fb61d9d2a396b241d567380b5e2429,e3f394c1ca9d5d83dd37dca014fd355772646ed9..87b0700f12b45cbf52e62ef8c63c6bf108d61a09
--- 1/lib/public/Util.php
--- 2/lib/public/Util.php
+++ b/lib/public/Util.php
@@@ -46,11 -46,12 +46,13 @@@
  
  namespace OCP;
  
+ use bantu\IniGetWrapper\IniGetWrapper;
  use OC\AppScriptDependency;
  use OC\AppScriptSort;
- use bantu\IniGetWrapper\IniGetWrapper;
 +use OCP\Share\IManager as IShareManager;
+ use OCP\Share\IManager;
  use Psr\Container\ContainerExceptionInterface;
+ use Psr\Log\LoggerInterface;
  
  /**
   * This class provides different helper functions to make the life of a developer easier

diff --cc tests/lib/Files/ViewTest.php
Simple merge

diff --cc tests/lib/Share20/DefaultShareProviderTest.php
Simple merge