add support for php above 7.0, update dependencies, remove becklyn/in…

…terfaces
Becklyn · Jan 12, 2023 · 8ed91a7 · 8ed91a7
1 parent 09931fc
commit 8ed91a7
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 18 deletions.
diff --git a/Command/SearchCommand.php b/Command/SearchCommand.php
@@ -2,7 +2,7 @@
 
 namespace Becklyn\SearchBundle\Command;
 
-use Becklyn\Interfaces\LanguageInterface;
+use Becklyn\SearchBundle\Entity\LanguageInterface;
 use Becklyn\SearchBundle\Search\Result\EntitySearchHits;
 use Becklyn\SearchBundle\Search\Result\SearchHit;
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;

diff --git a/Elasticsearch/Request/SearchRequest.php b/Elasticsearch/Request/SearchRequest.php
@@ -2,9 +2,9 @@
 
 namespace Becklyn\SearchBundle\Elasticsearch\Request;
 
-use Becklyn\Interfaces\LanguageInterface;
 use Becklyn\SearchBundle\Elasticsearch\ElasticsearchClient;
 use Becklyn\SearchBundle\Elasticsearch\ElasticsearchRequest;
+use Becklyn\SearchBundle\Entity\LanguageInterface;
 use Becklyn\SearchBundle\Metadata\SearchItem;
 
 

diff --git a/Entity/LanguageInterface.php b/Entity/LanguageInterface.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Becklyn\SearchBundle\Entity;
+
+/**
+ * A common interface for defining a language
+ */
+interface LanguageInterface
+{
+    /**
+     * Returns the name of the language
+     *
+     * @return string
+     */
+    public function getName () : string;
+
+
+
+    /**
+     * Returns the ISO short code of the language
+     *
+     * @return string
+     */
+    public function getCode () : string;
+}
diff --git a/Entity/LocalizedSearchableEntityInterface.php b/Entity/LocalizedSearchableEntityInterface.php
@@ -2,8 +2,6 @@
 
 namespace Becklyn\SearchBundle\Entity;
 
-use Becklyn\Interfaces\LanguageInterface;
-
 
 /**
  * Describes searchable entities, that are localized

diff --git a/README.md b/README.md
@@ -39,9 +39,7 @@ class SomeEntity implements SearchableEntityInterface
 For localized entities, mark the class and implement the `LocalizedSearchableEntityInterface` interface:
 
 ```php
-use Becklyn\Interfaces\LanguageInterface;
-use Becklyn\SearchBundle\Entity\LocalizedSearchableEntityInterface;
-use Becklyn\SearchBundle\Mapping as Search;
+use Becklyn\SearchBundle\Entity\LanguageInterface;use Becklyn\SearchBundle\Entity\LocalizedSearchableEntityInterface;use Becklyn\SearchBundle\Mapping as Search;
 
 /**
  * @Search\Item(
@@ -61,8 +59,6 @@ class LocalizedSomeEntity implements LocalizedSearchableEntityInterface
 }
 ```
 
-Note: you will need the `LanguageInterface` from the [`becklyn/interfaces`](https://github.com/Becklyn/Interfaces) package.
-
 #### `@Search\Item()` annotation
 
 ```php

diff --git a/Search/Result/EntitySearchHits.php b/Search/Result/EntitySearchHits.php
@@ -2,8 +2,6 @@
 
 namespace Becklyn\SearchBundle\Search\Result;
 
-use Becklyn\Interfaces\LanguageInterface;
-
 
 /**
  * A list of all search hits for a specific entity

diff --git a/Search/SearchClient.php b/Search/SearchClient.php
@@ -2,13 +2,12 @@
 
 namespace Becklyn\SearchBundle\Search;
 
-use Becklyn\Interfaces\LanguageInterface;
 use Becklyn\SearchBundle\Elasticsearch\ElasticsearchClient;
 use Becklyn\SearchBundle\Elasticsearch\Request\SearchRequest;
+use Becklyn\SearchBundle\Entity\LanguageInterface;
 use Becklyn\SearchBundle\Exception\MissingLanguageException;
 use Becklyn\SearchBundle\Index\Configuration\LanguageConfiguration;
 use Becklyn\SearchBundle\Loader\EntityLoader;
-use Becklyn\SearchBundle\Metadata\Metadata;
 use Becklyn\SearchBundle\Metadata\MetadataFactory;
 use Becklyn\SearchBundle\Metadata\SearchItem\SearchItemList;
 use Becklyn\SearchBundle\Search\Result\SearchHit;

diff --git a/composer.json b/composer.json
@@ -11,13 +11,12 @@
         }
     ],
     "require": {
-        "php": "^7.0",
-        "becklyn/interfaces": "^1.0",
-        "becklyn/search-text-transformer": "^1.0",
-        "doctrine/common": "^2.6",
+        "php": ">=7.0",
+        "becklyn/search-text-transformer": "^2.0",
+        "doctrine/common": "^2.6 || ^3.0",
         "doctrine/doctrine-bundle": "^1.6",
         "doctrine/orm": "^2.5",
-        "elasticsearch/elasticsearch": "^5.0",
+        "elasticsearch/elasticsearch": "^5.0 || ^8.5.0",
         "symfony/cache": "^3.0 || ^4.0",
         "symfony/console": "^3.0 || ^4.0",
         "symfony/dependency-injection": "^3.0 || ^4.0",
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,8 +2,6 @@ @@
     namespace Becklyn\SearchBundle\Entity;
-    use Becklyn\Interfaces\LanguageInterface;
     /**
      * Describes searchable entities, that are localized
@@ Expand Down @@