remove ref to env and use config

Author: eloquentize

config/eloquentize.php

@@ -3,4 +3,5 @@
 // config for Eloquentize/LaravelClient
 return [
     'api_url' => env('ELOQUENTIZE_API_URL', 'https://eloquentize.com'),
+    'ELOQUENTIZE_API_TOKEN' => env('ELOQUENTIZE_API_TOKEN', 'Please define ELOQUENTIZE_API_TOKEN in your .env file'),
 ];

src/Commands/BaseCommand.php

@@ -14,17 +14,17 @@ class BaseCommand extends Command
 
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        if (env('ELOQUENTIZE_API_TOKEN') === null) {
+        if (config('eloquentize.ELOQUENTIZE_API_TOKEN') === null) {
             throw new \Exception('ELOQUENTIZE_API_TOKEN is not set in .env');
         }
 
-        if (env('APP_URL') === null) {
+        if (config('app.url') === null) {
             throw new \Exception('app.url is not set in .env');
         }
-        if (env('APP_ENV') === null) {
+        if (config('app.env') === null) {
             throw new \Exception('app.env is not set in .env');
         }
-        if (env('APP_URL') === 'http://localhost') {
+        if (config('app.url') === 'http://localhost') {
             throw new \Exception('app.url is set to http://localhost. Please change these values in .env bevause eloquentize identifies the environment by the app.url and app.env values.');
         }
 

src/Commands/ModelCountOverall.php

@@ -3,14 +3,14 @@
 namespace Eloquentize\LaravelClient\Commands;
 
 use Carbon\CarbonPeriod;
-use Illuminate\Support\Carbon;
-use Eloquentize\LaravelClient\Commands\Traits\HasVerbose;
 use Eloquentize\LaravelClient\Commands\Traits\BuildPeriod;
 use Eloquentize\LaravelClient\Commands\Traits\DateArgument;
 use Eloquentize\LaravelClient\Commands\Traits\GatherModels;
+use Eloquentize\LaravelClient\Commands\Traits\HasVerbose;
 use Eloquentize\LaravelClient\Commands\Traits\ModelsOption;
-use Eloquentize\LaravelClient\Commands\Traits\SendMetricsData;
 use Eloquentize\LaravelClient\Commands\Traits\PrepareMetricsData;
+use Eloquentize\LaravelClient\Commands\Traits\SendMetricsData;
+use Illuminate\Support\Carbon;
 
 class ModelCountOverall extends BaseCommand
 {
@@ -29,7 +29,6 @@ public function perform(string $model, $modelsPath = null, ?string $scope = null
         $metrics = [];
         $modelClass = $this->getModelClass($model, $modelsPath);
 
-
         try {
 
             // sound avg / min / max / sum return 0 if no records found ? for now
@@ -86,7 +85,7 @@ public function handle()
         $period = new CarbonPeriod($oldestDate, Carbon::now()->endOfDay());
         $metricsData = $this->prepareMetricsData($metrics, $period, 'overall');
 
-        $this->sendMetricsData($metricsData, env('ELOQUENTIZE_API_TOKEN'));
+        $this->sendMetricsData($metricsData, config('eloquentize.ELOQUENTIZE_API_TOKEN'));
 
         return 0;
     }

src/Commands/ModelsCount.php

@@ -107,7 +107,7 @@ public function handle()
             $this->line('');
             $this->line('----- Source data -----');
             $this->line('The data will be stored in source :');
-            $this->info('***** '.$this->cleanAppUrl(env('APP_URL')).'-'.env('APP_ENV').' *****');
+            $this->info('***** '.$this->cleanAppUrl(config('app.url')).'-'.config('app.env').' *****');
             $this->line('Be sure to define a relevant source name by setting APP_URL ');
             $this->line('');
             $this->line('----- Models tracked -----');
@@ -119,7 +119,7 @@ public function handle()
 
             return 0;
         } else {
-            $this->sendMetricsData($metricsData, env('ELOQUENTIZE_API_TOKEN'));
+            $this->sendMetricsData($metricsData, config('eloquentize.ELOQUENTIZE_API_TOKEN'));
         }
 
         $this->line('Models count data sent to eloquentize.');

src/Commands/PropertyAggregate.php

@@ -102,7 +102,7 @@ public function handle()
         $metrics = $this->perform($model, $aggregation, $property, $period, $event, $modelsPath, $scope, $scopeValue);
         $metricsData = $this->prepareMetricsData($metrics, $period, $event);
 
-        $this->sendMetricsData($metricsData, env('ELOQUENTIZE_API_TOKEN'));
+        $this->sendMetricsData($metricsData, config('eloquentize.ELOQUENTIZE_API_TOKEN'));
 
         return 0;
 

src/Commands/PropertyAggregateOverall.php

@@ -52,7 +52,7 @@ public function perform(string $model, AggregationType $aggregation, string $pro
             $count = $query->$method($property) ?? 0;
             $this->verbose('The '.$method.' of '.$model.'->'.$property.' overall is : '.$count);
 
-            $label = 'Overall ' .$model;
+            $label = 'Overall '.$model;
             if ($scope && $scopeValue) {
                 $label .= '::'.$scope.'('.$scopeValue.')';
             } elseif ($scope) {
@@ -92,7 +92,7 @@ public function handle()
         $period = new CarbonPeriod($oldestDate, Carbon::now()->endOfDay());
         $metricsData = $this->prepareMetricsData($metrics, $period, 'overall');
 
-        $this->sendMetricsData($metricsData, env('ELOQUENTIZE_API_TOKEN'));
+        $this->sendMetricsData($metricsData, config('eloquentize.ELOQUENTIZE_API_TOKEN'));
 
         return 0;
 

src/Commands/Traits/SendMetricsData.php

@@ -13,7 +13,7 @@ protected function sendMetricsData($data, $token)
             $response = Http::acceptJson()->withToken($token)->post($url, $data);
 
             if ($response->successful()) {
-                $this->info('Data successfully sent to Eloquentize');
+                $this->info('Data successfully sent to Eloquentize!');
             } else {
                 $this->error('Data sending failed', 'error');
                 $this->error($response->body(), 'error');

src/LaravelClientServiceProvider.php

@@ -2,14 +2,14 @@
 
 namespace Eloquentize\LaravelClient;
 
-use Spatie\LaravelPackageTools\Package;
-use Eloquentize\LaravelClient\Commands\ModelsCount;
-use Spatie\LaravelPackageTools\PackageServiceProvider;
 use Eloquentize\LaravelClient\Commands\ModelCountOverall;
+use Eloquentize\LaravelClient\Commands\ModelsCount;
 use Eloquentize\LaravelClient\Commands\ModelsCountLegacy;
 use Eloquentize\LaravelClient\Commands\PropertyAggregate;
 use Eloquentize\LaravelClient\Commands\PropertyAggregateLegacy;
 use Eloquentize\LaravelClient\Commands\PropertyAggregateOverall;
+use Spatie\LaravelPackageTools\Package;
+use Spatie\LaravelPackageTools\PackageServiceProvider;
 
 class LaravelClientServiceProvider extends PackageServiceProvider
 {

tests/commands/BuildPeriodTest.php

@@ -5,7 +5,7 @@
 
 it('ensure BuildPeriod trait create a CarbonPeriod instance', function () {
 
-    $periodBuilder = new PeriodBuilder();
+    $periodBuilder = new PeriodBuilder;
 
     $date = '2021-01-01 00:00:00';
     $periodType = 'daily';