Skip to content

Commit

Permalink
Merge pull request #608 from Chris53897/feature/improve-ci
Browse files Browse the repository at this point in the history
chore: fix ci deprecations
  • Loading branch information
phil-davis authored Feb 7, 2023
2 parents 5f6665f + 375a242 commit fbf79a4
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
code-analysis: 'yes'
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Setup PHP, with composer and extensions
uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
Expand All @@ -33,10 +33,10 @@ jobs:

- name: Get composer cache directory
id: composer-cache
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT

- name: Cache composer dependencies
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ${{ steps.composer-cache.outputs.dir }}
# Use composer.json for key, if composer.lock is not committed.
Expand All @@ -59,5 +59,5 @@ jobs:
run: vendor/bin/phpunit --configuration tests/phpunit.xml --coverage-clover clover.xml

- name: Code Coverage
uses: codecov/codecov-action@v2
uses: codecov/codecov-action@v3
if: matrix.coverage != 'none'
3 changes: 1 addition & 2 deletions lib/Component.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

namespace Sabre\VObject;

use ReturnTypeWillChange;
use Sabre\VObject;
use Sabre\Xml;

Expand Down Expand Up @@ -324,7 +323,7 @@ function ($a, $b) use ($sortScore, $tmp): int {
* This method returns an array, with the representation as it should be
* encoded in JSON. This is used to create jCard or jCal documents.
*/
#[ReturnTypeWillChange]
#[\ReturnTypeWillChange]
public function jsonSerialize(): array
{
$components = [];
Expand Down
2 changes: 1 addition & 1 deletion lib/Parser/MimeDir.php
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,7 @@ function ($matches) {

// @codeCoverageIgnoreStart
}
// @codeCoverageIgnoreEnd
// @codeCoverageIgnoreEnd
},
$input
);
Expand Down

0 comments on commit fbf79a4

Please sign in to comment.