[5.x] Drop laravel/helpers dependency (#9811)

statamic · Apr 3, 2024 · a9f4e41 · a9f4e41
1 parent 8bd663a
commit a9f4e41
Show file tree

Hide file tree

Showing 98 changed files with 306 additions and 233 deletions.
diff --git a/composer.json b/composer.json
@@ -15,7 +15,6 @@
         "guzzlehttp/guzzle": "^6.3 || ^7.0",
         "james-heinrich/getid3": "^1.9.21",
         "laravel/framework": "^10.40 || ^11.0",
-        "laravel/helpers": "^1.1",
         "league/commonmark": "^2.2",
         "league/csv": "^9.0",
         "league/glide": "^2.0",

diff --git a/resources/views/forms/widget.blade.php b/resources/views/forms/widget.blade.php
@@ -1,4 +1,5 @@
 @php use function Statamic\trans as __; @endphp
+@php use Statamic\Support\Arr; @endphp
 
 <div class="card p-0 overflow-hidden">
     <div class="flex justify-between items-center p-4">
@@ -19,7 +20,7 @@
                 @foreach($submissions as $submission)
                     <tr>
                         @foreach($fields as $key => $field)
-                        <td><a href="{{ cp_route('forms.submissions.show', [$form->handle(), $submission['id']]) }}">{{ array_get($submission, $field) }}</a></td>
+                        <td><a href="{{ cp_route('forms.submissions.show', [$form->handle(), $submission['id']]) }}">{{ Arr::get($submission, $field) }}</a></td>
                         @endforeach
                         <td class="rtl:text-left ltr:text-right">
                             {{ ($submission['date']->diffInDays() <= 14) ? $submission['date']->diffForHumans() : $submission['date']->format($format) }}

diff --git a/src/Assets/AssetContainerManager.php b/src/Assets/AssetContainerManager.php
@@ -6,6 +6,7 @@
 use Statamic\Facades\Parse;
 use Statamic\Facades\Path;
 use Statamic\Facades\URL;
+use Statamic\Support\Arr;
 
 class AssetContainerManager
 {
@@ -69,7 +70,7 @@ public function createS3Filesystem($config)
     {
         $config = $this->parseEnv($config);
 
-        $config['root'] = array_get($config, 'path');
+        $config['root'] = Arr::get($config, 'path');
 
         return $this->filesystem->createS3Driver($config);
     }

diff --git a/src/Assets/AssetRepository.php b/src/Assets/AssetRepository.php
@@ -48,15 +48,15 @@ public function findByUrl(string $url)
         $siteUrl = rtrim(Site::current()->absoluteUrl(), '/');
         $containerUrl = $container->url();
 
-        if (starts_with($containerUrl, '/')) {
+        if (Str::startsWith($containerUrl, '/')) {
             $containerUrl = $siteUrl.$containerUrl;
         }
 
-        if (starts_with($containerUrl, $siteUrl)) {
+        if (Str::startsWith($containerUrl, $siteUrl)) {
             $url = $siteUrl.$url;
         }
 
-        $path = str_after($url, $containerUrl);
+        $path = Str::after($url, $containerUrl);
 
         return $container->asset($path);
     }
@@ -77,8 +77,8 @@ protected function resolveContainerFromUrl($url)
         return AssetContainer::all()->sortByDesc(function ($container) {
             return strlen($container->url());
         })->first(function ($container, $id) use ($url) {
-            return starts_with($url, $container->url())
-                || starts_with(URL::makeAbsolute($url), $container->url());
+            return Str::startsWith($url, $container->url())
+                || Str::startsWith(URL::makeAbsolute($url), $container->url());
         });
     }
 

diff --git a/src/Auth/Eloquent/User.php b/src/Auth/Eloquent/User.php
@@ -45,7 +45,7 @@ public function data($data = null)
                 'groups' => $this->groups()->map->handle()->values()->all(),
             ]);
 
