Skip to content

Commit

Permalink
bump everything up
Browse files Browse the repository at this point in the history
  • Loading branch information
Gummibeer committed Feb 28, 2024
1 parent 730ce88 commit 63da264
Show file tree
Hide file tree
Showing 40 changed files with 97 additions and 279 deletions.
7 changes: 2 additions & 5 deletions .github/workflows/pest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,9 @@ jobs:
strategy:
fail-fast: false
matrix:
php: [8.1, 8.0]
laravel: [^9.0, ^8.0]
php: [8.2, 8.1]
laravel: [^10.0, ^9.0, ^8.0]
dependency-version: [prefer-lowest, prefer-stable]
exclude:
- laravel: ^8.0
dependency-version: prefer-lowest

steps:
- uses: actions/checkout@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/phpcs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ jobs:
- uses: actions/checkout@v2
- uses: shivammathur/setup-php@v2
with:
php-version: 8.0
php-version: 8.1
extensions: dom, curl, mbstring, zip, pcntl, intl
coverage: none
- run: composer install --no-interaction --no-scripts
- run: vendor/bin/php-cs-fixer fix --using-cache=no --dry-run
- run: vendor/bin/pint --test
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ phpunit.xml
.phpunit.result.cache
composer.lock
vendor/
.coverage/
.coverage/
.phpunit.cache/
30 changes: 0 additions & 30 deletions .php-cs-fixer.dist.php

This file was deleted.

132 changes: 0 additions & 132 deletions .php-cs-rules.laravel.php

This file was deleted.

24 changes: 12 additions & 12 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,23 @@
"issues": "https://github.com/Astrotomic/laravel-tmdb/issues"
},
"require": {
"php": "^8.0",
"php": "^8.1",
"ext-json": "*",
"guzzlehttp/guzzle": "^6.5.5 || ^7.0.1",
"illuminate/database": "^8.0 || ^9.0",
"illuminate/http": "^8.0 || ^9.0",
"illuminate/support": "^8.0 || ^9.0",
"illuminate/database": "^8.0 || ^9.0 || ^10",
"illuminate/http": "^8.0 || ^9.0 || ^10",
"illuminate/support": "^8.0 || ^9.0 || ^10",
"nesbot/carbon": "^2.31",
"spatie/laravel-enum": "^3.0",
"spatie/laravel-translatable": "^5.0"
"spatie/laravel-translatable": "^5.0 || ^6.0"
},
"require-dev": {
"astrotomic/phpunit-assertions": "^0.6",
"friendsofphp/php-cs-fixer": "^3.0",
"infection/infection": "^0.25.2",
"orchestra/testbench": "^6.0 || ^7.0",
"pestphp/pest": "^1.21",
"pestphp/pest-plugin-laravel": "^1.2"
"astrotomic/phpunit-assertions": "^0.11",
"infection/infection": "^0.27.10",
"laravel/pint": "^1.14",
"orchestra/testbench": "^6.0 || ^7.0 || ^8.0",
"pestphp/pest": "^2",
"pestphp/pest-plugin-laravel": "^2"
},
"autoload": {
"psr-4": {
Expand Down Expand Up @@ -69,7 +69,7 @@
"@composer validate --strict --ansi --no-interaction",
"@composer thanks --ansi --no-interaction --quiet"
],
"fix": "vendor/bin/php-cs-fixer fix --using-cache=no",
"fix": "vendor/bin/pint",
"normalize": "echo 'composer global require ergebnis/composer-normalize'",
"test": "php -d memory_limit=-1 vendor/bin/pest",
"test-coverage": "XDEBUG_MODE=coverage php -d memory_limit=-1 vendor/bin/pest --coverage-html=.coverage",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

return new class () extends Migration {
return new class() extends Migration
{
public function up(): void
{
Schema::connection(Collection::connection())->create(Collection::table(), static function (Blueprint $table): void {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

return new class () extends Migration {
return new class() extends Migration
{
public function up(): void
{
Schema::connection(Movie::connection())->create(Movie::table(), static function (Blueprint $table): void {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

return new class () extends Migration {
return new class() extends Migration
{
public function up(): void
{
Schema::connection(MovieGenre::connection())->create(MovieGenre::table(), static function (Blueprint $table): void {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

return new class () extends Migration {
return new class() extends Migration
{
public function up(): void
{
Schema::connection(Movie::connection())->create('movie_movie_genre', static function (Blueprint $table): void {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

return new class () extends Migration {
return new class() extends Migration
{
public function up(): void
{
Schema::connection(Person::connection())->create(Person::table(), static function (Blueprint $table): void {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

return new class () extends Migration {
return new class() extends Migration
{
public function up(): void
{
Schema::connection(Credit::connection())->create(Credit::table(), static function (Blueprint $table): void {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

return new class () extends Migration {
return new class() extends Migration
{
public function up(): void
{
Schema::connection(WatchProvider::connection())->create(WatchProvider::table(), static function (Blueprint $table): void {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

return new class () extends Migration {
return new class() extends Migration
{
public function up(): void
{
Schema::connection(TvGenre::connection())->create(TvGenre::table(), static function (Blueprint $table): void {
Expand Down
7 changes: 4 additions & 3 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
bootstrap="vendor/autoload.php"
colors="true"
executionOrder="random"
cacheDirectory=".phpunit.cache"
>
<testsuites>
<testsuite name="Test Suite">
<directory suffix="Test.php">./tests</directory>
</testsuite>
</testsuites>
<coverage processUncoveredFiles="true">
<source>
<include>
<directory suffix=".php">./src</directory>
</include>
</coverage>
</source>
<php>
<env name="APP_ENV" value="testing"/>
<env name="DB_CONNECTION" value="sqlite"/>
Expand Down
12 changes: 4 additions & 8 deletions src/Eloquent/Builders/Builder.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,8 @@
abstract class Builder extends EloquentBuilder
{
/**
* @param int|int[]|string|string[]|\Illuminate\Contracts\Support\Arrayable $id
* @param string[] $columns
*
* @return \Astrotomic\Tmdb\Models\Model|\Illuminate\Database\Eloquent\Collection|null
* @param int|int[]|string|string[]|\Illuminate\Contracts\Support\Arrayable $id
* @param string[] $columns
*/
public function find($id, $columns = ['*']): Model|Collection|null
{
Expand All @@ -34,10 +32,8 @@ public function find($id, $columns = ['*']): Model|Collection|null
}

/**
* @param int[]|string[]|\Illuminate\Contracts\Support\Arrayable $ids
* @param string[] $columns
*
* @return \Illuminate\Database\Eloquent\Collection
* @param int[]|string[]|\Illuminate\Contracts\Support\Arrayable $ids
* @param string[] $columns
*/
public function findMany($ids, $columns = ['*']): Collection
{
Expand Down
3 changes: 1 addition & 2 deletions src/Eloquent/Builders/CreditBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ public function whereCreditType(CreditType $type): static
}

/**
* @param class-string<\Astrotomic\Tmdb\Models\Model> $model
*
* @param class-string<\Astrotomic\Tmdb\Models\Model> $model
* @return $this
*/
public function whereMediaType(string $model): static
Expand Down
Loading

0 comments on commit 63da264

Please sign in to comment.