Merge branch 'master' of https://github.com/mcNdave/cronard

src/CronardMiddleware.php

@@ -11,9 +11,9 @@ use Psr\Http\Message\ResponseFactoryInterface,
 
 class CronardMiddleware implements MiddlewareInterface
 {
-    public string $cronKey;
+    use CronardTrait;
 
-    public array $cronards = [];
+    public string $cronKey;
 
     public array $variables = [];
 
@@ -29,28 +29,15 @@ class CronardMiddleware implements MiddlewareInterface
     {
         if ( $this->cronKey === ( $request->getQueryParams()['cronkey'] ?? false ) ) {
             $response = $this->response->call($this);
-            $cronard = new Cronard();
 
-            foreach($this->cronards as $tab => $callback) {
+            $this->launch([
-                $cronard->setTab($tab);
-                $cronard->run(array_merge([
                 $request,
                 $response,
-                ], $this->variables), $callback);
+            ]);
-            }
 
             return $response;
         }
 
         return $handler->handle($request);
     }
-
-    public function fromFile(string $filepath) {
-        if ( ! file_exists($filepath) ) {
-            throw new \RuntimeException("Given crontab file cannot be found. There could also be a problem at permission level.");
-        }
-
-        $this->cronards = include($filepath);
-        return $this;
-    }
 }

src/CronardTrait.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace Cronard;
+
+trait CronardTrait {
+
+    public array $crontabs = [];
+
+    public function launch(array $variables) : void
+    {
+        $cronard = new Cronard();
+
+        foreach($this->crontabs as $tab => $callback) {
+            $cronard->setTab($tab);
+            $cronard->run(array_merge($this->variables, $variables), $callback);
+        }
+    }
+
+    public function fromFile(string $filepath) : self
+    {
+        if ( ! file_exists($filepath) ) {
+            throw new \RuntimeException("Given crontab file cannot be found. There could also be a problem at permission level.");
+        }
+
+        $this->crontabs = include($filepath);
+        return $this;
+    }
+}

src/composer.json

@@ -1,18 +0,0 @@
-{
-    "name": "mcnd/cronard",
-    "description": "Cron made simple. Call this every minute and attach a task to your function",
-    "type": "library",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Dave Mc Nicoll",
-            "email": "mcndave@gmail.com"
-        }
-    ],
-    "require": {},
-    "autoload": {
-        "psr-4": {
-            "Cronard\\": "src/"
-        }
-    }
-}