Release minor (v4.2.0)

.github/workflows/pipeline.yml

@@ -39,7 +39,7 @@ jobs:
           - 3306/tcp
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
     env:
-      DB_DATABASE: db_test
+      DB_DATABASE: testbench
       DB_USERNAME: root
       DB_PASSWORD: root
     steps:

config/system.php

@@ -141,7 +141,7 @@
     |
     */
 
-    'urlPolicy' => env('IGNITER_URL_POLICY', 'detect'),
+    'urlPolicy' => env('IGNITER_URL_POLICY', 'force'),
 
     /*
     |--------------------------------------------------------------------------

database/migrations/admin/2025_11_15_165912_add_indexes.php

@@ -0,0 +1,24 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::table('status_history', function(Blueprint $table) {
+            $table->index(['object_type', 'object_id', 'created_at'], 'idx_status_history_object_created');
+            $table->index(['object_type', 'object_id', 'status_history_id'], 'idx_status_history_object_status');
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('status_history', function(Blueprint $table) {
+            $table->dropIndex('idx_status_history_object_created');
+            $table->dropIndex('idx_status_history_object_status');
+        });
+    }
+};

database/migrations/system/2025_03_29_164243_remove_deprecated_code_from_mail_layouts.php

@@ -1,6 +1,7 @@
 <?php
 
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
 
 return new class extends Migration
 {

database/migrations/system/2025_11_15_165912_add_indexes.php

@@ -0,0 +1,46 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::table('media_attachments', function(Blueprint $table) {
+            $table->index(['attachment_type', 'attachment_id', 'priority'], 'idx_media_attachments_type_id_priority');
+        });
+
+        Schema::table('languages', function(Blueprint $table) {
+            $table->index(['status', 'is_default'], 'idx_languages_status_default');
+        });
+
+        Schema::table('countries', function(Blueprint $table) {
+            $table->index(['status', 'is_default'], 'idx_countries_status_default');
+        });
+
+        Schema::table('currencies', function(Blueprint $table) {
+            $table->index(['currency_status', 'is_default'], 'idx_currencies_status_default');
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('media_attachments', function(Blueprint $table) {
+            $table->dropIndex('idx_media_attachments_type_id_priority');
+        });
+
+        Schema::table('languages', function(Blueprint $table) {
+            $table->dropIndex('idx_languages_status_default');
+        });
+
+        Schema::table('countries', function(Blueprint $table) {
+            $table->dropIndex('idx_countries_status_default');
+        });
+
+        Schema::table('currencies', function(Blueprint $table) {
+            $table->dropIndex('idx_currencies_status_default');
+        });
+    }
+};

phpunit.xml.dist

@@ -21,8 +21,7 @@
         <env name="APP_DEBUG" value="true"/>
         <env name="APP_KEY" value="base64:cuULT9tUWlbKtqv1Mk3jBw832yDSMEv0BvXx6hZOFQQ="/>
         <env name="DB_CONNECTION" value="mysql"/>
-<!--        <env name="DB_HOST" value="db"/>-->
-        <env name="DB_DATABASE" value="db_test"/>
+        <env name="DB_DATABASE" value="testbench"/>
         <env name="DB_USERNAME" value="root"/>
         <env name="DB_PASSWORD" value="root"/>
     </php>

rector.php

@@ -8,7 +8,6 @@
 use Rector\CodeQuality\Rector\Ternary\SwitchNegatedTernaryRector;
 use Rector\CodingStyle\Rector\ClassMethod\NewlineBeforeNewAssignSetRector;
 use Rector\CodingStyle\Rector\FuncCall\FunctionFirstClassCallableRector;
-use Rector\CodingStyle\Rector\FunctionLike\FunctionLikeToFirstClassCallableRector;
 use Rector\Config\RectorConfig;
 use Rector\DeadCode\Rector\ClassMethod\RemoveUselessParamTagRector;
 use Rector\Strict\Rector\Empty_\DisallowedEmptyRuleFixerRector;
@@ -45,7 +44,6 @@
             __DIR__.'/src/Flame/Database/Concerns/HasRelationships.php',
         ],
         FunctionFirstClassCallableRector::class,
-        FunctionLikeToFirstClassCallableRector::class,
         SimplifyEmptyCheckOnEmptyArrayRector::class,
         StrictStringParamConcatRector::class => [
             __DIR__.'/src/Flame/Database/Concerns/HasRelationships.php',

resources/models/main/theme.php

@@ -83,7 +83,7 @@
         ],
         'reset' => [
             'label' => 'lang:igniter::system.themes.button_reset_to_default',
-            'class' => 'btn btn-secondary',
+            'class' => 'btn btn-default',
             'context' => 'edit',
             'data-request' => 'onReset',
             'data-request-confirm' => 'lang:igniter::admin.alert_warning_confirm',

resources/views/system/_partials/pagination/simple_default.blade.php

@@ -1,5 +1,5 @@
 @if ($paginator->hasPages())
-    <ul class="pagination">
+    <ul class="pagination d-flex justify-content-between">
         @if ($paginator->onFirstPage())
             <li class="disabled"><span>@lang('pagination.previous')</span></li>
         @else

src/Admin/Widgets/Lists.php

@@ -220,20 +220,23 @@ protected function prepareModel(): Builder
         $primarySearchable = [];
         $relationSearchable = [];
 
+        // Get the grammar from the model's connection to ensure it's properly initialized
+        $schemaGrammar = $query->getQuery()->getGrammar();
+
         if (!empty($this->searchTerm) && ($searchableColumns = $this->getSearchableColumns())) {
             foreach ($searchableColumns as $column) {
                 // Relation
                 if ($this->isColumnRelated($column)) {
                     $table = DB::getTablePrefix().$this->model->{$column->relation}()->getModel()->getTable();
                     $columnName = isset($column->sqlSelect)
-                        ? DB::raw($this->parseTableName($column->sqlSelect, $table))->getValue(DB::connection()->getSchemaGrammar())
+                        ? DB::raw($this->parseTableName($column->sqlSelect, $table))->getValue($schemaGrammar)
                         : $table.'.'.$column->valueFrom;
 
                     $relationSearchable[$column->relation][] = $columnName;
                 } // Primary
                 else {
                     $columnName = isset($column->sqlSelect)
-                        ? DB::raw($this->parseTableName($column->sqlSelect, $primaryTable))->getValue(DB::connection()->getSchemaGrammar())
+                        ? DB::raw($this->parseTableName($column->sqlSelect, $primaryTable))->getValue($schemaGrammar)
                         : DB::getTablePrefix().$primaryTable.'.'.$column->columnName;
 
                     $primarySearchable[] = $columnName;

src/Flame/Composer/Manager.php

@@ -23,7 +23,7 @@
  */
 class Manager
 {
-    protected const string REPOSITORY_HOST = 'satis.tastyigniter.com';
+    protected const string REPOSITORY_HOST = 'composer.tastyigniter.com';
 
     /** The primary composer instance. */
     protected ?ClassLoader $loader = null;
@@ -86,9 +86,10 @@ protected function loadInstalledPackages(bool $fresh = false): Collection
             ->mapWithKeys(function(array $package): array {
                 if ($package['name'] === PackageInfo::CORE) {
                     $package['code'] = PackageInfo::CORE_CODE;
-                    $package['type'] = PackageInfo::CORE_TYPE;
                 }
 
+                $package['type'] = $this->getPackageType($package);
+
                 return [$this->getPackageCode($package) => $package];
             });
     }
