Merge pull request #110 from apisearch-io/feature/deleted-unused-code

Deleted unused code

Author: mmoreram

.circleci/config.yml

@@ -2,13 +2,30 @@ version: 2
 jobs:
   build:
     docker:
-      - image: circleci/php:7.1-cli
+      - image: circleci/php:7.2-cli
 
     working_directory: ~/project
     steps:
       - checkout
+
+      - run:
+          name: Install PHPUnit
+          command: |
+            composer require phpunit/phpunit:7.5.17  --prefer-dist --prefer-stable --prefer-lowest --no-suggest
+
+      - run:
+          name: Run tests / Symfony 3^3
+          command: |
+            php vendor/bin/phpunit
+
+      - run:
+          name: Run tests / Symfony 4^3
+          command: |
+            composer update -n --prefer-dist --prefer-stable --no-suggest
+            php vendor/bin/phpunit
+
       - run:
-          name: Run tests
+          name: Run tests / Symfony 5^0
           command: |
-            composer install -n --prefer-dist --no-suggest
-            composer test
+            composer update -n --prefer-dist --no-suggest
+            php vendor/bin/phpunit

Http/AsyncTestClient.php

@@ -16,12 +16,30 @@
 namespace Apisearch\Transformer;
 
 use Apisearch\Model\Item;
-use Symfony\Component\EventDispatcher\Event;
+use Symfony\Contracts\EventDispatcher\Event as ContractEvent;
+use Symfony\Component\EventDispatcher\Event as ComponentEvent;
 
 /**
- * Class ItemTransformed.
+ * This code adds usability with Symfony 3.4 -> 5.0
  */
-class ItemTransformed extends Event
+if (class_exists("Symfony\Contracts\EventDispatcher\Event")) {
+
+    /**
+     * Class BaseTransformed.
+     */
+    class BaseTransformed extends ContractEvent {}
+} else {
+
+    /**
+     * Class BaseTransformed.
+     */
+    class BaseTransformed extends ComponentEvent {}
+}
+
+/**
+ * Class ItemTransformed
+ */
+class ItemTransformed extends BaseTransformed
 {
     /**
      * @var Item

Transformer/ItemTransformed.php

@@ -18,6 +18,7 @@
 use Apisearch\Model\Item;
 use Apisearch\Model\ItemUUID;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface as ContractsEventDispatcherInterface;
 
 /**
  * Class Transformer.
@@ -142,15 +143,29 @@ public function toItem($object): ? Item
         foreach ($this->writeTransformers as $writeTransformer) {
             if ($writeTransformer->isValidObject($object)) {
                 $item = $writeTransformer->toItem($object);
-                $this
-                    ->eventDispatcher
-                    ->dispatch(
-                        'apisearch.item_transformed',
-                        new ItemTransformed(
-                            $item,
-                            $object
-                        )
-                    );
+
+                if ($this->eventDispatcher instanceof ContractsEventDispatcherInterface) {
+                    $this
+                        ->eventDispatcher
+                        ->dispatch(
+                            new ItemTransformed(
+                                $item,
+                                $object
+                            ),
+                            'apisearch.item_transformed'
+                        );
+                } else {
+                    $this
+                        ->eventDispatcher
+                        ->dispatch(
+                            'apisearch.item_transformed',
+                            new ItemTransformed(
+                                $item,
+                                $object
+                            )
+                        );
+                }
+
 
                 return $item;
             }