-            return collect(array_except($data, ['id', 'email']));
+            return collect(Arr::except($data, ['id', 'email']));
         }
 
         foreach ($data as $key => $value) {
@@ -117,7 +117,7 @@ protected function saveRoles()
 
     public function assignRole($role)
     {
-        $roles = collect(array_wrap($role))->map(function ($role) {
+        $roles = collect(Arr::wrap($role))->map(function ($role) {
             return is_string($role) ? Role::find($role) : $role;
         })->filter();
 
@@ -132,7 +132,7 @@ public function assignRole($role)
 
     public function removeRole($role)
     {
-        $roles = collect(array_wrap($role))->map(function ($role) {
+        $roles = collect(Arr::wrap($role))->map(function ($role) {
             return is_string($role) ? Role::find($role) : $role;
         })->filter();
 
@@ -183,7 +183,7 @@ protected function saveGroups()
 
     public function addToGroup($group)
     {
-        $groups = collect(array_wrap($group))->map(function ($group) {
+        $groups = collect(Arr::wrap($group))->map(function ($group) {
             return is_string($group) ? UserGroup::find($group) : $group;
         })->filter();
 
@@ -198,7 +198,7 @@ public function addToGroup($group)
 
     public function removeFromGroup($group)
     {
-        $groups = collect(array_wrap($group))->map(function ($group) {
+        $groups = collect(Arr::wrap($group))->map(function ($group) {
             return is_string($group) ? UserGroup::find($group) : $group;
         })->filter();
 

diff --git a/src/Auth/File/User.php b/src/Auth/File/User.php
@@ -16,6 +16,7 @@
 use Statamic\Facades\Stache;
 use Statamic\Facades\YAML;
 use Statamic\Preferences\HasPreferencesInProperty;
+use Statamic\Support\Arr;
 use Statamic\Support\Traits\FluentlyGetsAndSets;
 
 /**
@@ -46,11 +47,11 @@ public function data($data = null)
 
         $this->traitData($data);
 
-        if (array_has($data, 'password')) {
+        if (Arr::has($data, 'password')) {
             $this->remove('password')->password($data['password']);
         }
 
-        if (array_has($data, 'password_hash')) {
+        if (Arr::has($data, 'password_hash')) {
             $this->remove('password_hash')->passwordHash($data['password_hash']);
         }
 
@@ -167,7 +168,7 @@ protected function getRoles()
 
     public function assignRole($role)
     {
-        $roles = collect(array_wrap($role))->map(function ($role) {
+        $roles = collect(Arr::wrap($role))->map(function ($role) {
             return is_string($role) ? $role : $role->handle();
         })->all();
 
@@ -178,7 +179,7 @@ public function assignRole($role)
 
     public function removeRole($role)
     {
-        $toBeRemoved = collect(array_wrap($role))->map(function ($role) {
+        $toBeRemoved = collect(Arr::wrap($role))->map(function ($role) {
             return is_string($role) ? $role : $role->handle();
         });
 
@@ -201,7 +202,7 @@ public function hasRole($role)
 
     public function addToGroup($group)
     {
-        $groups = collect(array_wrap($group))->map(function ($group) {
+        $groups = collect(Arr::wrap($group))->map(function ($group) {
             return is_string($group) ? $group : $group->handle();
         })->all();
 
@@ -212,7 +213,7 @@ public function addToGroup($group)
 
     public function removeFromGroup($group)
     {
-        $toBeRemoved = collect(array_wrap($group))->map(function ($group) {
+        $toBeRemoved = collect(Arr::wrap($group))->map(function ($group) {
             return is_string($group) ? $group : $group->handle();
         });
 
@@ -314,7 +315,7 @@ public function getMeta($key, $default = null)
     {
         $yaml = YAML::file($this->metaPath())->parse();
 
-        return array_get($yaml, $key, $default);
+        return Arr::get($yaml, $key, $default);
     }
 
     /**

diff --git a/src/Auth/File/UserGroupRepository.php b/src/Auth/File/UserGroupRepository.php
@@ -8,6 +8,7 @@
 use Statamic\Facades;
 use Statamic\Facades\File;
 use Statamic\Facades\YAML;
+use Statamic\Support\Arr;
 
 class UserGroupRepository extends BaseRepository
 {
@@ -30,7 +31,7 @@ public function all(): Collection
         return $this->groups = $this->raw()->map(function ($data, $handle) {
             $group = Facades\UserGroup::make()
                 ->handle($handle)
-                ->title(array_get($data, 'title'))
+                ->title(Arr::get($data, 'title'))
                 ->data($data);
 
             foreach ($data['roles'] ?? [] as $role) {

diff --git a/src/Auth/Protect/Protectors/Authenticated.php b/src/Auth/Protect/Protectors/Authenticated.php
@@ -3,6 +3,7 @@
 namespace Statamic\Auth\Protect\Protectors;
 
 use Statamic\Exceptions\ForbiddenHttpException;
+use Statamic\Support\Arr;
 
 class Authenticated extends Protector
 {
@@ -25,7 +26,7 @@ public function protect()
 
     protected function getLoginUrl()
     {
-        if (! $url = array_get($this->config, 'login_url')) {
+        if (! $url = Arr::get($this->config, 'login_url')) {
             return null;
         }
 
@@ -35,7 +36,7 @@ protected function getLoginUrl()
 
         $url = parse_url($url);
 
-        if ($query = array_get($url, 'query')) {
+        if ($query = Arr::get($url, 'query')) {
             $query .= '&';
         }
 
@@ -49,6 +50,6 @@ protected function isLoginUrl()
 
     protected function shouldAppendRedirect()
     {
-        return array_get($this->config, 'append_redirect', false);
+        return Arr::get($this->config, 'append_redirect', false);
     }
 }
diff --git a/src/Auth/Protect/Protectors/IpAddress.php b/src/Auth/Protect/Protectors/IpAddress.php
@@ -3,12 +3,13 @@
 namespace Statamic\Auth\Protect\Protectors;
 
 use Statamic\Exceptions\ForbiddenHttpException;
+use Statamic\Support\Arr;
 
 class IpAddress extends Protector
 {
     public function protect()
     {
-        $ips = array_get($this->config, 'allowed', []);
+        $ips = Arr::get($this->config, 'allowed', []);
 
         if (! in_array(request()->ip(), $ips)) {
             throw new ForbiddenHttpException();

diff --git a/src/Auth/Protect/Protectors/Password/Guard.php b/src/Auth/Protect/Protectors/Password/Guard.php
@@ -2,6 +2,8 @@
 
 namespace Statamic\Auth\Protect\Protectors\Password;
 
+use Statamic\Support\Arr;
+
 class Guard
 {
     protected $config;
@@ -13,7 +15,7 @@ public function __construct($scheme)
 
     public function check($password)
     {
-        $allowed = array_get($this->config, 'allowed', []);
+        $allowed = Arr::get($this->config, 'allowed', []);
 
         return in_array($password, $allowed);
     }

diff --git a/src/Auth/Protect/Protectors/Password/PasswordProtector.php b/src/Auth/Protect/Protectors/Password/PasswordProtector.php
@@ -5,6 +5,7 @@
 use Facades\Statamic\Auth\Protect\Protectors\Password\Token;
 use Statamic\Auth\Protect\Protectors\Protector;
 use Statamic\Exceptions\ForbiddenHttpException;
+use Statamic\Support\Arr;
 
 class PasswordProtector extends Protector
 {
@@ -15,7 +16,7 @@ class PasswordProtector extends Protector
      */
     public function protect()
     {
-        if (empty(array_get($this->config, 'allowed', []))) {
+        if (empty(Arr::get($this->config, 'allowed', []))) {
             throw new ForbiddenHttpException();
         }
 

diff --git a/src/Auth/RoleRepository.php b/src/Auth/RoleRepository.php
@@ -31,9 +31,9 @@ public function all(): Collection
         return $this->roles = $this->raw()->map(function ($role, $handle) {
             return Facades\Role::make()
                 ->handle($handle)
-                ->title(array_get($role, 'title'))
-                ->addPermission(array_get($role, 'permissions', []))
-                ->preferences(array_get($role, 'preferences', []));
+                ->title(Arr::get($role, 'title'))
+                ->addPermission(Arr::get($role, 'permissions', []))
+                ->preferences(Arr::get($role, 'preferences', []));
         });
     }
 

diff --git a/src/Console/Commands/GeneratorCommand.php b/src/Console/Commands/GeneratorCommand.php
@@ -59,7 +59,7 @@ protected function getStub($stub = null)
      */
     protected function getNameInput()
     {
-        return studly_case(parent::getNameInput());
+        return Str::studly(parent::getNameInput());
     }
 
     /**
@@ -126,7 +126,7 @@ protected function getAddonPath($addon)
     {
         // If explicitly setting addon path from an external command like `make:addon`,
         // use explicit path and allow external command to handle path output.
-        if (starts_with($addon, '/') && $this->files->exists($addon)) {
+        if (Str::startsWith($addon, '/') && $this->files->exists($addon)) {
             return $addon;
         }
 
@@ -273,7 +273,7 @@ protected function getOptions()
      */
     public function __get($attribute)
     {
-        $words = explode('_', snake_case($attribute));
+        $words = explode('_', Str::snake($attribute));
 
         // If trying to access `type` attribute, allow dynamic string manipulation like `typeLowerPlural`.
         if ($words[0] === 'type') {

diff --git a/src/Console/Commands/MakeAddon.php b/src/Console/Commands/MakeAddon.php
@@ -8,6 +8,7 @@
 use Statamic\Console\RunsInPlease;
 use Statamic\Console\ValidatesInput;
 use Statamic\Rules\ComposerPackage;
+use Statamic\Support\Str;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
 
@@ -102,8 +103,8 @@ protected function normalizePackage()
     {
         $parts = explode('/', $this->package);
 
-        $this->vendorSlug = str_slug(snake_case($parts[0]));
-        $this->nameSlug = str_slug(snake_case($parts[1]));
+        $this->vendorSlug = Str::slug(Str::snake($parts[0]));
+        $this->nameSlug = Str::slug(Str::snake($parts[1]));
         $this->package = "{$this->vendorSlug}/{$this->nameSlug}";
     }
 
@@ -268,7 +269,7 @@ protected function runOptionalAddonGenerator($type)
     {
         $prefix = $this->runningInPlease ? '' : 'statamic:';
 
-        $name = studly_case($this->nameSlug);
+        $name = Str::studly($this->nameSlug);
 
         // Prevent conflicts when also creating a scope, since they're in the same directory.
         if ($type === 'filter') {
@@ -322,7 +323,7 @@ protected function addonPath($file = null, $makeDirectory = true)
      */
     protected function addonNamespace()
     {
-        return studly_case($this->vendorSlug).'\\'.studly_case($this->nameSlug);
+        return Str::studly($this->vendorSlug).'\\'.Str::studly($this->nameSlug);
     }
 
     /**
@@ -332,7 +333,7 @@ protected function addonNamespace()
      */
     protected function addonTitle()
     {
-        return str_replace('-', ' ', title_case($this->nameSlug));
+        return str_replace('-', ' ', Str::title($this->nameSlug));
     }
 
     /**

diff --git a/src/Console/Commands/MakeFieldtype.php b/src/Console/Commands/MakeFieldtype.php
@@ -5,6 +5,7 @@
 use Archetype\Facades\PHPFile;
 use PhpParser\BuilderFactory;
 use Statamic\Console\RunsInPlease;
+use Statamic\Support\Str;
 use Symfony\Component\Console\Input\InputOption;
 
 class MakeFieldtype extends GeneratorCommand
@@ -97,7 +98,7 @@ protected function buildVueComponent($name)
         $component = $this->files->get($this->getStub('fieldtype.vue.stub'));
 
         $component = str_replace('DummyName', $name, $component);
-        $component = str_replace('dummy_name', snake_case($name), $component);
+        $component = str_replace('dummy_name', Str::snake($name), $component);
 
         return $component;
     }