chore: use string and array classes instead of helpers

CHANGELOG

@@ -6,7 +6,7 @@ New features:
 
 Enhancements:
 
-*
+* Use string and array classes instead of helpers
 
 Fixes:
 

app/Helpers/CollectionHelper.php

@@ -2,6 +2,7 @@
 
 namespace App\Helpers;
 
+use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 
 class CollectionHelper
@@ -57,7 +58,7 @@ public static function getCollator($locale = null)
         if (! $locale) {
             $locale = app()->getLocale();
         }
-        if (! array_has($collators, $locale)) {
+        if (! Arr::has($collators, $locale)) {
             $collator = new \Collator($locale);
 
             if (LocaleHelper::getLang($locale) == 'fr') {

app/Helpers/CountriesHelper.php

@@ -2,6 +2,7 @@
 
 namespace App\Helpers;
 
+use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\App;
 use PragmaRX\CountriesLaravel\Package\Facade as Countries;
 use PragmaRX\Countries\Package\Support\Collection as Country;
@@ -71,8 +72,8 @@ private static function getCommonNameLocale($country)
         $locale = App::getLocale();
         $lang = LocaleHelper::getLocaleAlpha($locale);
 
-        return array_get($country, 'translations.'.$lang.'.common',
-            array_get($country, 'name.common', '')
+        return Arr::get($country, 'translations.'.$lang.'.common',
+            Arr::get($country, 'name.common', '')
         );
     }
 

app/Helpers/LocaleHelper.php

@@ -2,6 +2,7 @@
 
 namespace App\Helpers;
 
+use Illuminate\Support\Arr;
 use Matriphe\ISO639\ISO639;
 use Illuminate\Support\Facades\App;
 use libphonenumber\PhoneNumberUtil;
@@ -145,8 +146,8 @@ public static function getDirection()
      */
     public static function getLocaleAlpha($locale)
     {
-        if (array_has(static::$locales, $locale)) {
-            return array_get(static::$locales, $locale);
+        if (Arr::has(static::$locales, $locale)) {
+            return Arr::get(static::$locales, $locale);
         }
         $locale = mb_strtolower($locale);
         $languages = (new ISO639)->allLanguages();

app/Helpers/RequestHelper.php

@@ -3,6 +3,7 @@
 namespace App\Helpers;
 
 use Vectorface\Whip\Whip;
+use Illuminate\Support\Arr;
 use OK\Ipstack\Client as Ipstack;
 use Illuminate\Support\Facades\Request;
 use Stevebauman\Location\Facades\Location;
@@ -56,11 +57,11 @@ public static function infos($ip)
             $ipstack = new Ipstack(config('location.ipstack_apikey'));
             $position = $ipstack->get($ip ?? static::ip(), true);
 
-            if (! is_null($position) && array_get($position, 'country_code', null)) {
+            if (! is_null($position) && Arr::get($position, 'country_code', null)) {
                 return [
-                    'country' => array_get($position, 'country_code', null),
-                    'currency' => array_get($position, 'currency.code', null),
-                    'timezone' => array_get($position, 'time_zone.id', null),
+                    'country' => Arr::get($position, 'country_code', null),
+                    'currency' => Arr::get($position, 'currency.code', null),
+                    'timezone' => Arr::get($position, 'time_zone.id', null),
                 ];
             }
         }

app/Helpers/TimezoneHelper.php

@@ -3,6 +3,7 @@
 namespace App\Helpers;
 
 use DateTimeZone;
+use Illuminate\Support\Arr;
 
 class TimezoneHelper
 {
@@ -31,7 +32,7 @@ public static function getListOfTimezones() : array
 
         $result = [];
         foreach ($collect as $item) {
-            $values = array_values(array_sort($item, function ($value) {
+            $values = array_values(Arr::sort($item, function ($value) {
                 return $value['name'];
             }));
             foreach ($values as $val) {

app/Helpers/VCardHelper.php

@@ -2,6 +2,7 @@
 
 namespace App\Helpers;
 
+use Illuminate\Support\Arr;
 use Sabre\VObject\Component\VCard;
 
 class VCardHelper
@@ -20,7 +21,7 @@ public static function getCountryISOFromSabreVCard(VCard $vCard)
             return;
         }
 
-        $country = array_get($vCardAddress->getParts(), '6');
+        $country = Arr::get($vCardAddress->getParts(), '6');
         if (! empty($country)) {
             return CountriesHelper::find($country);
         }

app/Http/Controllers/ContactsController.php

@@ -5,6 +5,7 @@
 use App\Helpers\DateHelper;
 use App\Jobs\ResizeAvatars;
 use App\Models\Contact\Tag;
+use Illuminate\Support\Str;
 use Illuminate\Http\Request;
 use App\Helpers\AvatarHelper;
 use App\Helpers\LocaleHelper;
@@ -538,7 +539,7 @@ public function vCard(Contact $contact)
 
         return response($vcard->serialize())
             ->header('Content-type', 'text/x-vcard')
-            ->header('Content-Disposition', 'attachment; filename='.str_slug($contact->name, '-', LocaleHelper::getLang()).'.vcf');
+            ->header('Content-Disposition', 'attachment; filename='.Str::slug($contact->name, '-', LocaleHelper::getLang()).'.vcf');
     }
 
     /**

app/Http/Controllers/DAV/Backend/CalDAV/CalDAVTasks.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\DAV\Backend\CalDAV;
 
 use Sabre\DAV;
+use Illuminate\Support\Arr;
 use App\Models\Contact\Task;
 use App\Services\Task\DestroyTask;
 use Illuminate\Support\Facades\Log;
@@ -140,7 +141,7 @@ public function updateOrCreateCalendarObject($objectUri, $calendarData)
                     'entry' => $calendarData,
                 ]);
 
-            if (! array_has($result, 'error')) {
+            if (! Arr::has($result, 'error')) {
                 $task = Task::where('account_id', Auth::user()->account_id)
                     ->find($result['task_id']);
 

app/Http/Controllers/DAV/Backend/CardDAV/CardDAVBackend.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\DAV\Backend\CardDAV;
 
 use Sabre\DAV;
+use Illuminate\Support\Arr;
 use App\Models\User\SyncToken;
 use App\Models\Contact\Contact;
 use Sabre\VObject\Component\VCard;
@@ -330,7 +331,7 @@ public function updateCard($addressBookId, $cardUri, $cardData)
                     'behaviour' => ImportVCard::BEHAVIOUR_REPLACE,
                 ]);
 
-            if (! array_has($result, 'error')) {
+            if (! Arr::has($result, 'error')) {
                 $contact = Contact::where('account_id', Auth::user()->account_id)
                     ->find($result['contact_id']);
                 $card = $this->prepareCard($contact);

app/Http/Controllers/DAV/DAVACL/PrincipalBackend.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\DAV\DAVACL;
 
 use Sabre\DAV;
+use Illuminate\Support\Str;
 use Illuminate\Support\Facades\Auth;
 use Sabre\DAV\Server as SabreServer;
 use Sabre\DAVACL\PrincipalBackend\AbstractBackend;
@@ -55,7 +56,7 @@ protected function getPrincipals()
      */
     public function getPrincipalsByPrefix($prefixPath)
     {
-        $prefixPath = str_finish($prefixPath, '/');
+        $prefixPath = Str::finish($prefixPath, '/');
 
         return array_filter($this->getPrincipals(), function ($principal) use ($prefixPath) {
             return ! $prefixPath || strpos($principal['uri'], $prefixPath) == 0;

app/Http/Controllers/SettingsController.php

@@ -6,6 +6,7 @@
 use App\Models\User\User;
 use App\Helpers\DateHelper;
 use App\Models\Contact\Tag;
+use Illuminate\Support\Str;
 use Illuminate\Http\Request;
 use App\Helpers\LocaleHelper;
 use App\Helpers\RequestHelper;
@@ -369,7 +370,7 @@ public function inviteUser(InvitationRequest $request)
             + [
                 'invited_by_user_id' => auth()->user()->id,
                 'account_id' => auth()->user()->account_id,
-                'invitation_key' => str_random(100),
+                'invitation_key' => Str::random(100),
             ]
         );
 

app/Models/Account/Account.php

@@ -7,6 +7,7 @@
 use App\Models\Contact\Tag;
 use App\Models\Journal\Day;
 use App\Models\User\Module;
+use Illuminate\Support\Str;
 use App\Models\Contact\Call;
 use App\Models\Contact\Debt;
 use App\Models\Contact\Gift;
@@ -864,7 +865,7 @@ public static function createDefault($first_name, $last_name, $email, $password,
     {
         // create new account
         $account = new self;
-        $account->api_key = str_random(30);
+        $account->api_key = Str::random(30);
         $account->created_at = now();
         $account->save();
 

app/Models/Account/ImportJob.php

@@ -4,6 +4,7 @@
 
 use App\Models\User\User;
 use Sabre\VObject\Reader;
+use Illuminate\Support\Arr;
 use Sabre\VObject\Component\VCard;
 use App\Services\VCard\ImportVCard;
 use Illuminate\Database\Eloquent\Model;
@@ -226,7 +227,7 @@ private function processSingleEntry($entry, $behaviour = ImportVCard::BEHAVIOUR_
             return;
         }
 
-        if (array_has($result, 'error') && ! empty($result['error'])) {
+        if (Arr::has($result, 'error') && ! empty($result['error'])) {
             $this->skipEntry($result['name'], $result['reason']);
 
             return;

app/Services/Contact/Call/CreateCall.php

@@ -2,6 +2,7 @@
 
 namespace App\Services\Contact\Call;
 
+use Illuminate\Support\Arr;
 use App\Models\Contact\Call;
 use App\Services\BaseService;
 use App\Models\Contact\Contact;
@@ -40,7 +41,7 @@ public function execute(array $data) : Call
             ->findOrFail($data['contact_id']);
 
         // emotions array is left out as they are not attached during this call
-        $call = Call::create(array_except($data, ['emotions']));
+        $call = Call::create(Arr::except($data, ['emotions']));
 
         $this->updateLastCallInfo($contact, $call);
 

app/Services/Contact/Contact/CreateContact.php

@@ -2,6 +2,7 @@
 
 namespace App\Services\Contact\Contact;
 
+use Illuminate\Support\Arr;
 use App\Helpers\RandomHelper;
 use App\Services\BaseService;
 use App\Models\Contact\Contact;
@@ -51,7 +52,7 @@ public function execute(array $data) : Contact
         $this->validate($data);
 
         // filter out the data that shall not be updated here
-        $dataOnly = array_except(
+        $dataOnly = Arr::except(
             $data,
             [
                 'is_birthdate_known',

app/Services/Contact/Contact/UpdateContact.php

@@ -2,6 +2,7 @@
 
 namespace App\Services\Contact\Contact;
 
+use Illuminate\Support\Arr;
 use App\Services\BaseService;
 use App\Models\Contact\Contact;
 
@@ -77,7 +78,7 @@ public function execute(array $data) : Contact
     private function updateGeneralInformation(array $data, Contact $contact)
     {
         // filter out the data that shall not be updated here
-        $dataOnly = array_except(
+        $dataOnly = Arr::except(
             $data,
             [
                 'is_birthdate_known',

app/Services/Contact/Tag/AssociateTag.php

@@ -3,6 +3,7 @@
 namespace App\Services\Contact\Tag;
 
 use App\Models\Contact\Tag;
+use Illuminate\Support\Str;
 use App\Helpers\LocaleHelper;
 use App\Services\BaseService;
 use App\Models\Contact\Contact;
@@ -75,7 +76,7 @@ private function createTag(array $data) : Tag
         $array = [
             'account_id' => $data['account_id'],
             'name' => $data['name'],
-            'name_slug' => str_slug($data['name'], '-', LocaleHelper::getLang()),
+            'name_slug' => Str::slug($data['name'], '-', LocaleHelper::getLang()),
         ];
 
         if (empty($array['name_slug'])) {

app/Services/Contact/Tag/CreateTag.php

@@ -3,6 +3,7 @@
 namespace App\Services\Contact\Tag;
 
 use App\Models\Contact\Tag;
+use Illuminate\Support\Str;
 use App\Helpers\LocaleHelper;
 use App\Services\BaseService;
 
@@ -34,7 +35,7 @@ public function execute(array $data) : Tag
         $array = [
             'account_id' => $data['account_id'],
             'name' => $data['name'],
-            'name_slug' => str_slug($data['name'], '-', LocaleHelper::getLang()),
+            'name_slug' => Str::slug($data['name'], '-', LocaleHelper::getLang()),
         ];
 
         return Tag::create($array);

app/Services/Contact/Tag/UpdateTag.php

@@ -3,6 +3,7 @@
 namespace App\Services\Contact\Tag;
 
 use App\Models\Contact\Tag;
+use Illuminate\Support\Str;
 use App\Helpers\LocaleHelper;
 use App\Services\BaseService;
 
@@ -36,7 +37,7 @@ public function execute(array $data) : Tag
                             ->findOrFail($data['tag_id']);
 
         $tag->name = $data['name'];
-        $tag->name_slug = str_slug($data['name'], '-', LocaleHelper::getLang());
+        $tag->name_slug = Str::slug($data['name'], '-', LocaleHelper::getLang());
         $tag->save();
 
         return $tag;

app/Services/Instance/Geolocalization/GetGPSCoordinate.php

@@ -2,6 +2,7 @@
 
 namespace App\Services\Instance\Geolocalization;
 
+use Illuminate\Support\Str;
 use App\Models\Account\Place;
 use App\Services\BaseService;
 use Illuminate\Support\Facades\Log;
@@ -71,7 +72,7 @@ private function buildQuery(Place $place)
             'q' => $place->getAddressAsString(),
         ]);
 
-        return str_finish(config('location.location_iq_url'), '/').'search.php?'.$query;
+        return Str::finish(config('location.location_iq_url'), '/').'search.php?'.$query;
     }
 
     /**

app/Services/Instance/IdHasher.php

@@ -2,6 +2,7 @@
 
 namespace App\Services\Instance;
 
+use Illuminate\Support\Str;
 use Vinkla\Hashids\Facades\Hashids;
 use App\Exceptions\WrongIdException;
 
@@ -31,8 +32,8 @@ public function encodeId($id)
 
     public function decodeId($hash)
     {
-        if (starts_with($hash, $this->prefix)) {
-            $result = Hashids::decode(str_after($hash, $this->prefix));
+        if (Str::startsWith($hash, $this->prefix)) {
+            $result = Hashids::decode(Str::after($hash, $this->prefix));
 
             if (count($result) > 0) {
                 return $result[0]; // result is always an array due to quirk in Hashids libary

app/Services/Instance/Weather/GetWeatherInformation.php

@@ -2,6 +2,7 @@
 
 namespace App\Services\Instance\Weather;
 
+use Illuminate\Support\Str;
 use App\Models\Account\Place;
 use App\Services\BaseService;
 use App\Models\Account\Weather;
@@ -114,7 +115,7 @@ private function query(Place $place)
      */
     private function buildQuery(Place $place)
     {
-        $url = str_finish(config('location.darksky_url'), '/');
+        $url = Str::finish(config('location.darksky_url'), '/');
         $key = config('monica.darksky_api_key');
         $coords = $place->latitude.','.$place->longitude;