Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use illuminate collections to support Laravel 11 #83

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Use illuminate collections to support Laravel 11 #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d2c1658
Use illuminate collections to support Laravel 11
jacobdekeizer Jun 4, 2024
e663634
Use illuminate collections in the unit tests
jacobdekeizer Dec 30, 2024
4e63c01
Update github workflow and php requirement
jacobdekeizer Dec 30, 2024
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/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
strategy:
fail-fast: true
matrix:
php: [8.0, 7.4, 7.3, 7.2]
php: [8.2, 8.3, 8.4]
stability: [prefer-lowest, prefer-stable]

name: PHP ${{ matrix.php }} - ${{ matrix.stability }}
Expand Down
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
}
],
"require": {
"php": "^7.2 || ^8.0",
"php": "^8.2",
"ext-json": "*",
"composer/ca-bundle": "^1.2",
"guzzlehttp/guzzle": "^6.4 || ^7.1",
"lcobucci/jwt": "^3.4 || ^4.0",
"ramsey/uuid": "^4.0",
"tightenco/collect": "^5.8 || ^6.0 || ^7.0 || ^8.0"
"illuminate/collections": "^11.0"
},
"require-dev": {
"phpunit/phpunit": "^8.0 || ^9.4",
Expand Down
2 changes: 1 addition & 1 deletion src/Endpoints/ServicePoints.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

namespace Mvdnbrk\DhlParcel\Endpoints;

use Illuminate\Support\Collection;
use Mvdnbrk\DhlParcel\Resources\ServicePoint as ServicePointResource;
use Mvdnbrk\DhlParcel\Support\Str;
use Tightenco\Collect\Support\Collection;

class ServicePoints extends BaseEndpoint
{
Expand Down
2 changes: 1 addition & 1 deletion src/Resources/PiecesCollection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Mvdnbrk\DhlParcel\Resources;

use Tightenco\Collect\Support\Collection;
use Illuminate\Support\Collection;

class PiecesCollection extends Collection
{
Expand Down
4 changes: 2 additions & 2 deletions src/Resources/Shipment.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Mvdnbrk\DhlParcel\Resources;

use Tightenco\Collect\Support\Collection;
use Illuminate\Support\Collection;

class Shipment extends BaseResource
{
Expand All @@ -15,7 +15,7 @@ class Shipment extends BaseResource
/** @var string */
public $label_id;

/** @var \Tightenco\Collect\Support\Collection */
/** @var Collection */
public $pieces;

public function __construct(array $attributes = [])
Expand Down
2 changes: 1 addition & 1 deletion tests/Feature/Endpoints/ServicePointsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

namespace Mvdnbrk\DhlParcel\Tests\Feature\Endpoints;

use Illuminate\Support\Collection;
use Mvdnbrk\DhlParcel\Endpoints\ServicePoints;
use Mvdnbrk\DhlParcel\Resources\ServicePoint as ServicePointResource;
use Mvdnbrk\DhlParcel\Tests\TestCase;
use Tightenco\Collect\Support\Collection;

/** @group integration */
class ServicePointsTest extends TestCase
Expand Down
2 changes: 1 addition & 1 deletion tests/Unit/Resources/ShipmentTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

namespace Mvdnbrk\DhlParcel\Tests\Unit\Resources;

use Illuminate\Support\Collection;
use Mvdnbrk\DhlParcel\Resources\Shipment;
use Mvdnbrk\DhlParcel\Tests\TestCase;
use Tightenco\Collect\Support\Collection;

class ShipmentTest extends TestCase
{
Expand Down
Loading