wip

Author: marickvantuil

README.md

@@ -55,19 +55,27 @@ This package requires Laravel 10 or 11.
 
 # Installation
 
-Require the package using Composer
+1 - Require the package using Composer
 
 ```bash
 composer require stackkit/laravel-google-cloud-scheduler
 ```
 
-Define the `STACKKIT_CLOUD_SCHEDULER_APP_URL` environment variable. This should be the URL defined in the `URL` field of your Cloud Scheduler job.
+2 - Define the `STACKKIT_CLOUD_SCHEDULER_APP_URL` environment variable. This should be the URL defined in the `URL` field of your Cloud Scheduler job.
 
 ```
 STACKKIT_CLOUD_SCHEDULER_APP_URL=https://yourdomainname.com/cloud-scheduler-job
 ```
 
-Optional, but highly recommended: server configuration
+3 - Ensure PHP executable is in open_basedir. This is required for the package to run Artisan commands.
+
+How to find the executable:
+
+```php
+php artisan tinker --execute="(new Symfony\\Component\\Process\\PhpExecutableFinder())->find()"
+```
+
+4 - Optional, but highly recommended: server configuration
 
 Since Artisan commands are now invoked via an HTTP request, you might encounter issues with timeouts. Here's how to adjust them:
 
@@ -86,7 +94,7 @@ server {
 
 ```
 
-Optional, but highly recommended: set application `RUNNING_IN_CONSOLE`
+5 - Optional, but highly recommended: set application `RUNNING_IN_CONSOLE`
 
 Some Laravel service providers only register their commands if the application is being accessed through the command line (Artisan). Because we are calling Laravel scheduler from a HTTP call, that means some commands may never register, such as the Laravel Scout command:
 
@@ -172,7 +180,7 @@ $app = new Illuminate\Foundation\Application(
 ```
 </details>
 
-Optional: whitelist route for maintenance mode
+6 - Optional: whitelist route for maintenance mode
 
 If you want to allow jobs to keep running if the application is down (`php artisan down`), update the following:
 

composer.json

@@ -48,8 +48,7 @@
         ],
         "clear": "@php vendor/bin/testbench package:purge-skeleton --ansi",
         "prepare": [
-            "@php vendor/bin/testbench package:discover --ansi",
-            "@php use-package-kernel.php"
+            "@php vendor/bin/testbench package:discover --ansi"
         ],
         "build": "@php vendor/bin/testbench workbench:build --ansi",
         "serve": [

src/TaskHandler.php

@@ -8,20 +8,15 @@
 
 class TaskHandler
 {
-    private $command;
-
     private $schedule;
 
-    private $container;
-
     public function __construct(
-        Command $command,
-        Schedule $schedule,
-        Container $container
+        private Command $command,
+        private Container $container
     ) {
-        $this->command = $command;
-        $this->schedule = $schedule;
-        $this->container = $container;
+        Artisan::bootstrap();
+
+        $this->schedule = $container->make(Schedule::class);
     }
 
     /**
@@ -46,8 +41,6 @@ public function handle()
 
     private function runCommand($command)
     {
-        Artisan::bootstrap();
-
         if ($this->isScheduledCommand($command)) {
             $scheduledCommand = $this->getScheduledCommand($command);
 

testbench.yaml

@@ -1,5 +1,4 @@
 providers:
-   - Workbench\App\Providers\WorkbenchServiceProvider
    - Stackkit\LaravelGoogleCloudScheduler\CloudSchedulerServiceProvider
 
 migrations:

tests/TaskHandlerTest.php

@@ -3,17 +3,9 @@
 namespace Tests;
 
 use Illuminate\Console\Application as ConsoleApplication;
-use Illuminate\Console\Scheduling\Schedule;
-use Illuminate\Container\Container;
 use Illuminate\Support\Facades\Event;
-use Mockery;
 use PHPUnit\Framework\Attributes\Test;
-use Stackkit\LaravelGoogleCloudScheduler\CloudSchedulerException;
-use Stackkit\LaravelGoogleCloudScheduler\Command;
 use Stackkit\LaravelGoogleCloudScheduler\OpenIdVerificator;
-use Stackkit\LaravelGoogleCloudScheduler\TaskHandler;
-use UnexpectedValueException;
-use Workbench\App\Events\TaskOutput;
 
 class TaskHandlerTest extends TestCase
 {

tests/TestCase.php

@@ -8,22 +8,6 @@ class TestCase extends \Orchestra\Testbench\TestCase
 {
     use WithWorkbench;
 
-    /**
-     * Get package providers.  At a minimum this is the package being tested, but also
-     * would include packages upon which our package depends, e.g. Cartalyst/Sentry
-     * In a normal app environment these would be added to the 'providers' array in
-     * the config/app.php file.
-     *
-     * @param  \Illuminate\Foundation\Application  $app
-     * @return array
-     */
-    protected function getPackageProviders($app)
-    {
-        return [
-            \Stackkit\LaravelGoogleCloudScheduler\CloudSchedulerServiceProvider::class,
-        ];
-    }
-
     protected function defineEnvironment($app)
     {
         if (! defined('ARTISAN_BINARY')) {