Migrate DI container from Dhii to inpsyde/modularity (510)

bootstrap.php

@@ -4,46 +4,28 @@
 
 namespace Syde\PayPal\PointOfSale;
 
-use Dhii\Container\CachingContainer;
-use Dhii\Container\CompositeCachingServiceProvider;
-use Dhii\Container\DelegatingContainer;
-use Dhii\Container\ProxyContainer;
-use Dhii\Modular\Module\ModuleInterface;
-use Dhii\Validation\ValidatorInterface;
-use Psr\Container\ContainerInterface;
-
-return static function (string $appDir, bool $validate = false): ContainerInterface {
-    $modules = [];
-    $classNames = require $appDir . '/modules.php';
-    array_walk(
-        $classNames,
-        static function (string $className) use (&$modules): void {
-            $modules[] = new $className();
-        }
-    );
-
-    $providers = [];
-    foreach ($modules as $module) {
-        assert($module instanceof ModuleInterface);
-        $providers[] = $module->setup();
+use Syde\PayPal\PointOfSale\Validation\ValidatorInterface;
+use Syde\Vendor\Zettle\Inpsyde\Modularity\Package;
+use Syde\Vendor\Zettle\Inpsyde\Modularity\Properties\PluginProperties;
+
+return static function (string $pluginFile, bool $validate = false): Package {
+    $properties = PluginProperties::new($pluginFile);
+    $package = Package::new($properties);
+
+    $classNames = require dirname($pluginFile) . '/modules.php';
+    foreach ($classNames as $className) {
+        $package->addModule(new $className());
     }
 
-    $proxy = new ProxyContainer();
-    $provider = new CompositeCachingServiceProvider($providers);
-    $container = new CachingContainer(new DelegatingContainer($provider, $proxy));
-    $proxy->setInnerContainer($container);
+    $package->build();
 
     if ($validate) {
-        $requirementsValidator = $container->get('paypal-pos.requirements.validator');
+        $requirementsValidator = $package->container()->get('paypal-pos.requirements.validator');
         assert($requirementsValidator instanceof ValidatorInterface);
-
         $requirementsValidator->validate(null);
     }
 
-    foreach ($modules as $module) {
-        assert($module instanceof ModuleInterface);
-        $module->run($proxy);
-    }
+    $package->boot();
 
-    return $proxy;
+    return $package;
 };

composer.json

@@ -39,10 +39,6 @@
         "php": "^8.2",
         "ext-json": "*",
         "ext-mbstring": "*",
-        "container-interop/service-provider": "^0.4.0",
-        "dhii/containers": "^0.1",
-        "dhii/module-interface": "^0.2 || ^0.3",
-        "dhii/validator": "^0.1",
         "inpsyde/assets": "^2.1",
         "inpsyde/inpsyde-debug": "*",
         "inpsyde/inpsyde-http-client": "*",
@@ -65,25 +61,28 @@
         "inpsyde/paypal-pos-sync": "*",
         "inpsyde/paypal-pos-webhooks": "*",
         "oomphinc/composer-installers-extender": "^2.0",
-        "psr/container": "^1.0",
+        "psr/event-dispatcher": "^1.0",
         "sniccowp/php-scoper-wordpress-excludes": "^6.8"
     },
     "require-dev": {
         "brain/monkey": "^2.0",
         "fakerphp/faker": "^1.9@dev",
+        "inpsyde/modularity": "^1.7",
         "inpsyde/php-coding-standards": "1.0.0-RC.1",
         "mockery/mockery": "^1.3",
         "php-stubs/woocommerce-stubs": "^4.3",
         "php-stubs/wordpress-stubs": "^5.4",
         "phpunit/phpunit": "^8.0 || ^9.0",
+        "psr/container": "^1.1 || ^2.0",
         "symfony/var-dumper": "^5.0",
         "vimeo/psalm": "^5",
         "vlucas/phpdotenv": "^4.1",
         "webmozart/path-util": "^2.3@stable"
     },
     "autoload": {
         "psr-4": {
-            "Syde\\PayPal\\PointOfSale\\": "src/"
+            "Syde\\PayPal\\PointOfSale\\": "src/",
+            "Syde\\Vendor\\Zettle\\": "lib/packages/"
         }
     },
     "autoload-dev": {
@@ -131,6 +130,17 @@
         },
         "inpsyde-modules": {
             "dump-modules": "modules.php"
+        },
+        "mozart": {
+            "dep_namespace": "Syde\\Vendor\\Zettle\\",
+            "dep_directory": "/lib/packages/",
+            "classmap_directory": "/lib/classes/",
+            "classmap_prefix": "SPPZ_",
+            "packages": [
+                "psr/container",
+                "inpsyde/modularity"
+            ],
+            "delete_vendor_directories": true
         }
     }
 }