Fixes related to Phar environment

Author: trig

.gitignore

@@ -1,3 +1,4 @@
 vendor
 cache
 .idea
+*.phar

bin/laracron.php

@@ -8,8 +8,9 @@
 use Trig\LaraCron\Exception\ExitCommandException;
 use Trig\LaraCron\ExitCodes;
 use Illuminate\Console\Scheduling\Schedule;
+use Illuminate\Container\Container;
 
-$configFile = realpath(__DIR__.'/../laracron.json');
+$configFile = realpath('.') . '/laracron.json';
 
 $io = new OutputStyle(
     new ArgvInput(),
@@ -19,6 +20,12 @@
 try {
     $cronApp = new \Trig\LaraCron\CronApplication($configFile);
 
+    function base_path($path = null)
+    {
+        $container = Container::getInstance();
+        return $container->get('config')['basePath'].($path ? DIRECTORY_SEPARATOR.$path : $path);
+    }
+
     $cronApp->booting(
         function (\Trig\LaraCron\CronApplication $app) use ($io) {
             if ('redis' === ($app->get('config')['cache.default'] ?? null) && !class_exists('Redis')) {

composer.json

@@ -13,10 +13,7 @@
   "autoload": {
     "psr-4": {
       "Trig\\": "src//"
-    },
-    "files": [
-      "src/functions.php"
-    ]
+    }
   },
   "authors": [
     {

laracron.json

@@ -1,15 +1,12 @@
 {
   "scheduledJobs": {
     "everyMinute": [
-      "app/console list",
-      "app/console"
+      "php --version"
     ],
-    "*/10 * * * *": [
-      "echo '*/10 * * * *'"
+    "* * * * *": [
     ]
   },
-
-  "log": "php://stdout",
+  "log": "cron.log",
   "cache.default": "file",
   "cache.prefix": "laracron",
   "cache.stores.file": {

src/LaraCron/Command/BuildPharCommand.php

@@ -48,14 +48,16 @@ function ($path) use ($basePath) {
             ->ignoreDotFiles(true);
 
         $pharFile = $basePath.'/laracron.phar';
-        $stubFile = $basePath.'/bin/laracron.php';
+        if (file_exists($pharFile)) {
+            unlink($pharFile);
+        }
 
         $this->output->progressAdvance(1);
         $phar = new \Phar($pharFile);
         $phar->buildFromIterator($files->getIterator(), $basePath);
 
         $this->output->progressAdvance(1);
-        $phar->setStub($phar->createDefaultStub($stubFile));
+        $phar->setStub($phar->createDefaultStub('bin/laracron.php'));
         $this->output->writeln("Build completed. Phar saved to <comment>{$pharFile}</comment>");
     }
 

src/LaraCron/Command/ScheduleRunCommand.php

@@ -16,9 +16,11 @@ public function handle()
         $config = $this->getLaravel()->get('config');
         foreach ($config['scheduledJobs'] ?? [] as $definition => $commands) {
             foreach ($commands as $command) {
-                $event = $this->schedule->exec($command)
+                $event = $this->schedule
+                    ->exec($command)
                     ->name($this->getUniqueName($definition, $command))
-                    ->onOneServer();
+                    ->onOneServer()
+                    ->appendOutputTo($config['log']);
 
                 $isCronDefinition = false !== strpos($definition, ' ');
 

src/LaraCron/CronApplication.php

@@ -476,7 +476,10 @@ private function getConfig(string $configFile): array
             throw new ExitCommandException('ERROR_CONFIG_JSON_ERROR', ExitCodes::ERROR_CONFIG_JSON_ERROR);
         }
 
-        $config['basePath'] = realpath(__DIR__ . '/../../');
+        $config['basePath'] = realpath('.');
+        if (isset($config['cache.stores.file']['path'])) {
+            $config['cache.stores.file']['path'] = $config['basePath'].DIRECTORY_SEPARATOR.ltrim($config['cache.stores.file']['path'], '/');
+        }
 
         return $config;
     }