Skip to content

Commit f6fa2c4

Browse files
authored
Merge pull request #18 from worksome/feature/laravel-11
feat: add support for Laravel 11
2 parents 4946810 + 89b60a1 commit f6fa2c4

9 files changed

+27
-31
lines changed

.github/workflows/dependabot-auto-merge.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: dependabot-auto-merge
1+
name: Dependabot Auto-Merge
22
on: pull_request_target
33

44
permissions:
@@ -13,7 +13,7 @@ jobs:
1313

1414
- name: Dependabot metadata
1515
id: metadata
16-
uses: dependabot/fetch-metadata@v1.3.5
16+
uses: dependabot/fetch-metadata@v1
1717
with:
1818
github-token: "${{ secrets.GITHUB_TOKEN }}"
1919

.github/workflows/phpstan.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
name: phpstan
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515

1616
- name: Setup PHP
1717
uses: shivammathur/setup-php@v2

.github/workflows/run-tests.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,20 @@ jobs:
1515
fail-fast: true
1616
matrix:
1717
os: [ubuntu-latest, windows-latest]
18-
php: [8.2]
19-
laravel: [10.*]
18+
php: [8.2, 8.3]
19+
laravel: [10.*, 11.*]
2020
stability: [prefer-lowest, prefer-stable]
2121
include:
2222
- laravel: 10.*
2323
testbench: 8.*
24+
- laravel: 11.*
25+
testbench: 9.*
2426

2527
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
2628

2729
steps:
2830
- name: Checkout code
29-
uses: actions/checkout@v3
31+
uses: actions/checkout@v4
3032

3133
- name: Setup PHP
3234
uses: shivammathur/setup-php@v2

.github/workflows/update-changelog.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010

1111
steps:
1212
- name: Checkout code
13-
uses: actions/checkout@v3
13+
uses: actions/checkout@v4
1414
with:
1515
ref: main
1616

@@ -21,7 +21,7 @@ jobs:
2121
release-notes: ${{ github.event.release.body }}
2222

2323
- name: Commit updated CHANGELOG
24-
uses: stefanzweifel/git-auto-commit-action@v4
24+
uses: stefanzweifel/git-auto-commit-action@v5
2525
with:
2626
branch: main
2727
commit_message: Update CHANGELOG

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ If your app needs information about a given company, then there are public servi
99

1010
The Company Info package provides a service that wraps the public services and gives you a simple way to perform the lookups.
1111

12-
Currently the package supports the public service API's of the Danish VIRK and CVR API services and the GB Gazette service.
12+
Currently, the package supports the public service API's of the Danish VIRK and CVR API services and the GB Gazette service.
1313

1414
## Installation
1515

composer.json

+10-10
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@
1717
],
1818
"require": {
1919
"php": "^8.2",
20-
"illuminate/contracts": "^10.0",
21-
"spatie/laravel-package-tools": "^1.14.1"
20+
"illuminate/contracts": "^10.0 || ^11.0",
21+
"spatie/laravel-package-tools": "^1.16"
2222
},
2323
"require-dev": {
24-
"guzzlehttp/guzzle": "^7.5",
25-
"nunomaduro/collision": "^7.0",
26-
"nunomaduro/larastan": "^2.4",
27-
"orchestra/testbench": "^8.0",
28-
"pestphp/pest": "^2.0",
24+
"guzzlehttp/guzzle": "^7.8",
25+
"nunomaduro/collision": "^7.0 || ^8.1",
26+
"larastan/larastan": "^2.6",
27+
"orchestra/testbench": "^8.0 || ^9.0",
28+
"pestphp/pest": "^2.33",
2929
"pestphp/pest-plugin-laravel": "^2.0",
30-
"worksome/coding-style": "^2.5"
30+
"worksome/coding-style": "^2.8"
3131
},
3232
"autoload": {
3333
"psr-4": {
@@ -40,10 +40,10 @@
4040
}
4141
},
4242
"scripts": {
43-
"lint": "vendor/bin/phpcbf",
43+
"lint": "vendor/bin/ecs --fix",
4444
"test:unit": "vendor/bin/pest",
4545
"test:types": "vendor/bin/phpstan analyse",
46-
"test:style": "vendor/bin/phpcs -n",
46+
"test:style": "vendor/bin/ecs",
4747
"test": [
4848
"@test:style",
4949
"@test:types",

ecs.php

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
use Symplify\EasyCodingStandard\Config\ECSConfig;
66
use Worksome\CodingStyle\WorksomeEcsConfig;
77

8-
98
return static function (ECSConfig $ecsConfig): void {
109
$ecsConfig->paths([
1110
__DIR__ . '/src',

phpstan-baseline.neon

+5-10
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,5 @@
11
parameters:
22
ignoreErrors:
3-
-
4-
message: "#^Parameter \\#1 \\$name of method Worksome\\\\CompanyInfo\\\\CompanyInfo\\:\\:lookupName\\(\\) expects string, array\\|string\\|true given\\.$#"
5-
count: 1
6-
path: src/Commands/CompanyInfoLookupCommand.php
7-
8-
-
9-
message: "#^Parameter \\#1 \\$number of method Worksome\\\\CompanyInfo\\\\CompanyInfo\\:\\:lookupNumber\\(\\) expects string, array\\|string\\|true given\\.$#"
10-
count: 1
11-
path: src/Commands/CompanyInfoLookupCommand.php
12-
133
-
144
message: "#^Unable to resolve the template type TKey in call to function collect$#"
155
count: 1
@@ -20,3 +10,8 @@ parameters:
2010
count: 1
2111
path: src/CompanyInfo.php
2212

13+
-
14+
message: "#^Worksome\\\\CompanyInfo\\\\Facades\\\\CompanyInfo facade should not be used\\.$#"
15+
count: 1
16+
path: src/Facades/CompanyInfo.php
17+

src/Commands/CompanyInfoLookupCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ final class CompanyInfoLookupCommand extends Command
1212
/**
1313
* Options for JSON display.
1414
*/
15-
private const JSON_OPTIONS = JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_NUMERIC_CHECK | JSON_PRETTY_PRINT | JSON_THROW_ON_ERROR;
15+
private const JSON_OPTIONS = JSON_UNESCAPED_UNICODE|JSON_UNESCAPED_SLASHES|JSON_NUMERIC_CHECK|JSON_PRETTY_PRINT|JSON_THROW_ON_ERROR;
1616

1717
public $signature = 'company-info:lookup
1818
{--name= : The company name to lookup.}

0 commit comments

Comments
 (0)