Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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@v3
uses: dependabot/fetch-metadata@25dd0e34f4fe68f24cc83900b1fe3fe149efef98 # v3.1.0
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"

Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/static.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,17 @@ jobs:
name: PHPStan
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
- name: Checkout
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1

- name: Setup PHP
uses: shivammathur/setup-php@v2
uses: shivammathur/setup-php@eb7c497e18156a6bbabfef1d3a82760b9eda3962 # 2.40.0
with:
php-version: '8.4'
coverage: none

- name: Install composer dependencies
uses: ramsey/composer-install@v4
uses: ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda # 4.0.0

- name: Run PHPStan
run: composer test:types
Expand All @@ -35,16 +36,16 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1

- name: Setup PHP
uses: shivammathur/setup-php@v2
uses: shivammathur/setup-php@eb7c497e18156a6bbabfef1d3a82760b9eda3962 # 2.40.0
with:
php-version: '8.4'
coverage: none

- name: Install composer dependencies
uses: ramsey/composer-install@v4
uses: ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda # 4.0.0

- name: Run ECS
run: composer test:style
8 changes: 3 additions & 5 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,20 @@ jobs:
matrix:
os: [ubuntu-latest]
php: [8.4, 8.5]
laravel: [12.*, 13.*]
laravel: [13.*]
stability: [prefer-lowest, prefer-stable]
include:
- laravel: 13.*
testbench: ^11.0
- laravel: 12.*
testbench: ^10.7

name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}

steps:
- name: Checkout code
uses: actions/checkout@v6
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1

- name: Setup PHP
uses: shivammathur/setup-php@v2
uses: shivammathur/setup-php@eb7c497e18156a6bbabfef1d3a82760b9eda3962 # 2.40.0
with:
php-version: ${{ matrix.php }}
coverage: none
Expand Down
18 changes: 10 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,19 @@
],
"require": {
"php": "^8.4",
"illuminate/contracts": "^12.0|^13.0",
"illuminate/contracts": "^13.0",
"nunomaduro/termwind": "^2.4",
"spatie/laravel-package-tools": "^1.93"
},
"require-dev": {
"guzzlehttp/guzzle": "^7.11",
"larastan/larastan": "^3.10",
"canvural/larastan-strict-rules": "^3.0",
"guzzlehttp/guzzle": "^7.11|^8.0",
"larastan/larastan": "^3.13",
"nunomaduro/collision": "^8.9",
"orchestra/testbench": "^10.11|^11.1",
"pestphp/pest": "^4.7",
"pestphp/pest-plugin-laravel": "^4.1",
"worksome/coding-style": "^3.4"
"orchestra/testbench": "^11.1",
"pestphp/pest": "^5.0",
"pestphp/pest-plugin-laravel": "^5.0",
"worksome/coding-style": "^6.0"
},
"autoload": {
"psr-4": {
Expand Down Expand Up @@ -63,7 +64,8 @@
"allow-plugins": {
"pestphp/pest-plugin": true,
"dealerdirect/phpcodesniffer-composer-installer": true,
"worksome/coding-style": true
"worksome/coding-style": true,
"phpstan/extension-installer": true
}
},
"extra": {
Expand Down
16 changes: 6 additions & 10 deletions ecs.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,11 @@

declare(strict_types=1);

use Symplify\EasyCodingStandard\Config\ECSConfig;
use Worksome\CodingStyle\WorksomeEcsConfig;

return static function (ECSConfig $ecsConfig): void {
$ecsConfig->paths([
__DIR__ . '/src',
__DIR__ . '/tests',
__DIR__ . '/config',
]);

WorksomeEcsConfig::setup($ecsConfig);
};
return WorksomeEcsConfig::configure()
->withPaths([
__DIR__ . '/src',
__DIR__ . '/tests',
__DIR__ . '/config',
]);
1 change: 0 additions & 1 deletion phpstan.neon.dist
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
includes:
- ./vendor/worksome/coding-style/larastan.neon
- phpstan-baseline.neon

parameters:
Expand Down
23 changes: 6 additions & 17 deletions rector.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,11 @@

declare(strict_types=1);

use Rector\Config\RectorConfig;
use Worksome\CodingStyle\WorksomeRectorConfig;

return static function (RectorConfig $rectorConfig): void {
WorksomeRectorConfig::setup($rectorConfig);

$rectorConfig->paths([
__DIR__ . '/src',
__DIR__ . '/tests',
]);

// Define extra rule sets to be applied
$rectorConfig->sets([
// SetList::DEAD_CODE,
]);

// Register extra a single rules
// $rectorConfig->rule(ClassOnObjectRector::class);
};
return WorksomeRectorConfig::configure()
->withPaths([
__DIR__ . '/src',
__DIR__ . '/tests',
__DIR__ . '/config',
]);
Loading