From a075be206bccd827a49f92064d2446f7e32a92a5 Mon Sep 17 00:00:00 2001 From: Nathan van der Werf Date: Wed, 15 Aug 2018 18:47:06 +0200 Subject: [PATCH] Replace class references with "self" --- modules/backend/widgets/MediaManager.php | 10 +++++----- modules/cms/models/ThemeData.php | 4 ++-- modules/system/classes/PluginManager.php | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/backend/widgets/MediaManager.php b/modules/backend/widgets/MediaManager.php index b3f613d93..f00b083ea 100644 --- a/modules/backend/widgets/MediaManager.php +++ b/modules/backend/widgets/MediaManager.php @@ -759,7 +759,7 @@ class MediaManager extends WidgetBase if ($result) { if (!isset($result['mode'])) { - $result['mode'] = MediaManager::SELECTION_MODE_NORMAL; + $result['mode'] = self::SELECTION_MODE_NORMAL; } if (!isset($result['width'])) { @@ -774,7 +774,7 @@ class MediaManager extends WidgetBase } return [ - 'mode' => MediaManager::SELECTION_MODE_NORMAL, + 'mode' => self::SELECTION_MODE_NORMAL, 'width' => null, 'height' => null ]; @@ -783,9 +783,9 @@ class MediaManager extends WidgetBase protected function setSelectionParams($selectionMode, $selectionWidth, $selectionHeight) { if (!in_array($selectionMode, [ - MediaManager::SELECTION_MODE_NORMAL, - MediaManager::SELECTION_MODE_FIXED_RATIO, - MediaManager::SELECTION_MODE_FIXED_SIZE + self::SELECTION_MODE_NORMAL, + self::SELECTION_MODE_FIXED_RATIO, + self::SELECTION_MODE_FIXED_SIZE ])) { throw new ApplicationException('Invalid input data'); } diff --git a/modules/cms/models/ThemeData.php b/modules/cms/models/ThemeData.php index 69194d310..bb6de6a42 100644 --- a/modules/cms/models/ThemeData.php +++ b/modules/cms/models/ThemeData.php @@ -85,11 +85,11 @@ class ThemeData extends Model } try { - $themeData = ThemeData::firstOrCreate(['theme' => $dirName]); + $themeData = self::firstOrCreate(['theme' => $dirName]); } catch (Exception $ex) { // Database failed - $themeData = new ThemeData(['theme' => $dirName]); + $themeData = new self(['theme' => $dirName]); } return self::$instances[$dirName] = $themeData; diff --git a/modules/system/classes/PluginManager.php b/modules/system/classes/PluginManager.php index 4d7d6bc25..a682736d4 100644 --- a/modules/system/classes/PluginManager.php +++ b/modules/system/classes/PluginManager.php @@ -736,7 +736,7 @@ class PluginManager /* * Delete from file system */ - if ($pluginPath = PluginManager::instance()->getPluginPath($id)) { + if ($pluginPath = self::instance()->getPluginPath($id)) { File::deleteDirectory($pluginPath); } }