Update to use laravel 8

Author: WimDeMeester

composer.json

@@ -1,5 +1,5 @@
 {
-  "name": "petercoles/multilingual-language-list",
+  "name": "deepskylog/multilingual-language-list",
   "type": "library",
   "description": "Lookup Objects for Language Names and Codes",
   "keywords": ["language lists", "language lookup", "language codes", "laravel"],
@@ -10,31 +10,35 @@
       "name": "Peter Coles",
       "email": "peterdcoles@gmail.com",
       "homepage": "https://petercoles.com"
-    }
-  ],
+    },
+    {
+        "name": "Wim De Meester",
+        "email": "deepskywim@gmail.com"
+      }
+    ],
   "support": {
-      "issues": "https://github.com/petercoles/multilingual-language-list/issues"
+      "issues": "https://github.com/deepskylog/multilingual-language-list/issues"
   },
   "require": {
     "php": "^7.2",
-    "illuminate/support": "~5|~6|~7"
+    "illuminate/support": "~5|~6|~7|~8"
   },
   "require-dev": {
-    "phpunit/phpunit": "^8",
+    "phpunit/phpunit": "^8|~9",
     "mockery/mockery": "^1"
   },
   "autoload": {
     "psr-4": {
-      "PeterColes\\Languages\\": "src/"
+      "DeepskyLog\\Languages\\": "src/"
     }
   },
     "extra": {
         "laravel": {
             "providers": [
-                "PeterColes\\Languages\\LanguagesServiceProvider"
+                "DeepskyLog\\Languages\\LanguagesServiceProvider"
             ],
             "aliases": {
-                "Languages": "PeterColes\\Languages\\LanguagesFacade"
+                "Languages": "DeepskyLog\\Languages\\LanguagesFacade"
             }
         }
     }

readme.md

@@ -19,7 +19,7 @@ Data can be returned as a lookup array or an array of key-value pairs, where bot
 At the command line run
 
 ```shell
-composer require petercoles/multilingual-language-list
+composer require deepskylog/multilingual-language-list
 ```
 
 If you're using Laravel 5.5 or later (and haven't disabled package discovery), you're done. Move on to the usage section below.
@@ -29,15 +29,15 @@ If you're using an older version of Laravel, then add the service provider to th
 ```php
     'providers' => [
         // ...
-        PeterColes\Languages\LanguagesServiceProvider::class,
+        DeepskyLog\Languages\LanguagesServiceProvider::class,
         // ...
     ],
 ```
 
 An optional facade is also available and can be enabled by adding the following to you config/app.php's aliases array
 
 ```php
-'Languages' => PeterColes\Languages\LanguagesFacade::class,
+'Languages' => DeepskyLog\Languages\LanguagesFacade::class,
 ```
 
 ## Usage

src/Filters/All.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace PeterColes\Languages\Filters;
+namespace DeepskyLog\Languages\Filters;
 
 use Illuminate\Support\Collection;
 

