Skip to content
Snippets Groups Projects
Verified Commit 4b4ba7b8 authored by Bartek Jaskulski's avatar Bartek Jaskulski
Browse files

fix: move requirements checker to conditional extensions

parent 811581ef
No related branches found
No related tags found
2 merge requests!3improve into wp-hook and some additional unfinished things,!21.x
...@@ -15,6 +15,7 @@ use WPDesk\Init\Binding\Loader\ArrayDefinitions; ...@@ -15,6 +15,7 @@ use WPDesk\Init\Binding\Loader\ArrayDefinitions;
use WPDesk\Init\Binding\Loader\BindingDefinitions; use WPDesk\Init\Binding\Loader\BindingDefinitions;
use WPDesk\Init\Configuration\ReadableConfig; use WPDesk\Init\Configuration\ReadableConfig;
use WPDesk\Init\DependencyInjection\ContainerBuilder; use WPDesk\Init\DependencyInjection\ContainerBuilder;
use WPDesk\Init\Extension\CommonBinding\RequirementsCheck;
use WPDesk\Init\Extension\CommonBinding\WPDeskLicenseBridge; use WPDesk\Init\Extension\CommonBinding\WPDeskLicenseBridge;
use WPDesk\Init\Extension\CommonBinding\WPDeskTrackerBridge; use WPDesk\Init\Extension\CommonBinding\WPDeskTrackerBridge;
use WPDesk\Init\Plugin\Plugin; use WPDesk\Init\Plugin\Plugin;
...@@ -25,6 +26,10 @@ class ConditionalExtension implements Extension { ...@@ -25,6 +26,10 @@ class ConditionalExtension implements Extension {
public function bindings( ContainerInterface $c ): BindingDefinitions { public function bindings( ContainerInterface $c ): BindingDefinitions {
$bindings = []; $bindings = [];
if ( class_exists( \WPDesk_Basic_Requirement_Checker::class ) ) {
$bindings[] = RequirementsCheck::class;
}
if ( class_exists( \WPDesk\License\PluginRegistrator::class ) ) { if ( class_exists( \WPDesk\License\PluginRegistrator::class ) ) {
$bindings[] = WPDeskLicenseBridge::class; $bindings[] = WPDeskLicenseBridge::class;
} }
...@@ -39,6 +44,10 @@ class ConditionalExtension implements Extension { ...@@ -39,6 +44,10 @@ class ConditionalExtension implements Extension {
public function build( ContainerBuilder $builder, Plugin $plugin, ReadableConfig $config ): void { public function build( ContainerBuilder $builder, Plugin $plugin, ReadableConfig $config ): void {
$definitions = []; $definitions = [];
if ( class_exists( \WPDesk_Basic_Requirement_Checker::class ) ) {
$definitions[ RequirementsCheck::class ] = new AutowireDefinitionHelper();
}
if ( class_exists( \WPDesk\License\PluginRegistrator::class ) ) { if ( class_exists( \WPDesk\License\PluginRegistrator::class ) ) {
$definitions[ WPDeskLicenseBridge::class ] = new AutowireDefinitionHelper(); $definitions[ WPDeskLicenseBridge::class ] = new AutowireDefinitionHelper();
} }
......
<?php <?php
use WPDesk\Init\Extension\CommonBinding\I18n; use WPDesk\Init\Extension\CommonBinding\I18n;
use WPDesk\Init\Extension\CommonBinding\RequirementsCheck;
use WPDesk\Init\Extension\CommonBinding\CustomOrderTableCompatibility; use WPDesk\Init\Extension\CommonBinding\CustomOrderTableCompatibility;
return [ return [
RequirementsCheck::class,
I18n::class, I18n::class,
CustomOrderTableCompatibility::class, CustomOrderTableCompatibility::class,
]; ];
<?php <?php
use DI\Definition\Helper\AutowireDefinitionHelper; use DI\Definition\Helper\AutowireDefinitionHelper;
use WPDesk\Init\Extension\CommonBinding\CustomOrdersTableCompatibility;
use WPDesk\Init\Extension\CommonBinding\I18n; use WPDesk\Init\Extension\CommonBinding\I18n;
use WPDesk\Init\Extension\CommonBinding\RequirementsCheck;
return [ return [
wpdb::class => static function () { wpdb::class => static function () {
...@@ -12,5 +12,5 @@ return [ ...@@ -12,5 +12,5 @@ return [
}, },
I18n::class => new AutowireDefinitionHelper(), I18n::class => new AutowireDefinitionHelper(),
RequirementsCheck::class => new AutowireDefinitionHelper(), CustomOrdersTableCompatibility::class => new AutowireDefinitionHelper(),
]; ];
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment