Skip to content

fix: add false parameter to class_exists() guards to prevent autoloader collisions #6

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

Open
yanick29 wants to merge 1 commit into
base: development
Choose a base branch
from
Open

fix: add false parameter to class_exists() guards to prevent autoloader collisions #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 includes/admin/health/class-site_health.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
if (!defined('ABSPATH')) exit;


if (!class_exists('\OES\Admin\Health\Site_Health')) {
if (!class_exists('\OES\Admin\Health\Site_Health', false)) {

/**
* The OES Site Health class responsible for populating OES debug information in WordPress Site Health.
Expand Down
2 changes: 1 addition & 1 deletion includes/admin/operations/class-display_builder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
exit;
}

if (!class_exists('Display_Builder')) :
if (!class_exists('Display_Builder', false)) :

/**
* Class Display_Builder
Expand Down
2 changes: 1 addition & 1 deletion includes/admin/operations/class-executor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

use WP_Error;

if (!class_exists('Executor')) :
if (!class_exists('Executor', false)) :

/**
* Class Executor
Expand Down
2 changes: 1 addition & 1 deletion includes/admin/operations/class-operation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
exit;
}

if (!class_exists('Operation')) :
if (!class_exists('Operation', false)) :

/**
* Class Operation
Expand Down
2 changes: 1 addition & 1 deletion includes/admin/operations/class-repository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
exit;
}

if (!class_exists('Repository')) :
if (!class_exists('Repository', false)) :

/**
* Class Repository
Expand Down
4 changes: 2 additions & 2 deletions includes/admin/pages/class-container.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

if (!defined('ABSPATH')) exit; // Exit if accessed directly

if (!class_exists('Page')) oes_include('admin/pages/class-page.php');
if (!class_exists('Page', false)) oes_include('admin/pages/class-page.php');

if (!class_exists('Container')) :
if (!class_exists('Container', false)) :

/**
* Class Container
Expand Down
2 changes: 1 addition & 1 deletion includes/admin/pages/class-module_page.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

if (!defined('ABSPATH')) exit; // Exit if accessed directly

if (!class_exists('Module_Page')) :
if (!class_exists('Module_Page', false)) :

/**
* Class Module_Page
Expand Down
2 changes: 1 addition & 1 deletion includes/admin/pages/class-page.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

if (!defined('ABSPATH')) exit; // Exit if accessed directly

if (!class_exists('Page')) :
if (!class_exists('Page', false)) :

/**
* Class Page
Expand Down
4 changes: 2 additions & 2 deletions includes/admin/pages/class-subpage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

if (!defined('ABSPATH')) exit; // Exit if accessed directly

if (!class_exists('Page')) oes_include('admin/pages/class-page.php');
if (!class_exists('Page', false)) oes_include('admin/pages/class-page.php');

if (!class_exists('Subpage')) :
if (!class_exists('Subpage', false)) :

/**
* Class Subpage
Expand Down
2 changes: 1 addition & 1 deletion includes/admin/tools/class-factory_service.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
use function OES\ACF\is_acf_generated_key;
use function OES\Factory\get_factory_posts;

if (class_exists('Factory_Service')) exit;
if (class_exists('Factory_Service', false)) exit;

/**
* Class Service
Expand Down
2 changes: 1 addition & 1 deletion includes/admin/tools/class-form_table.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

namespace OES\Admin\Tools;

if (class_exists('Form_Table')) exit;
if (class_exists('Form_Table', false)) exit;

/**
* Class Form_Table
Expand Down
2 changes: 1 addition & 1 deletion includes/admin/tools/class-tool-batch.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

use WP_Query;

if (class_exists('Batch')) exit;
if (class_exists('Batch', false)) exit;

/**
* Class Batch
Expand Down
2 changes: 1 addition & 1 deletion includes/admin/tools/class-tool-export.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
use WP_Term;
use WP_Post;

if (class_exists('Export')) exit;
if (class_exists('Export', false)) exit;

/**
* Class Export
Expand Down
2 changes: 1 addition & 1 deletion includes/admin/tools/class-tool-factory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

if (!defined('ABSPATH')) exit; // Exit if accessed directly

if (class_exists('Factory')) exit;
if (class_exists('Factory', false)) exit;

/**
* Class Factory
Expand Down
2 changes: 1 addition & 1 deletion includes/admin/tools/class-tool-import.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
use function OES\Admin\Operations\insert_operation;
use function OES\Admin\Operations\get_max_temp;

if (!class_exists('Import')) :
if (!class_exists('Import', false)) :

/**
* Class Import
Expand Down
2 changes: 1 addition & 1 deletion includes/admin/tools/class-tool-model.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

if (!defined('ABSPATH')) exit; // Exit if accessed directly

if (!class_exists('Model')) :
if (!class_exists('Model', false)) :

/**
* Class Model
Expand Down
4 changes: 2 additions & 2 deletions includes/admin/tools/class-tool-shortcode.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

if (!defined('ABSPATH')) exit; // Exit if accessed directly

if (!class_exists('\OES\Admin\Tools\Config')) oes_include('admin/tools/config/class-config.php');
if (!class_exists('\OES\Admin\Tools\Config', false)) oes_include('admin/tools/config/class-config.php');

if (!class_exists('Shortcode')) :
if (!class_exists('Shortcode', false)) :

/**
* Class Shortcode
Expand Down
2 changes: 1 addition & 1 deletion includes/admin/tools/class-tool.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
use function OES\Admin\add_oes_notice_after_refresh;
use function OES\Admin\get_admin_note_html;

if (!class_exists('\OES\Admin\Tools\Tool')) {
if (!class_exists('\OES\Admin\Tools\Tool', false)) {

/**
* Class Tool
Expand Down
4 changes: 2 additions & 2 deletions includes/admin/tools/config/class-config-admin_columns.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

if (!defined('ABSPATH')) exit; // Exit if accessed directly

if (!class_exists('Config')) oes_include('admin/tools/config/class-config.php');
if (!class_exists('Config', false)) oes_include('admin/tools/config/class-config.php');

if (class_exists('Admin_Columns')) exit;
if (class_exists('Admin_Columns', false)) exit;

/**
* Class Admin Columns
Expand Down
4 changes: 2 additions & 2 deletions includes/admin/tools/config/class-config-admin_container.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

if (!defined('ABSPATH')) exit; // Exit if accessed directly

if (!class_exists('Config')) oes_include('admin/tools/config/class-config.php');
if (!class_exists('Config', false)) oes_include('admin/tools/config/class-config.php');

if (class_exists('Admin_Container')) exit;
if (class_exists('Admin_Container', false)) exit;

/**
* Class Admin_Container
Expand Down
4 changes: 2 additions & 2 deletions includes/admin/tools/config/class-config-application.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

if (!defined('ABSPATH')) exit; // Exit if accessed directly

if (!class_exists('Config')) oes_include('admin/tools/config/class-config.php');
if (!class_exists('Config', false)) oes_include('admin/tools/config/class-config.php');

if (class_exists('Application')) exit;
if (class_exists('Application', false)) exit;

/**
* Class Application
Expand Down
4 changes: 2 additions & 2 deletions includes/admin/tools/config/class-config-module.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

if (!defined('ABSPATH')) exit; // Exit if accessed directly

if (!class_exists('Config')) oes_include('admin/tools/config/class-config.php');
if (!class_exists('Config', false)) oes_include('admin/tools/config/class-config.php');

if (class_exists('Module')) exit;
if (class_exists('Module', false)) exit;

/**
* Class Module
Expand Down
4 changes: 2 additions & 2 deletions includes/admin/tools/config/class-config-schema.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

if (!defined('ABSPATH')) exit; // Exit if accessed directly

if (!class_exists('\OES\Admin\Tools\Config')) oes_include('admin/tools/config/class-config.php');
if (!class_exists('\OES\Admin\Tools\Config', false)) oes_include('admin/tools/config/class-config.php');

if (class_exists('Schema')) exit;
if (class_exists('Schema', false)) exit;

/**
* Class Schema
Expand Down
6 changes: 3 additions & 3 deletions includes/admin/tools/config/class-config-schema_oes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@

if (!defined('ABSPATH')) exit; // Exit if accessed directly

if (!class_exists('Config')) oes_include('admin/tools/config/class-config.php');
if (!class_exists('Schema')) oes_include('admin/tools/config/class-config-schema.php');
if (!class_exists('Config', false)) oes_include('admin/tools/config/class-config.php');
if (!class_exists('Schema', false)) oes_include('admin/tools/config/class-config-schema.php');

if (class_exists('Schema_OES')) exit;
if (class_exists('Schema_OES', false)) exit;

/**
* Class Schema_OES
Expand Down
6 changes: 3 additions & 3 deletions includes/admin/tools/config/class-config-schema_oes_archive.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@

if (!defined('ABSPATH')) exit; // Exit if accessed directly

if (!class_exists('Config')) oes_include('admin/tools/config/class-config.php');
if (!class_exists('Schema')) oes_include('admin/tools/config/class-config-schema.php');
if (!class_exists('Config', false)) oes_include('admin/tools/config/class-config.php');
if (!class_exists('Schema', false)) oes_include('admin/tools/config/class-config-schema.php');

if (class_exists('Schema_OES_Archive')) exit;
if (class_exists('Schema_OES_Archive', false)) exit;

/**
* Class Schema_OES_Archive
Expand Down
6 changes: 3 additions & 3 deletions includes/admin/tools/config/class-config-schema_oes_single.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@

if (!defined('ABSPATH')) exit; // Exit if accessed directly

if (!class_exists('Config')) oes_include('admin/tools/config/class-config.php');
if (!class_exists('Schema')) oes_include('admin/tools/config/class-config-schema.php');
if (!class_exists('Config', false)) oes_include('admin/tools/config/class-config.php');
if (!class_exists('Schema', false)) oes_include('admin/tools/config/class-config-schema.php');

if (class_exists('Schema_OES_Single')) exit;
if (class_exists('Schema_OES_Single', false)) exit;

/**
* Class Schema_OES_Single
Expand Down
4 changes: 2 additions & 2 deletions includes/admin/tools/config/class-config-theme_colors.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

if (!defined('ABSPATH')) exit; // Exit if accessed directly

if (!class_exists('Config')) oes_include('admin/tools/config/class-config.php');
if (!class_exists('Config', false)) oes_include('admin/tools/config/class-config.php');

if (class_exists('Theme_Colors')) exit;
if (class_exists('Theme_Colors', false)) exit;

/**
* Class Theme_Colors
Expand Down
4 changes: 2 additions & 2 deletions includes/admin/tools/config/class-config-theme_date.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

if (!defined('ABSPATH')) exit; // Exit if accessed directly

if (!class_exists('Config')) oes_include('admin/tools/config/class-config.php');
if (!class_exists('Config', false)) oes_include('admin/tools/config/class-config.php');

if (class_exists('Theme_Date')) exit;
if (class_exists('Theme_Date', false)) exit;

/**
* Class Theme_Date
Expand Down
4 changes: 2 additions & 2 deletions includes/admin/tools/config/class-config-theme_index_pages.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

if (!defined('ABSPATH')) exit; // Exit if accessed directly

if (!class_exists('Config')) oes_include('admin/tools/config/class-config.php');
if (!class_exists('Config', false)) oes_include('admin/tools/config/class-config.php');

if (class_exists('Theme_Index_Pages')) exit;
if (class_exists('Theme_Index_Pages', false)) exit;

/**
* Class Theme_Index_Pages
Expand Down
4 changes: 2 additions & 2 deletions includes/admin/tools/config/class-config-theme_labels.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

if (!defined('ABSPATH')) exit; // Exit if accessed directly

if (!class_exists('Config')) oes_include('admin/tools/config/class-config.php');
if (!class_exists('Config', false)) oes_include('admin/tools/config/class-config.php');

if (class_exists('Theme_Labels')) exit;
if (class_exists('Theme_Labels', false)) exit;

/**
* Class Theme_Labels
Expand Down
4 changes: 2 additions & 2 deletions includes/admin/tools/config/class-config-theme_labels_general.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

if (!defined('ABSPATH')) exit; // Exit if accessed directly

if (!class_exists('Theme_Labels')) oes_include('admin/tools/config/class-config-theme_labels.php');
if (!class_exists('Theme_Labels', false)) oes_include('admin/tools/config/class-config-theme_labels.php');

if (class_exists('Theme_Labels_General')) exit;
if (class_exists('Theme_Labels_General', false)) exit;

/**
* Class Theme_Labels_General
Expand Down
4 changes: 2 additions & 2 deletions includes/admin/tools/config/class-config-theme_labels_media.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

if (!defined('ABSPATH')) exit; // Exit if accessed directly

if (!class_exists('Theme_Labels')) oes_include('admin/tools/config/class-config-theme_labels.php');
if (!class_exists('Theme_Labels', false)) oes_include('admin/tools/config/class-config-theme_labels.php');

if (class_exists('Theme_Labels_Media')) exit;
if (class_exists('Theme_Labels_Media', false)) exit;

/**
* Class Theme_Labels_Media
Expand Down
4 changes: 2 additions & 2 deletions includes/admin/tools/config/class-config-theme_labels_objects.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

if (!defined('ABSPATH')) exit; // Exit if accessed directly

if (!class_exists('Theme_Labels')) oes_include('admin/tools/config/class-config-theme_labels.php');
if (!class_exists('Theme_Labels', false)) oes_include('admin/tools/config/class-config-theme_labels.php');

if (class_exists('Theme_Labels_Objects')) exit;
if (class_exists('Theme_Labels_Objects', false)) exit;

/**
* Class Theme_Labels_Objects
Expand Down
4 changes: 2 additions & 2 deletions includes/admin/tools/config/class-config-theme_languages.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

if (!defined('ABSPATH')) exit; // Exit if accessed directly

if (!class_exists('Config')) oes_include('admin/tools/config/class-config.php');
if (!class_exists('Config', false)) oes_include('admin/tools/config/class-config.php');

if (class_exists('Theme_Languages')) exit;
if (class_exists('Theme_Languages', false)) exit;

/**
* Class Theme_Languages
Expand Down
4 changes: 2 additions & 2 deletions includes/admin/tools/config/class-config-theme_logos.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

if (!defined('ABSPATH')) exit; // Exit if accessed directly

if (!class_exists('Config')) oes_include('admin/tools/config/class-config.php');
if (!class_exists('Config', false)) oes_include('admin/tools/config/class-config.php');

if (class_exists('Theme_Logos')) exit;
if (class_exists('Theme_Logos', false)) exit;

/**
* Class Theme_Logos
Expand Down
4 changes: 2 additions & 2 deletions includes/admin/tools/config/class-config-theme_media.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

if (!defined('ABSPATH')) exit; // Exit if accessed directly

if (!class_exists('Config')) oes_include('admin/tools/config/class-config.php');
if (!class_exists('Config', false)) oes_include('admin/tools/config/class-config.php');

if (class_exists('Theme_Media')) exit;
if (class_exists('Theme_Media', false)) exit;

/**
* Class Theme_Media
Expand Down
Loading