Skip to content

Commit 2f913ce

Browse files
authored
Laravel 10.x compatiblity (#54)
* Add Laravel 10 * Add Laravel 10 to config * PHP Linting (Pint) --------- Co-authored-by: rawilk <[email protected]>
1 parent bbdda64 commit 2f913ce

File tree

5 files changed

+7
-29
lines changed

5 files changed

+7
-29
lines changed

.github/workflows/run-tests.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@ jobs:
1515
fail-fast: true
1616
matrix:
1717
php: [8.1]
18-
laravel: [9.*, 8.*]
18+
laravel: [10.*, 9.*, 8.*]
1919
stability: [prefer-lowest, prefer-stable]
2020
include:
21+
- laravel: 10.*
22+
testbench: 8.*
2123
- laravel: 9.*
2224
testbench: 7.*
2325
- laravel: 8.*

composer.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@
2424
"require": {
2525
"php": "^8.0|^8.1",
2626
"guzzlehttp/guzzle": "^7.5",
27-
"illuminate/support": "^8.0|^9.0",
27+
"illuminate/support": "^8.0|^9.0|^10.0",
2828
"mike42/escpos-php": "^4.0",
2929
"spatie/laravel-package-tools": "^1.2|^1.13"
3030
},
3131
"require-dev": {
32-
"laravel/pint": "^1.2",
32+
"laravel/pint": "^1.5",
3333
"mockery/mockery": ">=1.4",
34-
"orchestra/testbench": "^6.0|^7.0",
34+
"orchestra/testbench": "^6.0|^7.0|^8.0",
3535
"pestphp/pest": "^1.20",
3636
"pestphp/pest-plugin-parallel": "^1.0",
3737
"php-http/socket-client": "^2.1",
@@ -57,7 +57,7 @@
5757
"@php ./vendor/bin/testbench package:discover --ansi"
5858
],
5959
"test": "vendor/bin/pest -p",
60-
"format": "vendor/bin/pint"
60+
"format": "vendor/bin/pint --dirty"
6161
},
6262
"config": {
6363
"sort-packages": true,

src/Drivers/Cups/Entity/Printer.php

-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ public function trays(): array
7373
* - Possible Params:
7474
* -- limit => int
7575
* -- status => 'completed', 'not-completed'
76-
* @return \Illuminate\Support\Collection
7776
*/
7877
public function jobs(array $params = []): Collection
7978
{

src/Drivers/PrintNode/PrintNode.php

-13
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,6 @@ public function printer($printerId = null): null|Printer
4343
}
4444

4545
/**
46-
* @param int|null $limit
47-
* @param int|null $offset
48-
* @param string|null $dir
4946
* @return \Illuminate\Support\Collection<int, RawilkPrinter>
5047
*/
5148
public function printers(?int $limit = null, ?int $offset = null, ?string $dir = null): Collection
@@ -68,9 +65,6 @@ public function printJob($jobId = null): ?PrintJob
6865
}
6966

7067
/**
71-
* @param int|null $limit
72-
* @param int|null $offset
73-
* @param string|null $dir
7468
* @return \Illuminate\Support\Collection<int, \Rawilk\Printing\Contracts\PrintJob>
7569
*/
7670
public function printJobs(?int $limit = null, ?int $offset = null, ?string $dir = null): Collection
@@ -81,13 +75,6 @@ public function printJobs(?int $limit = null, ?int $offset = null, ?string $dir
8175
->map(fn (PrintNodePrintJob $j) => new RawilkPrintJob($j));
8276
}
8377

84-
/**
85-
* @param $printerId
86-
* @param int|null $limit
87-
* @param int|null $offset
88-
* @param string|null $dir
89-
* @return \Illuminate\Support\Collection
90-
*/
9178
public function printerPrintJobs($printerId, ?int $limit = null, ?int $offset = null, ?string $dir = null): Collection
9279
{
9380
return $this->api

src/Printing.php

-10
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,6 @@ public function printer($printerId = null): ?Printer
5959
}
6060

6161
/**
62-
* @param int|null $limit
63-
* @param int|null $offset
64-
* @param string|null $dir
6562
* @return \Illuminate\Support\Collection<int, \Rawilk\Printing\Contracts\Printer>
6663
*/
6764
public function printers(?int $limit = null, ?int $offset = null, ?string $dir = null): Collection
@@ -78,9 +75,6 @@ public function printers(?int $limit = null, ?int $offset = null, ?string $dir =
7875
}
7976

8077
/**
81-
* @param int|null $limit
82-
* @param int|null $offset
83-
* @param string|null $dir
8478
* @return \Illuminate\Support\Collection<int, \Rawilk\Printing\Contracts\PrintJob>
8579
*/
8680
public function printJobs(?int $limit = null, ?int $offset = null, ?string $dir = null): Collection
@@ -110,10 +104,6 @@ public function printJob($jobId = null): ?PrintJob
110104
}
111105

112106
/**
113-
* @param $printerId
114-
* @param int|null $limit
115-
* @param int|null $offset
116-
* @param string|null $dir
117107
* @return \Illuminate\Support\Collection<int, \Rawilk\Printing\Contracts\PrintJob>
118108
*/
119109
public function printerPrintJobs($printerId, ?int $limit = null, ?int $offset = null, ?string $dir = null): Collection

0 commit comments

Comments
 (0)