Skip to content

Commit 5abb2f7

Browse files
authored
Merge pull request #20 from Dropelikeit/feature/use-symfony-cache-instead-of-doctrine-cache
Feature/use symfony cache instead of doctrine cache
2 parents 92e8ab0 + 8ba3b43 commit 5abb2f7

File tree

3 files changed

+9
-12
lines changed

3 files changed

+9
-12
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: "Checkout"
13-
uses: "actions/checkout@v2"
13+
uses: "actions/checkout@v3"
1414
with:
1515
fetch-depth: 2
1616

@@ -20,7 +20,7 @@ jobs:
2020
php-version: "7.4"
2121

2222
- name: "Cache composer packages"
23-
uses: "actions/cache@v2"
23+
uses: "actions/cache@v3"
2424
with:
2525
path: "~/.composer/cache"
2626
key: "php-composer-locked-${{ hashFiles('composer.lock') }}"
@@ -43,7 +43,7 @@ jobs:
4343
runs-on: ubuntu-latest
4444
steps:
4545
- name: "Checkout"
46-
uses: "actions/checkout@v2"
46+
uses: "actions/checkout@v3"
4747
with:
4848
fetch-depth: 2
4949

@@ -53,7 +53,7 @@ jobs:
5353
php-version: "8"
5454

5555
- name: "Cache composer packages"
56-
uses: "actions/cache@v2"
56+
uses: "actions/cache@v3"
5757
with:
5858
path: "~/.composer/cache"
5959
key: "php-composer-locked-${{ hashFiles('composer.lock') }}"
@@ -79,7 +79,7 @@ jobs:
7979
runs-on: ubuntu-latest
8080
steps:
8181
- name: "Checkout"
82-
uses: "actions/checkout@v2"
82+
uses: "actions/checkout@v3"
8383
with:
8484
fetch-depth: 2
8585

@@ -89,7 +89,7 @@ jobs:
8989
php-version: "8.1"
9090

9191
- name: "Cache composer packages"
92-
uses: "actions/cache@v2"
92+
uses: "actions/cache@v3"
9393
with:
9494
path: "~/.composer/cache"
9595
key: "php-composer-locked-${{ hashFiles('composer.lock') }}"

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
"illuminate/support": "^8.0|^9.0|^10.0",
1616
"illuminate/contracts": "^8.0|^9.0|^10.0",
1717
"jms/serializer": "^3.18",
18-
"doctrine/cache": "^1.10",
1918
"php": "^7.4|^8.0|^8.1"
2019
},
2120
"autoload": {
@@ -43,15 +42,16 @@
4342
"nunomaduro/larastan": "^1.0|^2.0",
4443
"orchestra/testbench": "^6.0|^7.0",
4544
"phpstan/phpstan-phpunit": "^1.1",
46-
"php-parallel-lint/php-parallel-lint": "^1.3"
45+
"php-parallel-lint/php-parallel-lint": "^1.3",
46+
"symfony/cache": "^5.4|^6.2"
4747
},
4848
"scripts": {
4949
"lint": "parallel-lint --exclude .git --exclude vendor .",
5050
"cs-check": "php-cs-fixer -v --dry-run --using-cache=no fix",
5151
"cs-fix": "php-cs-fixer --using-cache=no fix",
5252
"test": "phpunit",
5353
"test-coverage": "phpunit --coverage-clover build/logs/clover.xml",
54-
"analyze": "phpstan analyze --no-progress --memory-limit=-1",
54+
"analyze": "phpstan analyze --no-progress --memory-limit=-1 --xdebug",
5555
"update-baseline": "phpstan analyze --generate-baseline --memory-limit=-1",
5656
"check": [
5757
"@cs-check",

tests/Http/Responses/ResponseFactoryTest.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
namespace Dropelikeit\LaravelJmsSerializer\Tests\Http\Responses;
55

6-
use Doctrine\Common\Annotations\AnnotationRegistry;
76
use Dropelikeit\LaravelJmsSerializer\Config\Config;
87
use Dropelikeit\LaravelJmsSerializer\Contracts;
98
use Dropelikeit\LaravelJmsSerializer\Exception\SerializeType;
@@ -29,8 +28,6 @@ public function setUp(): void
2928
{
3029
parent::setUp();
3130

32-
AnnotationRegistry::registerLoader('class_exists');
33-
3431
$this->config = $this
3532
->getMockBuilder(Contracts\Config::class)
3633
->disableOriginalConstructor()

0 commit comments

Comments
 (0)