From 609b773071028bbace0113362073c486d4a60cbe Mon Sep 17 00:00:00 2001
From: Erick Hitter <git-contrib@ethitter.com>
Date: Sat, 11 Jun 2022 17:22:02 -0700
Subject: [PATCH] PHPCS
---
external-permalinks-redux.php | 6 ++----
inc/class-external-permalinks-redux-block-editor.php | 4 +---
...=> class-external-permalinks-redux-singleton.php} | 12 ++++++------
3 files changed, 9 insertions(+), 13 deletions(-)
rename inc/{trait-singleton.php => class-external-permalinks-redux-singleton.php} (65%)
diff --git a/external-permalinks-redux.php b/external-permalinks-redux.php
index 371686b..b6d0aa4 100644
--- a/external-permalinks-redux.php
+++ b/external-permalinks-redux.php
@@ -25,7 +25,7 @@
*/
// Include singleton trait used by all classes.
-require_once dirname( __FILE__ ) . '/inc/trait-singleton.php';
+require_once dirname( __FILE__ ) . '/inc/class-external-permalinks-redux-singleton.php';
// Include block-editor class.
require_once dirname( __FILE__ ) . '/inc/class-external-permalinks-redux-block-editor.php';
@@ -34,9 +34,7 @@ require_once dirname( __FILE__ ) . '/inc/class-external-permalinks-redux-block-e
* Class external_permalinks_redux.
*/
// phpcs:ignore PEAR.NamingConventions.ValidClassName, Squiz.Commenting.ClassComment.Missing
-class external_permalinks_redux {
- use External_Permalinks_Redux_Singleton;
-
+class external_permalinks_redux extends External_Permalinks_Redux_Singleton{
/**
* Redirect URL meta key.
*
diff --git a/inc/class-external-permalinks-redux-block-editor.php b/inc/class-external-permalinks-redux-block-editor.php
index bdb075b..095db2d 100644
--- a/inc/class-external-permalinks-redux-block-editor.php
+++ b/inc/class-external-permalinks-redux-block-editor.php
@@ -8,9 +8,7 @@
/**
* Class Block_Editor.
*/
-class External_Permalinks_Redux_Block_Editor {
- use External_Permalinks_Redux_Singleton;
-
+class External_Permalinks_Redux_Block_Editor extends External_Permalinks_Redux_Singleton {
/**
* Set up class.
*
diff --git a/inc/trait-singleton.php b/inc/class-external-permalinks-redux-singleton.php
similarity index 65%
rename from inc/trait-singleton.php
rename to inc/class-external-permalinks-redux-singleton.php
index ba021a9..be98620 100644
--- a/inc/trait-singleton.php
+++ b/inc/class-external-permalinks-redux-singleton.php
@@ -1,11 +1,11 @@
<?php
/**
- * Singleton trait.
+ * Singleton base class.
*
* @package External_Permalinks_Redux
*/
-trait External_Permalinks_Redux_Singleton {
+abstract class External_Permalinks_Redux_Singleton {
/**
* Singleton!
*
@@ -19,12 +19,12 @@ trait External_Permalinks_Redux_Singleton {
* @return object
*/
public static function get_instance() {
- if ( ! isset( self::$instance ) ) {
- self::$instance = new self();
- self::$instance->_setup();
+ if ( ! isset( static::$instance ) ) {
+ static::$instance = new static();
+ static::$instance->_setup();
}
- return self::$instance;
+ return static::$instance;
}
/**
--
GitLab