Query Music app class from the \OC::$server instead of creating directly

This prevents error log spamming on NC18+ when the debug mode has been enabled with `'debug' => true` and PHP version older than 7.4 is used. Probably this also might have a positive performance impact. refs #849
owncloud · May 6, 2021 · 34da573 · 34da573
1 parent 76399da
commit 34da573
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 16 deletions.
diff --git a/appinfo/app.php b/appinfo/app.php
@@ -16,7 +16,7 @@
 
 use \OCP\AppFramework\IAppContainer;
 
-$app = new Music();
+$app = \OC::$server->query(Music::class);
 
 $c = $app->getContainer();
 $appName = $c->query('AppName');
@@ -55,7 +55,7 @@
 );
 
 /**
- * Set content security policy to allow streaming media from the configured external sources if we have a logged-in user
+ * Set content security policy to allow streaming media from the configured external sources
  */
 function adjustCsp(IAppContainer $container) {
 	/** @var \OCP\IConfig $config */

diff --git a/appinfo/register_command.php b/appinfo/register_command.php
@@ -11,12 +11,12 @@
  * @author Pauli Järvinen <pauli.jarvinen@gmail.com>
  * @copyright Leizh 2014
  * @copyright Morris Jobke 2014
- * @copyright Pauli Järvinen 2017
+ * @copyright Pauli Järvinen 2017 - 2021
  */
 
 use \OCA\Music\App\Music;
 
-$app = new Music();
+$app = \OC::$server->query(Music::class);
 $c = $app->getContainer();
 
 $application->add(new OCA\Music\Command\Scan(

diff --git a/appinfo/routes.php b/appinfo/routes.php
@@ -9,14 +9,14 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Pauli Järvinen <pauli.jarvinen@gmail.com>
  * @copyright Morris Jobke 2014
- * @copyright Pauli Järvinen 2017 - 2020
+ * @copyright Pauli Järvinen 2017 - 2021
  */
 
 namespace OCA\Music;
 
 use \OCA\Music\App\Music;
 
-$app = new Music();
+$app = \OC::$server->query(Music::class);
 
 $app->registerRoutes($this, ['routes' => [
 	// page

diff --git a/lib/Backgroundjob/Cleanup.php b/lib/Backgroundjob/Cleanup.php
@@ -7,7 +7,9 @@
  * later. See the COPYING file.
  *
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Pauli Järvinen <pauli.jarvinen@gmail.com>
  * @copyright Morris Jobke 2013, 2014
+ * @copyright Pauli Järvinen 2017 - 2021
  */
 
 namespace OCA\Music\Backgroundjob;
@@ -20,7 +22,7 @@ class Cleanup {
 	 * Run background cleanup task
 	 */
 	public static function run() {
-		$app = new Music();
+		$app = \OC::$server->query(Music::class);
 
 		$container = $app->getContainer();
 

diff --git a/lib/Hooks/FileHooks.php b/lib/Hooks/FileHooks.php
@@ -9,7 +9,7 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Pauli Järvinen <pauli.jarvinen@gmail.com>
  * @copyright Morris Jobke 2014
- * @copyright Pauli Järvinen 2017 - 2020
+ * @copyright Pauli Järvinen 2017 - 2021
  */
 
 namespace OCA\Music\Hooks;
@@ -32,7 +32,7 @@ public function __construct($filesystemRoot) {
 	 * @param Node $node pointing to the file or folder
 	 */
 	public static function deleted(Node $node) {
-		$app = new Music();
+		$app = \OC::$server->query(Music::class);
 		$container = $app->getContainer();
 		$scanner = $container->query('Scanner');
 
@@ -56,7 +56,7 @@ public static function updated(Node $node) {
 		// File::fopen, this hook gets triggered immediately after the opening succeeds,
 		// before anything is actually written and while the file is *exlusively locked
 		// because of the write mode*. See #638.
-		$app = new Music();
+		$app = \OC::$server->query(Music::class);
 		$container = $app->getContainer();
 		try {
 			self::handleUpdated($node, $container);

diff --git a/lib/Hooks/ShareHooks.php b/lib/Hooks/ShareHooks.php
@@ -9,7 +9,7 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Pauli Järvinen <pauli.jarvinen@gmail.com>
  * @copyright Morris Jobke 2014
- * @copyright Pauli Järvinen 2017 - 2020
+ * @copyright Pauli Järvinen 2017 - 2021
  */
 
 namespace OCA\Music\Hooks;
@@ -38,7 +38,7 @@ private static function removeSharedItem($app, $itemType, $nodeId, $owner, $remo
 	 */
 	public static function itemUnshared(array $params) {
 		$shareType = $params['shareType'];
-		$app = new Music();
+		$app = \OC::$server->query(Music::class);
 
 		// react only on user and group shares
 		if ($shareType == \OCP\Share::SHARE_TYPE_USER) {
@@ -63,7 +63,7 @@ public static function itemUnshared(array $params) {
 	public static function itemUnsharedFromSelf(array $params) {
 		// The share recipient may be an individual user or a group, but the item is always removed from
 		// the current user alone.
-		$app = new Music();
+		$app = \OC::$server->query(Music::class);
 		$removeFromUsers = [ $app->getContainer()->query('UserId') ];
 
 		self::removeSharedItem($app, $params['itemType'], $params['itemSource'], $params['uidOwner'], $removeFromUsers);
@@ -79,7 +79,7 @@ public static function itemShared(array $params) {
 		// user will be prompted to update database the next time she opens the Music app.
 		// Similarly, do not auto-update on group shares.
 		if ($params['itemType'] === 'file' && $params['shareType'] == \OCP\Share::SHARE_TYPE_USER) {
-			$app = new Music();
+			$app = \OC::$server->query(Music::class);
 			$container = $app->getContainer();
 			$scanner = $container->query('Scanner');
 			$sharerFolder = $container->query('UserFolder');

diff --git a/lib/Search/Provider.php b/lib/Search/Provider.php
@@ -11,7 +11,7 @@
  * @author Pauli Järvinen <pauli.jarvinen@gmail.com>
  * @copyright Morris Jobke 2013, 2014
  * @copyright Leizh 2014
- * @copyright Pauli Järvinen 2018 - 2020
+ * @copyright Pauli Järvinen 2018 - 2021
  */
 
 namespace OCA\Music\Search;
@@ -38,7 +38,7 @@ class Provider extends \OCP\Search\Provider {
 	private $logger;
 
 	public function __construct() {
-		$app = new Music();
+		$app = \OC::$server->query(Music::class);
 		$c = $app->getContainer();
 
 		$this->artistMapper = $c->query('ArtistMapper');