@@ -128,6 +129,20 @@ protected function getPackageCode(array $package): mixed
                 array_get($package, 'extra.tastyigniter-theme.code')));
     }
 
+    protected function getPackageType(array $package): ?string
+    {
+        if (array_get($package, 'name') === PackageInfo::CORE) {
+            return PackageInfo::CORE_TYPE;
+        }
+
+        $packageType = 'extension';
+        if (array_get($package, 'extra.tastyigniter-theme')) {
+            $packageType = 'theme';
+        }
+
+        return $packageType;
+    }
+
     //
     //
     //

src/Flame/Database/Relations/BelongsToMany.php

@@ -36,7 +36,6 @@ class BelongsToMany extends BelongsToManyBase
      * @param string $foreignPivotKey
      * @param string $relatedPivotKey
      * @param string $relationName
-     * @return void
      */
     public function __construct(
         Builder $query,

src/Flame/Database/Relations/HasMany.php

@@ -20,7 +20,6 @@ class HasMany extends HasManyBase
 
     /**
      * Create a new has many relationship instance.
-     * @return void
      */
     public function __construct(Builder $query, Model $parent, $foreignKey, $localKey, $relationName = null)
     {

src/Flame/Database/Relations/HasManyThrough.php

@@ -19,7 +19,6 @@ class HasManyThrough extends HasManyThroughBase
     /**
      * Create a new has many relationship instance.
      * @param string $relationName
-     * @return void
      */
     public function __construct(
         Builder $query,

src/Flame/Database/Relations/HasOne.php

@@ -19,7 +19,6 @@ class HasOne extends HasOneBase
 
     /**
      * Create a new has many relationship instance.
-     * @return void
      */
     public function __construct(Builder $query, Model $parent, $foreignKey, $localKey, $relationName = null)
     {

src/Flame/Database/Relations/HasOneThrough.php

@@ -19,7 +19,6 @@ class HasOneThrough extends HasOneThroughBase
     /**
      * Create a new has many relationship instance.
      * @param string $relationName
-     * @return void
      */
     public function __construct(
         Builder $query,

src/Flame/Database/Relations/MorphMany.php

@@ -20,7 +20,6 @@ class MorphMany extends MorphManyBase
 
     /**
      * Create a new has many relationship instance.
-     * @return void
      */
     public function __construct(Builder $query, Model $parent, $type, $id, $localKey, $relationName = null)
     {

src/Flame/Database/Relations/MorphOne.php

@@ -19,7 +19,6 @@ class MorphOne extends MorphOneBase
 
     /**
      * Create a new has many relationship instance.
-     * @return void
      */
     public function __construct(Builder $query, Model $parent, $type, $id, $localKey, $relationName = null)
     {

src/Flame/Database/Relations/MorphToMany.php

@@ -45,7 +45,6 @@ class MorphToMany extends BelongsToMany
      * @param string $otherKey
      * @param string $relationName
      * @param bool $inverse
-     * @return void
      */
     public function __construct(
         Builder $query,

src/Flame/Database/Traits/HasQueryModifier.php

@@ -41,7 +41,8 @@ public function scopeApplyFilters(Builder $builder, array $options = []): Builde
         collect($this->queryModifierFilters)
             ->each(function($value, $key) use ($builder, $options) {
                 $params = (array)$value;
-                if ($filterValue = array_get($options, $key, array_get($params, 'default'))) {
+                if (array_key_exists($key, $options)) {
+                    $filterValue = array_get($options, $key, array_get($params, 'default'));
                     (new FiltersScope)($builder, $filterValue, $params[0]);
                 }
             });

src/Flame/Exception/ApplicationException.php

@@ -5,8 +5,6 @@
 namespace Igniter\Flame\Exception;
 
 use Exception;
-use Illuminate\Http\Request;
-use Illuminate\Http\Response;
 
 class ApplicationException extends Exception
 {
@@ -15,25 +13,8 @@ class ApplicationException extends Exception
      * @param int $code Error code.
      * @param Exception|null $previous Previous exception.
      */
-    public function __construct($message = '', $code = 500, ?Exception $previous = null)
+    public function __construct(string $message = '', int $code = 500, ?Exception $previous = null)
     {
         parent::__construct($message, $code, $previous);
     }
-
-    public function render(Request $request): Response
-    {
-        $message = $this->getMessage();
-
-        if (config('app.debug', false)) {
-            $message = sprintf('"%s" on line %s of %s',
-                $this->getMessage(),
-                $this->getLine(),
-                $this->getFile()
-            );
-
-            $message .= $this->getTraceAsString();
-        }
-
-        return response($message, $this->code);
-    }
 }

src/Flame/Support/Helpers/helpers.php

@@ -806,7 +806,7 @@ function name_to_array(string $string): array
             array_unshift($result, $matches[1]);
         }
 
-        return array_filter($result, fn($val): bool => (bool)strlen($val));
+        return array_filter($result, fn($val): bool => (bool)strlen((string) $val));
     }
 }
 

src/Flame/Support/Igniter.php

@@ -13,7 +13,7 @@
 
 class Igniter
 {
-    protected const string VERSION = 'v4.0.15';
+    protected const string VERSION = 'minor (v4.2.0)';
 
     /**
      * The base path for extensions.

src/Flame/Translation/Models/Translation.php

@@ -135,7 +135,7 @@ public static function getFresh($locale, $group, $namespace = null)
             ->get();
     }
 
-    public static function getCached($locale, $group, $namespace = null)
+    public static function getCached(string $locale, $group, $namespace = null)
     {
         $cacheKey = static::getCacheKey($locale, $group, $namespace);
 

src/Main/Classes/MediaLibrary.php

@@ -153,7 +153,7 @@ public function rename(string $path, string $newPath): bool
 
     public function deleteFiles(string|array $paths): bool
     {
-        return $this->getStorageDisk()->delete(array_map(fn(string $path): string => $this->getMediaPath($path), (array)$paths));
+        return $this->getStorageDisk()->delete(array_map($this->getMediaPath(...), (array)$paths));
     }
 
     public function deleteFolder(string $path): bool

src/System/Classes/PackageInfo.php

@@ -13,7 +13,7 @@ class PackageInfo
 
     public const string CORE_CODE = 'tastyigniter';
 
-    public const string CORE_TYPE = 'tastyigniter-core';
+    public const string CORE_TYPE = 'core';
 
     public const array CORE_MANIFEST = [
         'code' => self::CORE_CODE,

src/System/Console/Commands/ExtensionInstall.php

@@ -31,10 +31,10 @@ public function handle(): void
         $extensionName = $this->argument('name');
         $updateManager = resolve(UpdateManager::class)->setLogsOutput($this->output);
 
-        $itemDetail = $updateManager->requestItemDetail([
+        $itemDetail = rescue(fn() => $updateManager->requestItemDetail([
             'name' => $extensionName,
             'type' => 'extension',
-        ]);
+        ]), fn() => null, false) ?? [];
 
         if (!$itemDetail || !array_has($itemDetail, 'package') || array_get($itemDetail, 'code') !== $extensionName) {
             $this->output->writeln(sprintf('<info>Extension %s not found</info>', $extensionName));

src/System/Models/Settings.php

@@ -142,7 +142,7 @@ public static function onboardingMailIsComplete(): bool
 
     public function getValueAttribute()
     {
-        return ($value = @unserialize($this->attributes['value'] ?? ''))
+        return ($value = @unserialize($this->attributes['value'] ?? '')) !== false
             ? $value
             : $this->attributes['value'];
     }

src/System/Traits/ManagesUpdates.php

@@ -88,6 +88,8 @@ public function onApplyUpdate(): array
 
         [$response, $success] = $this->processInstallOrUpdate($itemsToUpdate->all(), isUpdate: true);
 
+        $updateManager->requestUpdateList(true);
+
         return [
             'message' => implode('<br>', $response),
             'success' => $success,