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

Fix/autoloader #38

Merged
merged 2 commits into from
Mar 25, 2025
Merged

Fix/autoloader #38

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
223704b
(chore): refactor variable scope
SimonvanWijhe Mar 21, 2025
6d9e63c
(fix): only require autoload.php if not already loaded
SimonvanWijhe Mar 21, 2025
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
24 changes: 11 additions & 13 deletions openpub-base.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,20 @@
die;
}

/**
* Manual loaded file: the autoloader.
*/
require_once __DIR__ . '/autoloader.php';
$autoloader = new OWC\OpenPub\Base\Autoloader();

/**
* Not all the members of the OpenWebconcept are using composer in the root of their project.
* Therefore they are required to run a composer install inside this plugin directory.
* In this case the composer autoload file needs to be required.
*
* If this plugin is not installed with composer a custom autoloader is used.
*/
$composerAutoload = __DIR__ . '/vendor/autoload.php';

if (file_exists($composerAutoload)) {
require_once $composerAutoload;
if (!class_exists(\OWC\OpenPub\Base\Foundation\Plugin::class)) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moet de not operator niet weg hier?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nee, als de class al bestaat betekend dit dat de classes in deze plugin al ge-autoloaded zijn. In bedrock gebeurt dit in wp-config.php.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ja in de openpub ook: https://bitbucket.org/openwebconcept/gemeente-openpub-whitelabel/src/9b555660d86c1b3a361df2a88c0548c669e3bfd3/htdocs/wp-config.php#lines-6

Maar dan wordt ie dus dubbel ingeladen, good catch zo op de vrijdag ;)

if (file_exists(__DIR__ . '/vendor/autoload.php')) {
require_once __DIR__ . '/vendor/autoload.php';
} else {
require_once __DIR__ . '/autoloader.php';
$autoloader = new \OWC\OpenPub\Base\Autoloader();
}
}

/**
Expand All @@ -45,9 +44,8 @@
* and wp_loaded action hooks.
*/
add_action('plugins_loaded', function () {
$plugin = (new OWC\OpenPub\Base\Foundation\Plugin(__DIR__));

add_action('after_setup_theme', function () use ($plugin) {
add_action('after_setup_theme', function () {
$plugin = (new OWC\OpenPub\Base\Foundation\Plugin(__DIR__));
$plugin->boot();
do_action('owc/openpub-base/plugin', $plugin);
});
Expand Down
Loading