Run Pint

s-damian · Mar 3, 2024 · a8a2175 · a8a2175
1 parent e837476
commit a8a2175
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/src/Larasort.php b/src/Larasort.php
@@ -71,13 +71,13 @@ final public static function clearDefaultSortable(): void
      * This function is especially useful for SQL queries with joins.
      *
      * @param  array<string, string>  $sortablesToTables
-     * - In keys: column of the "orderby"
-     * - In values: 'table_name.column'
-     *   # Example with an "articles" table and its "id" column:
-     *   // When we do an order by "id" (in URL: "?orderby=id"), we want SQL to do it on the "id" of the "articles" table.
-     *   Larasort::setSortablesToTables([
-     *       'id' => 'articles.id',
-     *   ]);
+     *                                                    - In keys: column of the "orderby"
+     *                                                    - In values: 'table_name.column'
+     *                                                    # Example with an "articles" table and its "id" column:
+     *                                                    // When we do an order by "id" (in URL: "?orderby=id"), we want SQL to do it on the "id" of the "articles" table.
+     *                                                    Larasort::setSortablesToTables([
+     *                                                    'id' => 'articles.id',
+     *                                                    ]);
      */
     final public static function setSortablesToTables(array $sortablesToTables): void
     {

diff --git a/src/LarasortLink.php b/src/LarasortLink.php
@@ -81,7 +81,7 @@ final public static function getIcon(string $column): string
         return '<span class="'.$class.'"></span>';
     }
 
-    final public static function getLink(string $column, string $label = null): string
+    final public static function getLink(string $column, ?string $label = null): string
     {
         $labelToShow = $label ?? ucfirst(str_replace(['_', config('larasort.relation_column_separator')], ' ', $column));
 

diff --git a/src/Manual/LarasortManual.php b/src/Manual/LarasortManual.php
@@ -55,13 +55,13 @@ final public function setSortables(array $sortables): void
      * This function is especially useful for SQL queries with joins.
      *
      * @param  array<string, string>  $sortablesToTables
-     * - In keys: column of the "orderby"
-     * - In values: 'table_name.column'
-     *   # Example with an "articles" table and its "id" column:
-     *   // When we do an order by "id" (in URL: "?orderby=id"), we want SQL to do it on the "id" of the "articles" table.
-     *   Larasort::setSortablesToTables([
-     *       'id' => 'articles.id',
-     *   ]);
+     *                                                    - In keys: column of the "orderby"
+     *                                                    - In values: 'table_name.column'
+     *                                                    # Example with an "articles" table and its "id" column:
+     *                                                    // When we do an order by "id" (in URL: "?orderby=id"), we want SQL to do it on the "id" of the "articles" table.
+     *                                                    Larasort::setSortablesToTables([
+     *                                                    'id' => 'articles.id',
+     *                                                    ]);
      */
     final public function setSortablesToTables(array $sortablesToTables): void
     {

diff --git a/src/Relations/Related.php b/src/Relations/Related.php
@@ -122,7 +122,7 @@ private function setColumnsToRelated(): void
      * @param  array<string>  $columns
      * @return array<string>
      */
-    private function setColumns(string $table, array|string $columns = null): array
+    private function setColumns(string $table, array|string|null $columns = null): array
     {
         if ($columns !== null) {
             $columns = ! is_array($columns) ? explode(',', $columns) : $columns;