Skip to content

Commit 01e36f1

Browse files
committed
Deleted unused code
- Fixed to test Sf ^3, ^4 and ^5
1 parent 41c0081 commit 01e36f1

File tree

6 files changed

+73
-632
lines changed

6 files changed

+73
-632
lines changed

.circleci/config.yml

+21-4
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,30 @@ version: 2
22
jobs:
33
build:
44
docker:
5-
- image: circleci/php:7.1-cli
5+
- image: circleci/php:7.2-cli
66

77
working_directory: ~/project
88
steps:
99
- checkout
10+
11+
- run:
12+
name: Install PHPUnit
13+
command: |
14+
composer require phpunit/phpunit:7.5.17 --prefer-dist --prefer-stable --prefer-lowest --no-suggest
15+
16+
- run:
17+
name: Run tests / Symfony 3^3
18+
command: |
19+
php vendor/bin/phpunit
20+
21+
- run:
22+
name: Run tests / Symfony 4^3
23+
command: |
24+
composer update -n --prefer-dist --prefer-stable --no-suggest
25+
php vendor/bin/phpunit
26+
1027
- run:
11-
name: Run tests
28+
name: Run tests / Symfony 5^0
1229
command: |
13-
composer install -n --prefer-dist --no-suggest
14-
composer test
30+
composer update -n --prefer-dist --no-suggest
31+
php vendor/bin/phpunit

Http/AsyncTestClient.php

-119
This file was deleted.

Transformer/ItemTransformed.php

+21-3
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,30 @@
1616
namespace Apisearch\Transformer;
1717

1818
use Apisearch\Model\Item;
19-
use Symfony\Component\EventDispatcher\Event;
19+
use Symfony\Contracts\EventDispatcher\Event as ContractEvent;
20+
use Symfony\Component\EventDispatcher\Event as ComponentEvent;
2021

2122
/**
22-
* Class ItemTransformed.
23+
* This code adds usability with Symfony 3.4 -> 5.0
2324
*/
24-
class ItemTransformed extends Event
25+
if (class_exists("Symfony\Contracts\EventDispatcher\Event")) {
26+
27+
/**
28+
* Class BaseTransformed.
29+
*/
30+
class BaseTransformed extends ContractEvent {}
31+
} else {
32+
33+
/**
34+
* Class BaseTransformed.
35+
*/
36+
class BaseTransformed extends ComponentEvent {}
37+
}
38+
39+
/**
40+
* Class ItemTransformed
41+
*/
42+
class ItemTransformed extends BaseTransformed
2543
{
2644
/**
2745
* @var Item

Transformer/Transformer.php

+24-9
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
use Apisearch\Model\Item;
1919
use Apisearch\Model\ItemUUID;
2020
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
21+
use Symfony\Contracts\EventDispatcher\EventDispatcherInterface as ContractsEventDispatcherInterface;
2122

2223
/**
2324
* Class Transformer.
@@ -142,15 +143,29 @@ public function toItem($object): ? Item
142143
foreach ($this->writeTransformers as $writeTransformer) {
143144
if ($writeTransformer->isValidObject($object)) {
144145
$item = $writeTransformer->toItem($object);
145-
$this
146-
->eventDispatcher
147-
->dispatch(
148-
'apisearch.item_transformed',
149-
new ItemTransformed(
150-
$item,
151-
$object
152-
)
153-
);
146+
147+
if ($this->eventDispatcher instanceof ContractsEventDispatcherInterface) {
148+
$this
149+
->eventDispatcher
150+
->dispatch(
151+
new ItemTransformed(
152+
$item,
153+
$object
154+
),
155+
'apisearch.item_transformed'
156+
);
157+
} else {
158+
$this
159+
->eventDispatcher
160+
->dispatch(
161+
'apisearch.item_transformed',
162+
new ItemTransformed(
163+
$item,
164+
$object
165+
)
166+
);
167+
}
168+
154169

155170
return $item;
156171
}

0 commit comments

Comments
 (0)