Merge pull request #2 from kfvit/laravel-upgrade

Updated
forss-it · Sep 30, 2020 · 453d526 · 453d526
2 parents 2064f54 + bf04cd6
commit 453d526
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 24 deletions.
diff --git a/composer.json b/composer.json
@@ -1,39 +1,40 @@
 {
-    "name": "dialect/trafikverket",
+    "name": "kfvit/laravel-trafikverket",
     "type": "library",
     "description": "API wrapper for Trafikverket",
     "keywords": [
         "dialect",
         "trafikverket",
         "laravel"
     ],
-    "homepage": "https://github.com/Dialect/Trafikverket",
+    "homepage": "https://github.com/kfvit/laravel-trafikverket",
     "license": "MIT",
     "authors": [
         {
-            "name": "Dialect Katrineholm",
-            "email": "markus.stromgren@dialect.se",
-            "homepage": "https://dialect.se",
+            "name": "KFV IT",
+            "email": "info@kfvit.se",
+            "homepage": "https://kfvit.se",
             "role": "Developer"
         }
     ],
     "require": {
-        "illuminate/support": "~5.1",
-        "php" : "~5.6|~7.0",
+        "illuminate/support": "~8.0",
+        "php" : "~7.4",
         "guzzlehttp/guzzle": "~6.0"
     },
     "require-dev": {
-        "phpunit/phpunit" : ">=5.4.3",
+        "orchestra/testbench": "^6.2",
+        "phpunit/phpunit": ">=5.4.3",
         "squizlabs/php_codesniffer": "^2.3"
     },
     "autoload": {
         "psr-4": {
-            "Dialect\\Trafikverket\\": "src"
+            "KFVIT\\LaravelTrafikverket\\": "src"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "Dialect\\Trafikverket\\": "tests"
+            "KFVIT\\LaravelTrafikverket\\Tests\\": "tests"
         }
     },
     "scripts": {
@@ -43,7 +44,15 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0-dev"
+            "dev-master": "1.0"
+        },
+        "laravel": {
+            "providers": [
+                "KFVIT\\LaravelTrafikverket\\TrafikverketServiceProvider"
+            ],
+            "aliases": {
+                "trafikverket": "KFVIT\\LaravelTrafikverket\\Trafikverket"
+            }
         }
     },
     "config": {

diff --git a/src/Facade.php b/src/Facade.php
@@ -1,4 +1,7 @@
-<?php namespace Dialect\Unifaun;
+<?php
+
+namespace KFVIT\LaravelTrafikverket;
+
 class Facade extends \Illuminate\Support\Facades\Facade
 {
     /**
@@ -8,4 +11,4 @@ protected static function getFacadeAccessor()
     {
         return 'trafikverket';
     }
-}
+}
diff --git a/src/Trafikverket.php b/src/Trafikverket.php
@@ -1,5 +1,5 @@
 <?php
-namespace Dialect\Trafikverket;
+namespace KFVIT\LaravelTrafikverket;
 
 class Trafikverket {
 
@@ -43,4 +43,4 @@ public static function weatherStation(){
 		return new TrafikverketQueryBuilder("WeatherStation");
 	}
 
-}
+}
diff --git a/src/TrafikverketQueryBuilder.php b/src/TrafikverketQueryBuilder.php
@@ -1,5 +1,5 @@
 <?php
-namespace Dialect\Trafikverket;
+namespace KFVIT\LaravelTrafikverket;
 
 use GuzzleHttp\Exception\GuzzleException;
 use GuzzleHttp\Client;
@@ -199,4 +199,4 @@ public function get(){
         if(property_exists($json,$this->model)) return $json->{$this->model};
         return [];
     }
-}
+}
diff --git a/src/TrafikverketServiceProvider.php b/src/TrafikverketServiceProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Dialect\Trafikverket;
+namespace KFVIT\LaravelTrafikverket;
 
 use Illuminate\Support\ServiceProvider;
 
@@ -26,4 +26,4 @@ public function register()
     {
 	    $this->app->bind('trafikverket', Trafikverket::class);
     }
-}
+}
diff --git a/tests/TrafikverketTest.php b/tests/TrafikverketTest.php
@@ -1,13 +1,13 @@
 <?php
+namespace KFVIT\LaravelTrafikverket\Tests;
 
-use Tests\TestCase;
-use Dialect\Trafikverket\Trafikverket;
-use Dialect\Trafikverket\TrafikverketQueryBuilder;
+use KFVIT\LaravelTrafikverket\Trafikverket;
+use KFVIT\LaravelTrafikverket\TrafikverketQueryBuilder;
+use PHPUnit\Framework\TestCase;
 
 class TrafikverketTest extends TestCase {
 
     public function setUp() {
-        Parent::setUp();
         config(['trafikverket.api_token' => "7eed08f6ddac4016ba4e30d780e8619a"]);
         config(['trafikverket.url' => "http://api.trafikinfo.trafikverket.se/v1.2/data.json"]);
     }
@@ -58,4 +58,4 @@ public function can_nest_filters() {
 
     }
 
-}
+}