diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e7cfa3f..974c34d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,13 +9,13 @@ on: jobs: tests: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 strategy: fail-fast: false matrix: stability: [prefer-stable] - versions: [ { php: 8.1, laravel: 10 }, { php: 8.2, laravel: 10 }, { php: 8.3, laravel: 10 }, { php: 8.2, laravel: 11 }, { php: 8.3, laravel: 11 } ] + versions: [ { php: 8.1, laravel: 10 }, { php: 8.2, laravel: 10 }, { php: 8.3, laravel: 10 }, { php: 8.4, laravel: 10 }, { php: 8.2, laravel: 11 }, { php: 8.3, laravel: 11 }, { php: 8.4, laravel: 11 } ] name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} diff --git a/composer.json b/composer.json index 68bbd3b..e8afbbe 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ "php": "^8.0", "illuminate/routing": "^9.0|^10.0|^11.0", "illuminate/support": "^9.0|^10.0|^11.0", - "league/fractal": "^0.20" + "php-open-source-saver/fractal": "^0.20" }, "require-dev": { "friendsofphp/php-cs-fixer": "~3", diff --git a/src/Transformer/Adapter/Fractal.php b/src/Transformer/Adapter/Fractal.php index 7ccf620..4ed10ca 100644 --- a/src/Transformer/Adapter/Fractal.php +++ b/src/Transformer/Adapter/Fractal.php @@ -4,13 +4,13 @@ use Dingo\Api\Http\Request; use Dingo\Api\Transformer\Binding; -use League\Fractal\TransformerAbstract; +use PHPOpenSourceSaver\Fractal\TransformerAbstract; use Dingo\Api\Contract\Transformer\Adapter; -use League\Fractal\Manager as FractalManager; -use League\Fractal\Resource\Item as FractalItem; -use League\Fractal\Pagination\IlluminatePaginatorAdapter; +use PHPOpenSourceSaver\Fractal\Manager as FractalManager; +use PHPOpenSourceSaver\Fractal\Resource\Item as FractalItem; +use PHPOpenSourceSaver\Fractal\Pagination\IlluminatePaginatorAdapter; use Illuminate\Support\Collection as IlluminateCollection; -use League\Fractal\Resource\Collection as FractalCollection; +use PHPOpenSourceSaver\Fractal\Resource\Collection as FractalCollection; use Illuminate\Database\Eloquent\Collection as EloquentCollection; use Illuminate\Contracts\Pagination\Paginator as IlluminatePaginator; @@ -19,7 +19,7 @@ class Fractal implements Adapter /** * Fractal manager instance. * - * @var \League\Fractal\Manager + * @var \PHPOpenSourceSaver\Fractal\Manager */ protected $fractal; @@ -47,7 +47,7 @@ class Fractal implements Adapter /** * Create a new fractal transformer instance. * - * @param \League\Fractal\Manager $fractal + * @param \PHPOpenSourceSaver\Fractal\Manager $fractal * @param string $includeKey * @param string $includeSeparator * @param bool $eagerLoading @@ -65,7 +65,7 @@ public function __construct(FractalManager $fractal, $includeKey = 'include', $i * Transform a response with a transformer. * * @param mixed $response - * @param League\Fractal\TransformerAbstract|object $transformer + * @param PHPOpenSourceSaver\Fractal\TransformerAbstract|object $transformer * @param \Dingo\Api\Transformer\Binding $binding * @param \Dingo\Api\Http\Request $request * @return array @@ -127,7 +127,7 @@ protected function shouldEagerLoad($response) * Create the Fractal paginator adapter. * * @param \Illuminate\Contracts\Pagination\Paginator $paginator - * @return \League\Fractal\Pagination\IlluminatePaginatorAdapter + * @return \PHPOpenSourceSaver\Fractal\Pagination\IlluminatePaginatorAdapter */ protected function createPaginatorAdapter(IlluminatePaginator $paginator) { @@ -138,9 +138,9 @@ protected function createPaginatorAdapter(IlluminatePaginator $paginator) * Create a Fractal resource instance. * * @param mixed $response - * @param \League\Fractal\TransformerAbstract $transformer + * @param \PHPOpenSourceSaver\Fractal\TransformerAbstract $transformer * @param array $parameters - * @return \League\Fractal\Resource\Item|\League\Fractal\Resource\Collection + * @return \PHPOpenSourceSaver\Fractal\Resource\Item|\PHPOpenSourceSaver\Fractal\Resource\Collection */ protected function createResource($response, $transformer, array $parameters) { @@ -173,7 +173,7 @@ public function parseFractalIncludes(Request $request) /** * Get the underlying Fractal instance. * - * @return \League\Fractal\Manager + * @return \PHPOpenSourceSaver\Fractal\Manager */ public function getFractal() { @@ -183,7 +183,7 @@ public function getFractal() /** * Get includes as their array keys for eager loading. * - * @param \League\Fractal\TransformerAbstract $transformer + * @param \PHPOpenSourceSaver\Fractal\TransformerAbstract $transformer * @param string|array $requestedIncludes * @return array */ diff --git a/tests/Http/Response/FactoryTest.php b/tests/Http/Response/FactoryTest.php index 35fc2d9..d113f89 100644 --- a/tests/Http/Response/FactoryTest.php +++ b/tests/Http/Response/FactoryTest.php @@ -9,8 +9,8 @@ use Dingo\Api\Transformer\Factory as TransformerFactory; use Illuminate\Pagination\Paginator; use Illuminate\Support\Collection; -use League\Fractal\Manager; -use League\Fractal\Resource\Item; +use PHPOpenSourceSaver\Fractal\Manager; +use PHPOpenSourceSaver\Fractal\Resource\Item; use Mockery; use Symfony\Component\HttpKernel\Exception\HttpException; @@ -93,11 +93,11 @@ public function testMakingCollectionResponseWithThreeParameters() })); $this->assertInstanceOf(Collection::class, $this->factory->collection(new Collection([new UserStub('Jason')]), 'test', function ($resource, $fractal) { - $this->assertInstanceOf(\League\Fractal\Resource\Collection::class, $resource); + $this->assertInstanceOf(\PHPOpenSourceSaver\Fractal\Resource\Collection::class, $resource); $this->assertInstanceOf(Manager::class, $fractal); })->getOriginalContent()); $this->assertInstanceOf(Collection::class, $this->factory->withCollection(new Collection([new UserStub('Jason')]), 'test', function ($resource, $fractal) { - $this->assertInstanceOf(\League\Fractal\Resource\Collection::class, $resource); + $this->assertInstanceOf(\PHPOpenSourceSaver\Fractal\Resource\Collection::class, $resource); $this->assertInstanceOf(Manager::class, $fractal); })->getOriginalContent()); } diff --git a/tests/Transformer/Adapter/FractalTest.php b/tests/Transformer/Adapter/FractalTest.php index f6bde17..d7a31df 100644 --- a/tests/Transformer/Adapter/FractalTest.php +++ b/tests/Transformer/Adapter/FractalTest.php @@ -5,7 +5,7 @@ use Dingo\Api\Http\Request; use Dingo\Api\Tests\BaseTestCase; use Dingo\Api\Transformer\Adapter\Fractal; -use League\Fractal\Manager as FractalManager; +use PHPOpenSourceSaver\Fractal\Manager as FractalManager; class FractalTest extends BaseTestCase {