From ef16eb95832bb2cc24c341370df04be66d87ecf1 Mon Sep 17 00:00:00 2001 From: "Christopher C. Wells" Date: Thu, 4 Mar 2021 21:57:57 -0800 Subject: [PATCH] Remove TNTSearch --- _ide_helper.php | 22 ------- composer.json | 4 +- composer.lock | 150 +----------------------------------------------- config/app.php | 1 - 4 files changed, 3 insertions(+), 174 deletions(-) diff --git a/_ide_helper.php b/_ide_helper.php index 1d05ee7..2288cce 100644 --- a/_ide_helper.php +++ b/_ide_helper.php @@ -14947,28 +14947,6 @@ } -} - - namespace Laravel\Scout { - /** - * - * - */ - class Builder { - /** - * - * - * @see \TeamTNT\Scout\TNTSearchScoutServiceProvider::boot() - * @param mixed $constraints - * @static - */ - public static function constrain($constraints) - { - return \Laravel\Scout\Builder::constrain($constraints); - } - - } - } diff --git a/composer.json b/composer.json index 4f56865..b80682b 100644 --- a/composer.json +++ b/composer.json @@ -14,10 +14,10 @@ "fruitcake/laravel-cors": "^2.0", "guzzlehttp/guzzle": "^7.0.1", "laravel/framework": "^8.12", + "laravel/scout": "^8.6", "laravel/tinker": "^2.5", "phospr/fraction": "^1.2", - "spatie/laravel-tags": "^3.0", - "teamtnt/laravel-scout-tntsearch-driver": "^11.1" + "spatie/laravel-tags": "^3.0" }, "require-dev": { "barryvdh/laravel-ide-helper": "^2.9", diff --git a/composer.lock b/composer.lock index 917d801..bdb7d2b 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "3de6fe1cdf3b3dc2e2eafa5756bd52cd", + "content-hash": "7ceaed365c3962d66d301ae612a52e9f", "packages": [ { "name": "asm89/stack-cors", @@ -6071,154 +6071,6 @@ ], "time": "2020-12-16T17:02:19+00:00" }, - { - "name": "teamtnt/laravel-scout-tntsearch-driver", - "version": "v11.1.0", - "source": { - "type": "git", - "url": "https://github.com/teamtnt/laravel-scout-tntsearch-driver.git", - "reference": "a9c27a68dc2bd74fb354165633520de95708215d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/teamtnt/laravel-scout-tntsearch-driver/zipball/a9c27a68dc2bd74fb354165633520de95708215d", - "reference": "a9c27a68dc2bd74fb354165633520de95708215d", - "shasum": "" - }, - "require": { - "illuminate/bus": "~5.4|^6.0|^7.0|^8.0", - "illuminate/contracts": "~5.4|^6.0|^7.0|^8.0", - "illuminate/database": "~5.4|^6.0|^7.0|^8.0", - "illuminate/pagination": "~5.4|^6.0|^7.0|^8.0", - "illuminate/queue": "~5.4|^6.0|^7.0|^8.0", - "illuminate/support": "~5.4|^6.0|^7.0|^8.0", - "laravel/scout": "7.*|^8.0|^8.3", - "php": ">=7.1", - "teamtnt/tntsearch": "2.*" - }, - "require-dev": { - "mockery/mockery": "^1.0", - "phpunit/phpunit": "^8.0|^9.3" - }, - "suggest": { - "teamtnt/tntsearch": "Required to use the TNTSearch engine." - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - }, - "laravel": { - "providers": [ - "TeamTNT\\Scout\\TNTSearchScoutServiceProvider" - ] - } - }, - "autoload": { - "psr-4": { - "TeamTNT\\Scout\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "TNT Studio", - "email": "info@tntstudio.hr" - } - ], - "description": "Driver for Laravel Scout search package based on https://github.com/teamtnt/tntsearch", - "keywords": [ - "laravel", - "scout", - "search", - "tntsearch" - ], - "support": { - "issues": "https://github.com/teamtnt/laravel-scout-tntsearch-driver/issues", - "source": "https://github.com/teamtnt/laravel-scout-tntsearch-driver/tree/v11.1.0" - }, - "time": "2020-11-11T11:17:48+00:00" - }, - { - "name": "teamtnt/tntsearch", - "version": "v2.6.0", - "source": { - "type": "git", - "url": "https://github.com/teamtnt/tntsearch.git", - "reference": "d9b2d764491c87f03ec214ed8dbc27336cf0c0e4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/teamtnt/tntsearch/zipball/d9b2d764491c87f03ec214ed8dbc27336cf0c0e4", - "reference": "d9b2d764491c87f03ec214ed8dbc27336cf0c0e4", - "shasum": "" - }, - "require": { - "ext-mbstring": "*", - "ext-pdo_sqlite": "*", - "ext-sqlite3": "*", - "php": "~7.1|^8" - }, - "require-dev": { - "phpunit/phpunit": "7.*" - }, - "type": "library", - "autoload": { - "psr-4": { - "TeamTNT\\TNTSearch\\": "src" - }, - "files": [ - "helper/helpers.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nenad Tičarić", - "email": "nticaric@gmail.com", - "homepage": "http://www.tntstudio.us", - "role": "Developer" - } - ], - "description": "A fully featured full text search engine written in PHP", - "homepage": "https://github.com/teamtnt/tntsearch", - "keywords": [ - "Fuzzy search", - "bm25", - "fulltext", - "geosearch", - "search", - "stemming", - "teamtnt", - "text classification", - "tntsearch" - ], - "support": { - "issues": "https://github.com/teamtnt/tntsearch/issues", - "source": "https://github.com/teamtnt/tntsearch/tree/v2.6.0" - }, - "funding": [ - { - "url": "https://ko-fi.com/nticaric", - "type": "ko_fi" - }, - { - "url": "https://opencollective.com/tntsearch", - "type": "open_collective" - }, - { - "url": "https://www.patreon.com/nticaric", - "type": "patreon" - } - ], - "time": "2020-12-21T09:11:54+00:00" - }, { "name": "tijsverkoyen/css-to-inline-styles", "version": "2.2.3", diff --git a/config/app.php b/config/app.php index e4b23ab..de9f718 100644 --- a/config/app.php +++ b/config/app.php @@ -166,7 +166,6 @@ return [ * Package Service Providers... */ Laravel\Scout\ScoutServiceProvider::class, - TeamTNT\Scout\TNTSearchScoutServiceProvider::class, /* * Application Service Providers...