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.

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

SEC-505 Add php 8.3 support #58

Merged
merged 7 commits into from
Feb 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/run-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ jobs:
strategy:
fail-fast: true
matrix:
os: [ubuntu-20.04]
php: [7.4, 8.0, 8.1]
os: [ubuntu-22.04]
php: [8.1, 8.2, 8.3]

name: PHP ${{ matrix.php }} on ${{ matrix.os }}

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: Static analysis
jobs:
phpstan:
name: PHPStan
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- name: Checkout code
Expand All @@ -19,14 +19,14 @@ jobs:
tools: phpstan:1.4.10

- name: Download dependencies
uses: ramsey/composer-install@v1
uses: ramsey/composer-install@v2

- name: PHPStan
run: phpstan analyze

psalm:
name: Psalm
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Checkout code
uses: actions/checkout@v2
Expand All @@ -40,7 +40,7 @@ jobs:
tools: vimeo/psalm:4.22.0

- name: Download dependencies
uses: ramsey/composer-install@v1
uses: ramsey/composer-install@v2

- name: Psalm
run: psalm --no-progress --output-format=github
4 changes: 2 additions & 2 deletions .github/workflows/style-checker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '7.4'
php-version: '8.1'

- name: Cache Dependencies
id: composer-cache-style
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: vendor
key: ubuntu-composer-cache-style-${{ hashFiles('**/composer.lock') }}
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ $ composer require ellipsesynergie/api-response

The following versions of PHP are supported by this version:

>= PHP 7.4
>= PHP 8.1

### Install in Laravel
Add this following service provider to your `config/app.php` file.
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
}
],
"require": {
"php": ">=7.4",
"php": ">=8.1",
"league/fractal": "~0.20.1"
},
"require-dev": {
Expand Down
16 changes: 8 additions & 8 deletions src/AbstractResponse.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* file that was distributed with this source code.
*
* @package EllipseSynergie\ApiResponse
* @author Maxime Beaudoin <maxime.beaudoin@ellipse-synergie.com>
* @author Maxime Beaudoin <maxime.beaudoin@optania.com>
* @author Phil Sturgeon <[email protected]>
*/
abstract class AbstractResponse implements Response
Expand All @@ -41,22 +41,22 @@ abstract class AbstractResponse implements Response
/**
* Fractal manager
*
* @var \League\Fractal\Manager
* @var Manager
*/
protected $manager;

/**
* @param \League\Fractal\Manager $manager
* @param Manager $manager
*/
public function __construct(Manager $manager)
{
$this->manager = $manager;
}

/**
* @return \League\Fractal\Manager
* @return Manager
*/
public function getManager()
public function getManager(): Manager
{
return $this->manager;
}
Expand All @@ -66,7 +66,7 @@ public function getManager()
*
* @return int
*/
public function getStatusCode()
public function getStatusCode(): int
{
return $this->statusCode;
}
Expand All @@ -75,9 +75,9 @@ public function getStatusCode()
* Setter for status code
*
* @param int $statusCode
* @return \EllipseSynergie\ApiResponse\AbstractResponse
* @return AbstractResponse
*/
public function setStatusCode($statusCode)
public function setStatusCode($statusCode): AbstractResponse
{
$this->statusCode = $statusCode;
return $this;
Expand Down
2 changes: 1 addition & 1 deletion src/Contracts/Response.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* file that was distributed with this source code.
*
* @package EllipseSynergie\ApiResponse\Contracts
* @author Maxime Beaudoin <maxime.beaudoin@ellipse-synergie.com>
* @author Maxime Beaudoin <maxime.beaudoin@optania.com>
*/
interface Response
{
Expand Down
2 changes: 1 addition & 1 deletion src/Laravel/LumenServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* file that was distributed with this source code.
*
* @package EllipseSynergie\ApiResponse\Laravel
* @author Maxime Beaudoin <maxime.beaudoin@ellipse-synergie.com>
* @author Maxime Beaudoin <maxime.beaudoin@optania.com>
*/
class LumenServiceProvider extends ServiceProvider
{
Expand Down
2 changes: 1 addition & 1 deletion src/Laravel/Response.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* file that was distributed with this source code.
*
* @package EllipseSynergie\ApiResponse\Laravel
* @author Maxime Beaudoin <maxime.beaudoin@ellipse-synergie.com>
* @author Maxime Beaudoin <maxime.beaudoin@optania.com>
*/
class Response extends AbstractResponse
{
Expand Down
2 changes: 1 addition & 1 deletion src/Laravel/ResponseServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* file that was distributed with this source code.
*
* @package EllipseSynergie\ApiResponse\Laravel
* @author Maxime Beaudoin <maxime.beaudoin@ellipse-synergie.com>
* @author Maxime Beaudoin <maxime.beaudoin@optania.com>
*/
class ResponseServiceProvider extends ServiceProvider
{
Expand Down
2 changes: 1 addition & 1 deletion src/Serializer/Serializer.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
/**
* Class Serializer
* @package EllipseSynergie\ApiResponse\Serializer
* @author Maxime Beaudoin <maxime.beaudoin@ellipse-synergie.com>
* @author Maxime Beaudoin <maxime.beaudoin@optania.com>
*/
class Serializer extends ArraySerializer
{
Expand Down
2 changes: 1 addition & 1 deletion src/Testing/Laravel/AddTestingSupportForInclude.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
/**
* Class AddTestingSupportForInclude
* @package EllipseSynergie\ApiResponse\Testing\Laravel
* @author Maxime Beaudoin <maxime.beaudoin@ellipse-synergie.com>
* @author Maxime Beaudoin <maxime.beaudoin@optania.com>
*/
trait AddTestingSupportForInclude
{
Expand Down
Loading