src/Filters/Custom.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace PeterColes\Languages\Filters;
+namespace DeepskyLog\Languages\Filters;
 
 use Illuminate\Support\Collection;
 
 class Custom
 {
     public function filter(Collection $languages, $filter)
     {
-        return $languages->filter(function($value, $key) use ($filter) {
+        return $languages->filter(function ($value, $key) use ($filter) {
             return in_array($key, $filter);
         });
     }

src/Filters/Major.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace PeterColes\Languages\Filters;
+namespace DeepskyLog\Languages\Filters;
 
 use Illuminate\Support\Collection;
 
 class Major
 {
     public function filter(Collection $languages)
     {
-        return $languages->filter(function($value, $key) {
+        return $languages->filter(function ($value, $key) {
             return strlen($key) == 2;
         });
     }

src/Filters/Minor.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace PeterColes\Languages\Filters;
+namespace DeepskyLog\Languages\Filters;
 
 use Illuminate\Support\Collection;
 
 class Minor
 {
     public function filter(Collection $languages)
     {
-        return $languages->filter(function($value, $key) {
+        return $languages->filter(function ($value, $key) {
             return strlen($key) <= 3;
         });
     }

src/LanguagesFacade.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace PeterColes\Languages;
+namespace DeepskyLog\Languages;
 
 use Illuminate\Support\Facades\Facade;
 

src/LanguagesServiceProvider.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace PeterColes\Languages;
+namespace DeepskyLog\Languages;
 
 use Illuminate\Support\ServiceProvider;
 
@@ -9,19 +9,17 @@ class LanguagesServiceProvider extends ServiceProvider
     /**
      * Register the application services.
      *
-     * @return void
      */
     public function register()
     {
-        $this->app->singleton('languages', function() {
-            return new \PeterColes\Languages\Maker;
+        $this->app->singleton('languages', function () {
+            return new \DeepskyLog\Languages\Maker;
         });
     }
 
     /**
      * Perform post-registration booting of services.
      *
-     * @return void
      */
     public function boot()
     {

src/Maker.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace PeterColes\Languages;
+namespace DeepskyLog\Languages;
 
 class Maker
 {
@@ -24,9 +24,9 @@ public function keyValue($filter = 'major', $locale = 'en', $key = 'key', $value
         $key = $key ?: 'key';
         $value = $value ?: 'value';
 
-        return $this->languages->transform(function($item, $index) use ($key, $value) {
-            return (object) [ $key => $index, $value =>$item ];
-        })->values(); 
+        return $this->languages->transform(function ($item, $index) use ($key, $value) {
+            return (object) [$key => $index, $value => $item];
+        })->values();
     }
 
     protected function prep($filter, $locale)
@@ -41,31 +41,31 @@ protected function prep($filter, $locale)
 
     protected function getMixedData($filter)
     {
-        $languages = [ ];
+        $languages = [];
         foreach ($filter as $locale) {
-            $language = require realpath(__DIR__."/../data/$locale.php");
-            $languages[ $locale ] = $language[ $locale ];
+            $language = require realpath(__DIR__ . "/../data/$locale.php");
+            $languages[$locale] = $language[$locale];
         }
 
-        $this->languages = collect($languages);             
+        $this->languages = collect($languages);
     }
 
     protected function getData($locale)
     {
         $locale = $locale ?: 'en';
 
-        $this->languages = collect(require realpath(__DIR__."/../data/$locale.php"));             
+        $this->languages = collect(require realpath(__DIR__ . "/../data/$locale.php"));
     }
 
     protected function filter($filter)
     {
         if (is_array($filter)) {
-            $class = '\\PeterColes\\Languages\\Filters\\Custom';
-            $this->languages = call_user_func([ new $class, 'filter' ], $this->languages, $filter);
+            $class = '\\DeepskyLog\\Languages\\Filters\\Custom';
+            $this->languages = call_user_func([new $class, 'filter'], $this->languages, $filter);
         } else {
             $filter = $filter ?: 'major';
-            $class = '\\PeterColes\\Languages\\Filters\\'.ucfirst($filter);
-            $this->languages = call_user_func([ new $class, 'filter' ], $this->languages);
+            $class = '\\DeepskyLog\\Languages\\Filters\\' . ucfirst($filter);
+            $this->languages = call_user_func([new $class, 'filter'], $this->languages);
         }
     }
 }

tests/FilterTest.php

@@ -5,10 +5,10 @@
 class FilterTest extends TestCase
 {
     protected $maker;
-        
+
     public function setUp(): void
     {
-        $this->maker = new PeterColes\Languages\Maker;
+        $this->maker = new DeepskyLog\Languages\Maker;
     }
 
     public function testNullFilter()
@@ -59,7 +59,6 @@ public function testArrayFilter()
     {
         $lookup = $this->maker->lookup(['en', 'fr']);
 
-
         $this->assertArrayHasKey('en', $lookup);
         $this->assertArrayHasKey('fr', $lookup);
         $this->assertArrayNotHasKey('de', $lookup);