Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/3.x' into 3.x
Browse files Browse the repository at this point in the history
  • Loading branch information
daurensky committed Feb 26, 2024
2 parents 320011b + 1c32f6b commit 84bddc5
Show file tree
Hide file tree
Showing 15 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dependabot-auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

- name: Dependabot metadata
id: metadata
uses: dependabot/fetch-metadata@v1.5.1
uses: dependabot/fetch-metadata@v1.6.0
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/fix-php-code-style-issues.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ github.head_ref }}

- name: Fix PHP code style issues
uses: aglipanci/[email protected]

- name: Commit changes
uses: stefanzweifel/git-auto-commit-action@v4
uses: stefanzweifel/git-auto-commit-action@v5
with:
commit_message: Fix styling
2 changes: 1 addition & 1 deletion .github/workflows/phpstan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
name: phpstan
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup PHP
uses: shivammathur/setup-php@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup PHP
uses: shivammathur/setup-php@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update-changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: 2.x

Expand All @@ -24,7 +24,7 @@ jobs:
release-notes: ${{ github.event.release.body }}

- name: Commit updated CHANGELOG
uses: stefanzweifel/git-auto-commit-action@v4
uses: stefanzweifel/git-auto-commit-action@v5
with:
branch: 2.x
commit_message: Update CHANGELOG
Expand Down
2 changes: 1 addition & 1 deletion database/factories/SocialProjectFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

namespace AdminKit\SocialProjects\Database\Factories;

use Illuminate\Database\Eloquent\Factories\Factory;
use AdminKit\SocialProjects\Models\SocialProject;
use Illuminate\Database\Eloquent\Factories\Factory;

class SocialProjectFactory extends Factory
{
Expand Down
2 changes: 1 addition & 1 deletion src/FilamentPlugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

namespace AdminKit\SocialProjects;

use AdminKit\SocialProjects\UI\Filament\Resources\SocialProjectResource;
use Filament\Contracts\Plugin;
use Filament\Panel;
use AdminKit\SocialProjects\UI\Filament\Resources\SocialProjectResource;

class FilamentPlugin implements Plugin
{
Expand Down
2 changes: 1 addition & 1 deletion src/Models/SocialProject.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
use Spatie\MediaLibrary\HasMedia;
use Spatie\MediaLibrary\InteractsWithMedia;
use AdminKit\Core\Abstracts\Models\AbstractModel;
use AdminKit\SocialProjects\Database\Factories\SocialProjectFactory;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Spatie\Translatable\HasTranslations;
use AdminKit\SocialProjects\Database\Factories\SocialProjectFactory;

class SocialProject extends AbstractModel implements HasMedia
{
Expand Down
4 changes: 2 additions & 2 deletions src/SocialProjectsServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

namespace AdminKit\SocialProjects;

use Spatie\LaravelPackageTools\Package;
use Spatie\LaravelPackageTools\PackageServiceProvider;
use AdminKit\SocialProjects\Commands\SocialProjectsCommand;
use AdminKit\SocialProjects\Providers\RouteServiceProvider;
use Spatie\LaravelPackageTools\Package;
use Spatie\LaravelPackageTools\PackageServiceProvider;

class SocialProjectsServiceProvider extends PackageServiceProvider
{
Expand Down
2 changes: 1 addition & 1 deletion src/UI/API/Routes/api.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

use Illuminate\Support\Facades\Route;
use AdminKit\SocialProjects\UI\API\Controllers\SocialProjectController;
use Illuminate\Support\Facades\Route;

Route::get('/social-projects', [SocialProjectController::class, 'index']);
4 changes: 2 additions & 2 deletions src/UI/Filament/Resources/SocialProjectResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
namespace AdminKit\SocialProjects\UI\Filament\Resources;

use AdminKit\Core\Forms\Components\TranslatableTabs;
use AdminKit\SocialProjects\Models\SocialProject;
use AdminKit\SocialProjects\UI\Filament\Resources\SocialProjectResource\Pages;
use Filament\Forms;
use Filament\Resources\Resource;
use Filament\Tables;
use AdminKit\SocialProjects\Models\SocialProject;
use AdminKit\SocialProjects\UI\Filament\Resources\SocialProjectResource\Pages;

class SocialProjectResource extends Resource
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

namespace AdminKit\SocialProjects\UI\Filament\Resources\SocialProjectResource\Pages;

use Filament\Resources\Pages\CreateRecord;
use AdminKit\SocialProjects\UI\Filament\Resources\SocialProjectResource;
use Filament\Resources\Pages\CreateRecord;

class CreateSocialProject extends CreateRecord
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

namespace AdminKit\SocialProjects\UI\Filament\Resources\SocialProjectResource\Pages;

use AdminKit\SocialProjects\UI\Filament\Resources\SocialProjectResource;
use Filament\Actions;
use Filament\Resources\Pages\EditRecord;
use AdminKit\SocialProjects\UI\Filament\Resources\SocialProjectResource;

class EditSocialProject extends EditRecord
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

namespace AdminKit\SocialProjects\UI\Filament\Resources\SocialProjectResource\Pages;

use AdminKit\SocialProjects\UI\Filament\Resources\SocialProjectResource;
use Filament\Actions;
use Filament\Resources\Pages\ListRecords;
use AdminKit\SocialProjects\UI\Filament\Resources\SocialProjectResource;

class ListSocialProject extends ListRecords
{
Expand Down
2 changes: 1 addition & 1 deletion tests/TestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

namespace AdminKit\SocialProjects\Tests;

use AdminKit\SocialProjects\SocialProjectsServiceProvider;
use Illuminate\Database\Eloquent\Factories\Factory;
use Livewire\LivewireServiceProvider;
use Orchestra\Testbench\TestCase as Orchestra;
use AdminKit\SocialProjects\SocialProjectsServiceProvider;

class TestCase extends Orchestra
{
Expand Down

0 comments on commit 84bddc5

Please sign in to comment.