Merge branch 'main' of https://github.com/arnebr/laravel-tibber into main

Author: arnebr

config/tibber.php

@@ -4,7 +4,7 @@
 return [
     /* Get token from developer.tibber.com
     */
-    'api_url'=>'https://api.tibber.com/v1-beta/gql',
-    'token'=>env('TIBBER_TOKEN','5K4MVS-OjfWhK_4yrjOlFe1F6kJXPVf7eQYggo8ebAE'),
-    'homeId'=>env('TIBBER_HOMEID',null)
+    'api_url' => 'https://api.tibber.com/v1-beta/gql',
+    'token' => env('TIBBER_TOKEN', '5K4MVS-OjfWhK_4yrjOlFe1F6kJXPVf7eQYggo8ebAE'),
+    'homeId' => env('TIBBER_HOMEID', null),
 ];

src/Tibber.php

@@ -2,34 +2,39 @@
 
 namespace Arnebr\Tibber;
 
-use Illuminate\Http\Client\Response;
 use Illuminate\Support\Facades\Http;
-use PhpParser\Node\Expr\FuncCall;
 
 class Tibber
 {
     public const HOURLY = 'HOURLY';
+
     public const DAILY = 'DAILY';
+
     public const WEEKLY = 'WEEKLY';
+
     public const MONTHLY = 'MONTHLY';
+
     public const ANNUAL = 'ANNUAL';
 
-    public const APP_HOME='HOME';
-    public const APP_CONSUMPTION='CONSUMPTION';
-    public const APP_METER_READING='METER_READING';
-    public const APP_COMPARISON='COMPARISON';
+    public const APP_HOME = 'HOME';
+
+    public const APP_CONSUMPTION = 'CONSUMPTION';
+
+    public const APP_METER_READING = 'METER_READING';
+
+    public const APP_COMPARISON = 'COMPARISON';
 
     private function request($query): array
     {
-
         $client = Http::withHeaders([
             'Content-Type' => 'application/json',
         ])->withToken(config('tibber.token'))->post(config('tibber.api_url'), [
-            'query' => $query
+            'query' => $query,
         ]);
 
         return $client->json();
     }
+
     public function viewer($subquery = '')
     {
         $query = <<<GQL
@@ -43,11 +48,13 @@ public function viewer($subquery = '')
             }
         }
         GQL;
+
         return $this->request($query);
     }
+
     public function homes($homeId = null, $subquery = '')
     {
-        $action = ($homeId === NULL) ? 'homes' : 'home(id:' . $homeId . ')';
+        $action = ($homeId === null) ? 'homes' : 'home(id:'.$homeId.')';
         $subquery = <<<GQL
                 $action {
                     $subquery
@@ -137,8 +144,10 @@ public function homes($homeId = null, $subquery = '')
                       }
                   }
         GQL;
+
         return $this->viewer($subquery);
     }
+
     public function consumption($homeId = null, $resolution = Tibber::HOURLY, $last = 100)
     {
         $subquery = <<<GQL
@@ -154,9 +163,12 @@ public function consumption($homeId = null, $resolution = Tibber::HOURLY, $last
               currency
             }
         GQL;
-        return $this->homes($homeId,$subquery);
+
+        return $this->homes($homeId, $subquery);
     }
-    public function sendPushNotification(string $title,string $message, $screenToOpen=Tibber::APP_HOME){
+
+    public function sendPushNotification(string $title, string $message, $screenToOpen = Tibber::APP_HOME)
+    {
         $subquery = <<<GQL
         mutation{
             sendPushNotification(input: {
@@ -170,6 +182,7 @@ public function sendPushNotification(string $title,string $message, $screenToOpe
           }
 
         GQL;
+
         return $this->request($subquery);
     }
 }

src/TibberServiceProvider.php

@@ -2,9 +2,9 @@
 
 namespace Arnebr\Tibber;
 
+use Arnebr\Tibber\Commands\TibberCommand;
 use Spatie\LaravelPackageTools\Package;
 use Spatie\LaravelPackageTools\PackageServiceProvider;
-use Arnebr\Tibber\Commands\TibberCommand;
 
 class TibberServiceProvider extends PackageServiceProvider
 {

tests/TestCase.php

@@ -2,9 +2,9 @@
 
 namespace Arnebr\Tibber\Tests;
 
+use Arnebr\Tibber\TibberServiceProvider;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Orchestra\Testbench\TestCase as Orchestra;
-use Arnebr\Tibber\TibberServiceProvider;
 
 class TestCase extends Orchestra
 {

tests/TibberTest.php

@@ -3,25 +3,24 @@
 use Arnebr\Tibber\Facades\Tibber;
 
 it('can make request', function () {
-   $tibber=Tibber::viewer();
-   expect($tibber)->toBeArray();
+    $tibber = Tibber::viewer();
+    expect($tibber)->toBeArray();
 });
 
 it('can make viewer request', function () {
-    $tibber=Tibber::viewer();
-   expect($tibber)->toBeArray();
+    $tibber = Tibber::viewer();
+    expect($tibber)->toBeArray();
 });
 it('can make home request', function () {
-    $tibber=Tibber::homes();
-   expect($tibber)->toBeArray();
+    $tibber = Tibber::homes();
+    expect($tibber)->toBeArray();
 });
 it('can make consumption request', function () {
-    $tibber=Tibber::consumption();
-   expect($tibber)->toBeArray();
+    $tibber = Tibber::consumption();
+    expect($tibber)->toBeArray();
 });
 it('can make push notification request', function () {
-    $tibber=Tibber::sendPushNotification('test','test');
-   expect($tibber)->toBeArray();
-   expect($tibber['errors'][0]['message'])->toBe('operation not allowed for demo user');
+    $tibber = Tibber::sendPushNotification('test', 'test');
+    expect($tibber)->toBeArray();
+    expect($tibber['errors'][0]['message'])->toBe('operation not allowed for demo user');
 });
-