Change to use new Nytris package API

README.md

@@ -26,12 +26,13 @@ declare(strict_types=1);
 
 use Nytris\Boot\BootConfig;
 use Nytris\Boot\PlatformConfig;
-use Tasque\Tasque;
+use Tasque\EventLoop\TasqueEventLoopPackage;
+use Tasque\TasquePackage;
 
 $bootConfig = new BootConfig(new PlatformConfig(__DIR__ . '/var/cache/nytris/'));
 
-$bootConfig->installPackage(Tasque::class);
-$bootConfig->installPackage(TasqueEventLoop::class);
+$bootConfig->installPackage(new TasquePackage());
+$bootConfig->installPackage(new TasqueEventLoopPackage());
 
 return $bootConfig;
 ```

src/TasqueEventLoop.php

@@ -13,9 +13,8 @@
 
 namespace Tasque\EventLoop;
 
-use Asmblah\PhpCodeShift\Shifter\Filter\FileFilter;
-use Composer\InstalledVersions;
-use Nytris\Core\Package\PackageConfigInterface;
+use Nytris\Core\Package\PackageContextInterface;
+use Nytris\Core\Package\PackageInterface;
 use React\EventLoop\Loop;
 use Tasque\Tasque;
 
@@ -49,14 +48,11 @@ public static function getVendor(): string
     /**
      * @inheritDoc
      */
-    public static function install(PackageConfigInterface $packageConfig): void
+    public static function install(PackageContextInterface $packageContext, PackageInterface $package): void
     {
         self::$installed = true;
 
-        $tasque = new Tasque();
-
-        $reactEventLoopInstallPath = realpath(InstalledVersions::getInstallPath('react/event-loop'));
-        $tasque->excludeFiles(new FileFilter($reactEventLoopInstallPath . '/**'));
+        Tasque::excludeComposerPackage('react/event-loop');
 
         /*
          * Install a ReactPHP EventLoop future tick handler that invokes the Tasque tock hook.
@@ -86,6 +82,8 @@ public static function install(PackageConfigInterface $packageConfig): void
 
         Loop::futureTick($tickTock);
 
+        $tasque = new Tasque();
+
         // Run the ReactPHP event loop itself inside a Tasque green thread.
         $eventLoopThread = $tasque->createThread(function () {
             Loop::run();

src/TasqueEventLoopInterface.php

@@ -13,7 +13,7 @@
 
 namespace Tasque\EventLoop;
 
-use Nytris\Core\Package\PackageInterface;
+use Nytris\Core\Package\PackageFacadeInterface;
 
 /**
  * Interface TasqueEventLoopInterface.
@@ -22,6 +22,6 @@
  *
  * @author Dan Phillimore <dan@ovms.co>
  */
-interface TasqueEventLoopInterface extends PackageInterface
+interface TasqueEventLoopInterface extends PackageFacadeInterface
 {
 }

src/TasqueEventLoopPackage.php

@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * Tasque EventLoop - ReactPHP event loop using a Tasque green thread.
+ * Copyright (c) Dan Phillimore (asmblah)
+ * https://github.com/nytris/tasque-event-loop/
+ *
+ * Released under the MIT license.
+ * https://github.com/nytris/tasque-event-loop/raw/main/MIT-LICENSE.txt
+ */
+
+declare(strict_types=1);
+
+namespace Tasque\EventLoop;
+
+/**
+ * Class TasqueEventLoopPackage.
+ *
+ * Configures the installation of Tasque EventLoop.
+ *
+ * @author Dan Phillimore <dan@ovms.co>
+ */
+class TasqueEventLoopPackage implements TasqueEventLoopPackageInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function getPackageFacadeFqcn(): string
+    {
+        return TasqueEventLoop::class;
+    }
+}

src/TasqueEventLoopPackageInterface.php

@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * Tasque EventLoop - ReactPHP event loop using a Tasque green thread.
+ * Copyright (c) Dan Phillimore (asmblah)
+ * https://github.com/nytris/tasque-event-loop/
+ *
+ * Released under the MIT license.
+ * https://github.com/nytris/tasque-event-loop/raw/main/MIT-LICENSE.txt
+ */
+
+declare(strict_types=1);
+
+namespace Tasque\EventLoop;
+
+use Nytris\Core\Package\PackageInterface;
+
+/**
+ * Interface TasqueEventLoopPackageInterface.
+ *
+ * Configures the installation of Tasque EventLoop.
+ *
+ * @author Dan Phillimore <dan@ovms.co>
+ */
+interface TasqueEventLoopPackageInterface extends PackageInterface
+{
+}

tests/Functional/WithOtherBackgroundThreadTest.php

@@ -13,13 +13,15 @@
 
 namespace Tasque\EventLoop\Tests\Functional;
 
-use Nytris\Core\Package\PackageConfigInterface;
+use Nytris\Core\Package\PackageContextInterface;
 use Tasque\Core\Scheduler\ContextSwitch\NTockStrategy;
 use Tasque\EventLoop\TasqueEventLoop;
+use Tasque\EventLoop\TasqueEventLoopPackageInterface;
 use Tasque\EventLoop\Tests\AbstractTestCase;
 use Tasque\EventLoop\Tests\Functional\Harness\Log;
 use Tasque\EventLoop\Tests\Functional\Harness\WithOtherBackgroundThread\MainThread;
 use Tasque\Tasque;
+use Tasque\TasquePackageInterface;
 
 /**
  * Class WithOtherBackgroundThreadTest.
@@ -39,9 +41,13 @@ class WithOtherBackgroundThreadTest extends AbstractTestCase
 
     public function setUp(): void
     {
-        Tasque::setSchedulerStrategy(new NTockStrategy(1));
-        Tasque::install(mock(PackageConfigInterface::class));
-        TasqueEventLoop::install(mock(PackageConfigInterface::class));
+        Tasque::install(mock(PackageContextInterface::class), mock(TasquePackageInterface::class, [
+            'getSchedulerStrategy' => new NTockStrategy(1),
+        ]));
+        TasqueEventLoop::install(
+            mock(PackageContextInterface::class),
+            mock(TasqueEventLoopPackageInterface::class)
+        );
 
         $this->log = new Log();
         $this->tasque = new Tasque();