Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Deprecate WP_Auth0_Options_Generic class #669

Merged
merged 2 commits into from
Apr 11, 2019
Merged

Deprecate WP_Auth0_Options_Generic class #669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aca49a4
Deprecate WP_Auth0_Options_Generic
joshcanhelp Apr 11, 2019
4865f4d
Change WP_Auth0_Options_Generic references to WP_Auth0_Options
joshcanhelp Apr 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/WP_Auth0_Api_Operations.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ class WP_Auth0_Api_Operations {

protected $a0_options;

public function __construct( WP_Auth0_Options_Generic $a0_options ) {
public function __construct( WP_Auth0_Options $a0_options ) {
$this->a0_options = $a0_options;
}

Expand Down
4 changes: 4 additions & 0 deletions lib/WP_Auth0_Options_Generic.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

/**
* Class WP_Auth0_Options_Generic.
*
* @deprecated - 3.10.0, will be merged into WP_Auth0_Options on the next major.
*/
class WP_Auth0_Options_Generic {

Expand Down Expand Up @@ -34,6 +36,8 @@ class WP_Auth0_Options_Generic {
/**
* WP_Auth0_Options_Generic constructor.
* Finds and stores all constant-defined settings values.
*
* @deprecated - 3.10.0, will be merged into WP_Auth0_Options on the next major.
*/
public function __construct() {
$option_keys = $this->get_defaults( true );
Expand Down
6 changes: 3 additions & 3 deletions lib/admin/WP_Auth0_Admin_Advanced.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ class WP_Auth0_Admin_Advanced extends WP_Auth0_Admin_Generic {
/**
* WP_Auth0_Admin_Advanced constructor.
*
* @param WP_Auth0_Options_Generic $options
* @param WP_Auth0_Routes $router
* @param WP_Auth0_Options $options
* @param WP_Auth0_Routes $router
*/
public function __construct( WP_Auth0_Options_Generic $options, WP_Auth0_Routes $router ) {
public function __construct( WP_Auth0_Options $options, WP_Auth0_Routes $router ) {
parent::__construct( $options );
$this->router = $router;
$this->_description = __( 'Settings related to specific scenarios.', 'wp-auth0' );
Expand Down
4 changes: 2 additions & 2 deletions lib/admin/WP_Auth0_Admin_Appearance.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ class WP_Auth0_Admin_Appearance extends WP_Auth0_Admin_Generic {
/**
* WP_Auth0_Admin_Appearance constructor.
*
* @param WP_Auth0_Options_Generic $options
* @param WP_Auth0_Options $options
*/
public function __construct( WP_Auth0_Options_Generic $options ) {
public function __construct( WP_Auth0_Options $options ) {
parent::__construct( $options );
$this->_description =
__( 'Change the how the embedded Auth0 login form is displayed. ', 'wp-auth0' ) .
Expand Down
4 changes: 2 additions & 2 deletions lib/admin/WP_Auth0_Admin_Basic.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ class WP_Auth0_Admin_Basic extends WP_Auth0_Admin_Generic {
/**
* WP_Auth0_Admin_Basic constructor.
*
* @param WP_Auth0_Options_Generic $options
* @param WP_Auth0_Options $options
*/
public function __construct( WP_Auth0_Options_Generic $options ) {
public function __construct( WP_Auth0_Options $options ) {
parent::__construct( $options );
$this->_description = __( 'Basic settings related to the Auth0 integration.', 'wp-auth0' );
}
Expand Down
4 changes: 2 additions & 2 deletions lib/admin/WP_Auth0_Admin_Dashboard.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ class WP_Auth0_Admin_Dashboard extends WP_Auth0_Admin_Generic {
*
* @deprecated - 3.6.0, the plugin no longer supports the dashboard widgets functionality.
*
* @param WP_Auth0_Options_Generic $options
* @param WP_Auth0_Options $options
*/
public function __construct( WP_Auth0_Options_Generic $options ) {
public function __construct( WP_Auth0_Options $options ) {
// phpcs:ignore
@trigger_error( sprintf( __( 'Class %s is deprecated.', 'wp-auth0' ), __CLASS__ ), E_USER_DEPRECATED );
parent::__construct( $options );
Expand Down
4 changes: 2 additions & 2 deletions lib/admin/WP_Auth0_Admin_Features.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ class WP_Auth0_Admin_Features extends WP_Auth0_Admin_Generic {
/**
* WP_Auth0_Admin_Features constructor.
*
* @param WP_Auth0_Options_Generic $options
* @param WP_Auth0_Options $options
*/
public function __construct( WP_Auth0_Options_Generic $options ) {
public function __construct( WP_Auth0_Options $options ) {
parent::__construct( $options );
$this->_description = __( 'Settings related to specific features provided by the plugin.', 'wp-auth0' );
}
Expand Down
4 changes: 2 additions & 2 deletions lib/admin/WP_Auth0_Admin_Generic.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ class WP_Auth0_Admin_Generic {
/**
* WP_Auth0_Admin_Generic constructor.
*
* @param WP_Auth0_Options_Generic $options
* @param WP_Auth0_Options $options
*/
public function __construct( WP_Auth0_Options_Generic $options ) {
public function __construct( WP_Auth0_Options $options ) {
$this->options = $options;
$this->_option_name = $options->get_options_name();
}
Expand Down
2 changes: 1 addition & 1 deletion tests/testConstantSettings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class TestConstantSettings extends WP_Auth0_Test_Case {
/**
* Default constant setting prefix.
*
* @see WP_Auth0_Options_Generic::get_constant_name()
* @see WP_Auth0_Options::get_constant_name()
*/
const CONSTANT_PREFIX = 'AUTH0_ENV_';

Expand Down
3 changes: 0 additions & 3 deletions tests/testWPAuth0Options.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@ public function testDefaultOptionsBehavior() {
// Make sure the number of options has not changed unintentionally.
$this->assertEquals( self::DEFAULT_OPTIONS_COUNT, count( $opts->get_options() ) );
$this->assertEquals( self::DEFAULT_OPTIONS_COUNT, count( $opts->get_defaults() ) );

$opts_generic = new WP_Auth0_Options_Generic();
$this->assertEmpty( $opts_generic->get_defaults() );
}

/**
Expand Down