Replace legacy array helper functions with Arr class methods (#659)

Samuell1 · web-flow · commit b6661a94ac78 · 2026-01-26T13:04:49.000+11:00
diff --git a/src/Database/Attach/File.php b/src/Database/Attach/File.php
@@ -6,6 +6,7 @@
 use Storage;
 use Response;
 use File as FileHelper;
+use Illuminate\Support\Arr;
 use October\Rain\Database\Model;
 use October\Rain\Resize\Resizer;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
@@ -327,7 +328,7 @@ public function output($disposition = 'inline', $returnResponse = true)
      */
     public function outputThumb($width, $height, $options = [], $returnResponse = true)
     {
-        $disposition = array_get($options, 'disposition', 'inline');
+        $disposition = Arr::get($options, 'disposition', 'inline');
         $options = $this->getDefaultThumbOptions($options);
 
         // Generate thumb if not existing already
diff --git a/src/Database/Models/DeferredBinding.php b/src/Database/Models/DeferredBinding.php
@@ -2,6 +2,7 @@
 
 use Event;
 use Carbon\Carbon;
+use Illuminate\Support\Arr;
 use October\Rain\Database\Model;
 use Throwable;
 
@@ -209,12 +210,12 @@ protected function deleteSlaveRecord()
             }
 
             $options = $masterObject->getRelationDefinition($this->master_field);
-            if (!array_get($options, 'delete', false)) {
+            if (!Arr::get($options, 'delete', false)) {
                 return;
             }
 
             // Only delete it if the relationship is null
-            $foreignKey = array_get($options, 'key', $masterObject->getForeignKey());
+            $foreignKey = Arr::get($options, 'key', $masterObject->getForeignKey());
             if ($foreignKey && !$relatedObj->$foreignKey) {
                 $relatedObj->delete();
             }
diff --git a/src/Database/Relations/AttachOneOrMany.php b/src/Database/Relations/AttachOneOrMany.php
@@ -2,6 +2,7 @@
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Arr;
 use October\Rain\Database\Attach\File as FileModel;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
@@ -368,7 +369,7 @@ public function remove(Model $model, $sessionKey = null)
 
             $options = $this->parent->getRelationDefinition($this->relationName);
 
-            if (array_get($options, 'delete', false)) {
+            if (Arr::get($options, 'delete', false)) {
                 $model->delete();
             }
             else {
@@ -477,7 +478,7 @@ protected function ensureRelationIsEmpty()
     {
         $options = $this->parent->getRelationDefinition($this->relationName);
 
-        if (array_get($options, 'delete', false)) {
+        if (Arr::get($options, 'delete', false)) {
             $this->delete();
         }
         else {
diff --git a/src/Database/Relations/DefinedConstraints.php b/src/Database/Relations/DefinedConstraints.php
@@ -1,6 +1,7 @@
 <?php namespace October\Rain\Database\Relations;
 
 use Illuminate\Database\Eloquent\Relations\BelongsToMany as BelongsToManyBase;
+use Illuminate\Support\Arr;
 
 /**
  * DefinedConstraints handles the constraints and filters defined by a relation
@@ -33,28 +34,28 @@ public function addDefinedConstraintsToRelation($relation, ?array $args = null)
         }
 
         // Default models (belongsTo, hasOne, hasOneThrough, morphOne)
-        if ($defaultData = array_get($args, 'default')) {
+        if ($defaultData = Arr::get($args, 'default')) {
             $relation->withDefault($defaultData);
         }
 
         // Pivot data (belongsToMany, morphToMany, morphByMany)
-        if ($pivotData = array_get($args, 'pivot')) {
+        if ($pivotData = Arr::get($args, 'pivot')) {
             $relation->withPivot($pivotData);
         }
 
         // Pivot incrementing key (belongsToMany, morphToMany, morphByMany)
-        if ($pivotKey = array_get($args, 'pivotKey')) {
+        if ($pivotKey = Arr::get($args, 'pivotKey')) {
             $relation->withPivot($pivotKey);
         }
 
         // Pivot timestamps (belongsToMany, morphToMany, morphByMany)
-        if (array_get($args, 'timestamps')) {
+        if (Arr::get($args, 'timestamps')) {
             $relation->withTimestamps();
         }
 
         // Count "helper" relation
         // @deprecated use Laravel withCount() method instead
-        if (array_get($args, 'count')) {
+        if (Arr::get($args, 'count')) {
             if ($relation instanceof BelongsToManyBase) {
                 $relation->countMode = true;
                 $keyName = $relation->getQualifiedForeignPivotKeyName();
@@ -79,14 +80,14 @@ public function addDefinedConstraintsToQuery($query, ?array $args = null)
         }
 
         // Conditions
-        if ($conditions = array_get($args, 'conditions')) {
+        if ($conditions = Arr::get($args, 'conditions')) {
             $query->whereRaw($conditions);
         }
 
         // Sort order
         // @deprecated count is deprecated
-        $hasCountArg = array_get($args, 'count') !== null;
-        if (($orderBy = array_get($args, 'order')) && !$hasCountArg) {
+        $hasCountArg = Arr::get($args, 'count') !== null;
+        if (($orderBy = Arr::get($args, 'order')) && !$hasCountArg) {
             if (!is_array($orderBy)) {
                 $orderBy = [$orderBy];
             }
@@ -105,7 +106,7 @@ public function addDefinedConstraintsToQuery($query, ?array $args = null)
         }
 
         // Scope
-        if ($scope = array_get($args, 'scope')) {
+        if ($scope = Arr::get($args, 'scope')) {
             if (is_string($scope)) {
                 $query->$scope($this->parent);
             }
diff --git a/src/Database/Relations/HasOneOrMany.php b/src/Database/Relations/HasOneOrMany.php
@@ -1,6 +1,7 @@
 <?php namespace October\Rain\Database\Relations;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Arr;
 
 /**
  * HasOneOrMany
@@ -253,7 +254,7 @@ public function remove(Model $model, $sessionKey = null)
             $options = $this->parent->getRelationDefinition($this->relationName);
 
             // Delete or orphan the model
-            if (array_get($options, 'delete', false)) {
+            if (Arr::get($options, 'delete', false)) {
                 $model->delete();
             }
             else {
@@ -304,7 +305,7 @@ protected function ensureRelationIsEmpty()
     {
         $options = $this->parent->getRelationDefinition($this->relationName);
 
-        if (array_get($options, 'delete', false)) {
+        if (Arr::get($options, 'delete', false)) {
             $this->delete();
         }
         else {
diff --git a/src/Database/Relations/MorphOneOrMany.php b/src/Database/Relations/MorphOneOrMany.php
@@ -1,6 +1,7 @@
 <?php namespace October\Rain\Database\Relations;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Arr;
 
 /**
  * MorphOneOrMany
@@ -244,7 +245,7 @@ public function remove(Model $model, $sessionKey = null)
             $options = $this->parent->getRelationDefinition($this->relationName);
 
             // Delete or orphan the model
-            if (array_get($options, 'delete', false)) {
+            if (Arr::get($options, 'delete', false)) {
                 $model->delete();
             }
             else {
@@ -298,7 +299,7 @@ protected function ensureRelationIsEmpty()
     {
         $options = $this->parent->getRelationDefinition($this->relationName);
 
-        if (array_get($options, 'delete', false)) {
+        if (Arr::get($options, 'delete', false)) {
             $this->delete();
         }
         else {
diff --git a/src/Database/Traits/Encryptable.php b/src/Database/Traits/Encryptable.php
@@ -2,6 +2,7 @@
 
 use Crypt;
 use Exception;
+use Illuminate\Support\Arr;
 
 /**
  * Encryptable database trait
@@ -49,8 +50,8 @@ public function initializeEncryptable()
         $this->bindEvent('model.beforeGetAttribute', function ($key) {
             if (
                 in_array($key, $this->getEncryptableAttributes()) &&
-                array_get($this->attributes, $key) !== null &&
-                array_get($this->attributes, $key) !== ''
+                Arr::get($this->attributes, $key) !== null &&
+                Arr::get($this->attributes, $key) !== ''
             ) {
                 return $this->getEncryptableValue($key);
             }
diff --git a/src/Database/Traits/Multisite.php b/src/Database/Traits/Multisite.php
@@ -1,5 +1,6 @@
 <?php namespace October\Rain\Database\Traits;
 
+use Illuminate\Support\Arr;
 use Site;
 use October\Rain\Database\Scopes\MultisiteScope;
 use Exception;
@@ -331,7 +332,7 @@ public function getMultisiteConfig($key, $default = null)
             return $default;
         }
 
-        return array_get($this->propagatableSync, $key, $default);
+        return Arr::get($this->propagatableSync, $key, $default);
     }
 
     /**
diff --git a/src/Database/Traits/Revisionable.php b/src/Database/Traits/Revisionable.php
@@ -4,6 +4,7 @@
 use Exception;
 use DateTime;
 use Illuminate\Database\Eloquent\Model as EloquentModel;
+use Illuminate\Support\Arr;
 
 /**
  * Revisionable trait tracks changes to specific attributes
@@ -79,7 +80,7 @@ public function revisionableAfterUpdate()
 
             $toSave[] = [
                 'field' => $attribute,
-                'old_value' => array_get($this->original, $attribute),
+                'old_value' => Arr::get($this->original, $attribute),
                 'new_value' => $value,
                 'revisionable_type' => $relationObject->getMorphClass(),
                 'revisionable_id' => $this->getKey(),
diff --git a/src/Database/Traits/SimpleTree.php b/src/Database/Traits/SimpleTree.php
@@ -1,5 +1,6 @@
 <?php namespace October\Rain\Database\Traits;
 
+use Illuminate\Support\Arr;
 use October\Rain\Database\Collection;
 use October\Rain\Database\TreeCollection;
 use Exception;
@@ -228,7 +229,7 @@ public function scopeListsNested($query, $column, $key = null, $indent = '&nbsp;
                 }
 
                 // Add the children
-                $childItems = array_get($map, $item->{$idName}, []);
+                $childItems = Arr::get($map, $item->{$idName}, []);
                 if (count($childItems) > 0) {
                     $result = $result + $buildCollection($childItems, $map, $depth + 1);
                 }
diff --git a/src/Database/Traits/SoftDelete.php b/src/Database/Traits/SoftDelete.php
@@ -2,6 +2,7 @@
 
 use Illuminate\Database\Eloquent\Model as EloquentModel;
 use Illuminate\Database\Eloquent\Collection as CollectionBase;
+use Illuminate\Support\Arr;
 use October\Rain\Database\Scopes\SoftDeleteScope;
 
 /**
@@ -129,7 +130,7 @@ protected function performSoftDeleteOnRelations()
         $definitions = $this->getRelationDefinitions();
         foreach ($definitions as $type => $relations) {
             foreach ($relations as $name => $options) {
-                if (!array_get($options, 'softDelete', false)) {
+                if (!Arr::get($options, 'softDelete', false)) {
                     continue;
                 }
 
@@ -213,7 +214,7 @@ protected function performRestoreOnRelations()
         $definitions = $this->getRelationDefinitions();
         foreach ($definitions as $type => $relations) {
             foreach ($relations as $name => $options) {
-                if (!array_get($options, 'softDelete', false)) {
+                if (!Arr::get($options, 'softDelete', false)) {
                     continue;
                 }
 
diff --git a/src/Halcyon/Builder.php b/src/Halcyon/Builder.php
@@ -1,6 +1,7 @@
 <?php namespace October\Rain\Halcyon;
 
 use Carbon\Carbon;
+use Illuminate\Support\Arr;
 use October\Rain\Halcyon\Exception\InvalidDirectoryNameException;
 use October\Rain\Halcyon\Exception\InvalidExtensionException;
 use October\Rain\Halcyon\Exception\MissingFileNameException;
@@ -645,7 +646,7 @@ protected function isCacheBusted($result)
             return false;
         }
 
-        $mtime = $result ? array_get(reset($result), 'mtime') : null;
+        $mtime = $result ? Arr::get(reset($result), 'mtime') : null;
 
         list($name, $extension) = $this->selectSingle;
 
diff --git a/src/Halcyon/Datasource/AutoDatasource.php b/src/Halcyon/Datasource/AutoDatasource.php
@@ -1,5 +1,6 @@
 <?php namespace October\Rain\Halcyon\Datasource;
 
+use Illuminate\Support\Arr;
 use October\Rain\Halcyon\Model;
 use October\Rain\Halcyon\Processors\Processor;
 
@@ -28,7 +29,7 @@ public function __construct(array $datasources)
     {
         $this->datasources = $datasources;
 
-        $this->primaryDatasource = array_first($datasources);
+        $this->primaryDatasource = Arr::first($datasources);
 
         $this->postProcessor = new Processor;
     }
diff --git a/src/Halcyon/Processors/Processor.php b/src/Halcyon/Processors/Processor.php
@@ -1,5 +1,6 @@
 <?php namespace October\Rain\Halcyon\Processors;
 
+use Illuminate\Support\Arr;
 use October\Rain\Halcyon\Builder;
 
 /**
@@ -24,7 +25,7 @@ public function processSelectOne(Builder $query, $result)
             return null;
         }
 
-        $fileName = array_get($result, 'fileName');
+        $fileName = Arr::get($result, 'fileName');
 
         return [$fileName => $this->parseTemplateContent($query, $result, $fileName)];
     }
@@ -45,7 +46,7 @@ public function processSelect(Builder $query, $results)
         $items = [];
 
         foreach ($results as $result) {
-            $fileName = array_get($result, 'fileName');
+            $fileName = Arr::get($result, 'fileName');
             $items[$fileName] = $this->parseTemplateContent($query, $result, $fileName);
         }
 
@@ -64,14 +65,14 @@ protected function parseTemplateContent($query, $result, $fileName)
             'isCompoundObject' => $query->getModel()->isCompoundObject()
         ];
 
-        $content = array_get($result, 'content');
+        $content = Arr::get($result, 'content');
 
         $processed = SectionParser::parse($content, $options);
 
         return [
             'fileName' => $fileName,
             'content' => $content,
-            'mtime' => array_get($result, 'mtime'),
+            'mtime' => Arr::get($result, 'mtime'),
             'markup' => $processed['markup'],
             'code' => $processed['code']
         ] + $processed['settings'];
diff --git a/src/Halcyon/Traits/Validation.php b/src/Halcyon/Traits/Validation.php
@@ -1,9 +1,10 @@
 <?php namespace October\Rain\Halcyon\Traits;
 
-use Validator;
+use Illuminate\Support\Arr;
 use Illuminate\Support\MessageBag;
-use October\Rain\Support\Facades\Input;
 use October\Rain\Halcyon\Exception\ModelException;
+use October\Rain\Support\Facades\Input;
+use Validator;
 use Exception;
 
 trait Validation
@@ -57,7 +58,7 @@ public static function bootValidation()
                 // If forcing the save event, the beforeValidate/afterValidate
                 // events should still fire for consistency. So validate an
                 // empty set of rules and messages.
-                $force = array_get($options, 'force', false);
+                $force = Arr::get($options, 'force', false);
                 if ($force) {
                     $valid = $model->validate([], []);
                 }
diff --git a/src/Html/FormBuilder.php b/src/Html/FormBuilder.php
diff --git a/src/Mail/Mailer.php b/src/Mail/Mailer.php
diff --git a/src/Network/Http.php b/src/Network/Http.php
diff --git a/src/Parse/Syntax/FieldParser.php b/src/Parse/Syntax/FieldParser.php
diff --git a/src/Parse/Syntax/Parser.php b/src/Parse/Syntax/Parser.php
diff --git a/src/Parse/Syntax/SyntaxModelTrait.php b/src/Parse/Syntax/SyntaxModelTrait.php

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`use Event;`
`4`	`4`	`use Carbon\Carbon;`
	`5`	`+use Illuminate\Support\Arr;`
`5`	`6`	`use October\Rain\Database\Model;`
`6`	`7`	`use Throwable;`
`7`	`8`
`@@ -209,12 +210,12 @@ protected function deleteSlaveRecord()`
`209`	`210`	`}`
`210`	`211`
`211`	`212`	`$options = $masterObject->getRelationDefinition($this->master_field);`
`212`		`- if (!array_get($options, 'delete', false)) {`
	`213`	`+ if (!Arr::get($options, 'delete', false)) {`
`213`	`214`	`return;`
`214`	`215`	`}`
`215`	`216`
`216`	`217`	`// Only delete it if the relationship is null`
`217`		`- $foreignKey = array_get($options, 'key', $masterObject->getForeignKey());`
	`218`	`+ $foreignKey = Arr::get($options, 'key', $masterObject->getForeignKey());`
`218`	`219`	`if ($foreignKey && !$relatedObj->$foreignKey) {`
`219`	`220`	`$relatedObj->delete();`
`220`	`221`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`use Illuminate\Database\Eloquent\Model;`
`4`	`4`	`use Illuminate\Database\Eloquent\Builder;`
	`5`	`+use Illuminate\Support\Arr;`
`5`	`6`	`use October\Rain\Database\Attach\File as FileModel;`
`6`	`7`	`use Symfony\Component\HttpFoundation\File\UploadedFile;`
`7`	`8`
`@@ -368,7 +369,7 @@ public function remove(Model $model, $sessionKey = null)`
`368`	`369`
`369`	`370`	`$options = $this->parent->getRelationDefinition($this->relationName);`
`370`	`371`
`371`		`- if (array_get($options, 'delete', false)) {`
	`372`	`+ if (Arr::get($options, 'delete', false)) {`
`372`	`373`	`$model->delete();`
`373`	`374`	`}`
`374`	`375`	`else {`
`@@ -477,7 +478,7 @@ protected function ensureRelationIsEmpty()`
`477`	`478`	`{`
`478`	`479`	`$options = $this->parent->getRelationDefinition($this->relationName);`
`479`	`480`
`480`		`- if (array_get($options, 'delete', false)) {`
	`481`	`+ if (Arr::get($options, 'delete', false)) {`
`481`	`482`	`$this->delete();`
`482`	`483`	`}`
`483`	`484`	`else {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`<?php namespace October\Rain\Database\Traits;`
`2`	`2`
	`3`	`+use Illuminate\Support\Arr;`
`3`	`4`	`use Site;`
`4`	`5`	`use October\Rain\Database\Scopes\MultisiteScope;`
`5`	`6`	`use Exception;`
`@@ -331,7 +332,7 @@ public function getMultisiteConfig($key, $default = null)`
`331`	`332`	`return $default;`
`332`	`333`	`}`
`333`	`334`
`334`		`- return array_get($this->propagatableSync, $key, $default);`
	`335`	`+ return Arr::get($this->propagatableSync, $key, $default);`
`335`	`336`	`}`
`336`	`337`
`337`	`338`	`/**`