improved checks for configs

Author: Smef

src/Database/Eloquent/Concerns/FMGuardsAttributes.php

@@ -60,7 +60,7 @@ protected function getColumns($forceRefresh = false): array
         $refreshCallback = function () {
             $layoutMetaData = $this->getConnection()->getLayoutMetadata($this->table);
 
-            return array_column($layoutMetaData['fieldMetaData'], 'name');
+            return array_column($layoutMetaData['response']['fieldMetaData'], 'name');
         };
 
         if ($forceRefresh) {

src/Database/Eloquent/FMEloquentBuilder.php

@@ -265,8 +265,8 @@ public function paginate($perPage = null, $columns = ['*'], $pageName = 'page',
     /**
      * Compares a model's modified portal data and original portal data and returns portal data with only modified fields and recordIds
      *
-     * @param    $array1  array The modified portal data
-     * @param    $array2  array The model's original portal data
+     * @param  $array1  array The modified portal data
+     * @param  $array2  array The model's original portal data
      */
     protected function getOnlyModifiedPortalFields($array1, $array2): array
     {

src/Database/Eloquent/FMModel.php

@@ -122,7 +122,8 @@ public static function createFromRecord($record)
         }
 
         // check our config to see if we should map empty strings to null - users may decide they don't want this
-        if (config('eloquent-filemaker.empty_strings_to_null', true)) {
+        $emptyStringToNull = $instance->getConnection()->getConfig()['empty_strings_to_null'] ?? true;
+        if ($emptyStringToNull) {
             // map each value to null if it's an empty string
             $fieldData = collect($fieldData)->map(function ($value) {
                 return $value === '' ? null : $value;

src/Middleware/EndSession.php

@@ -27,7 +27,7 @@ public function handle(Request $request, Closure $next): Response
      */
     public function terminate(Request $request, Response $response): void
     {
-        $shouldCacheSessionToken = FM::connection()->getConfig()['cache_session_token'];
+        $shouldCacheSessionToken = FM::connection()->getConfig()['cache_session_token'] ?? false;
         if ($shouldCacheSessionToken) {
             return;
         }

src/Services/FileMakerConnection.php

@@ -40,8 +40,6 @@ class FileMakerConnection extends Connection
 
     protected $emptyStringToNull = true;
 
-    public const CONFIG_KEY_CACHE_SESSION_TOKEN = 'eloquent-filemaker.cache_session_token';
-
     public function __construct($pdo, $database = '', $tablePrefix = '', array $config = [])
     {