Skip to content

Commit 3ebf31e

Browse files
pdphilippdphilip
committed
Revert "Merge branch 'pr/38' into dev-main"
This reverts commit 5398efe, reversing changes made to 11caf29.
1 parent 5398efe commit 3ebf31e

File tree

6 files changed

+28
-3609
lines changed

6 files changed

+28
-3609
lines changed

‎.github/workflows/run-tests.yml‎

Lines changed: 13 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,13 @@
1-
name: 'Run Tests'
2-
3-
on: ['push', 'pull_request']
1+
name: run-tests
42

3+
on:
4+
push:
5+
branches:
6+
- main
7+
- github-actions
58
jobs:
6-
ci:
7-
runs-on: ${{ matrix.os }}
8-
strategy:
9-
fail-fast: true
10-
matrix:
11-
os: [ubuntu-latest]
12-
php: [8.2, 8.3]
13-
laravel: [10.*, 11.*]
14-
dependency-version: [prefer-stable]
15-
9+
test:
10+
runs-on: ubuntu-22.04
1611
env:
1712
BROADCAST_DRIVER: log
1813
CACHE_DRIVER: redis
@@ -42,40 +37,25 @@ jobs:
4237
- 6379/tcp
4338
options: --health-cmd="redis-cli ping" --health-interval=10s --health-timeout=5s --health-retries=3
4439

45-
name: Tests P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
4640
steps:
4741
- name: Checkout 🛎
4842
uses: actions/checkout@v4
4943

50-
- name: Cache dependencies 🍬
51-
uses: actions/cache@v1
52-
with:
53-
path: ~/.composer/cache/files
54-
key: dependencies-php-${{ matrix.php }}-L${{ matrix.laravel }}-${{ matrix.dependency-version }}-composer-${{ hashFiles('composer.json') }}
55-
5644
- name: Verify Elasticsearch connection 🧩
5745
run: |
5846
curl -X GET "localhost:${{ job.services.elasticsearch.ports['9200'] }}/_cluster/health?pretty=true"
5947
6048
- name: Setup PHP 🏗
6149
uses: shivammathur/setup-php@v2
6250
with:
63-
php-version: ${{ matrix.php }}
51+
php-version: 8.2
6452
tools: composer:v2
65-
coverage: none
53+
coverage: xdebug
6654
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo, mysql
6755

68-
- name: Require Laravel Version ✈
69-
run: >
70-
composer require
71-
"illuminate/support:${{ matrix.laravel }}"
72-
"illuminate/container:${{ matrix.laravel }}"
73-
"illuminate/database:${{ matrix.laravel }}"
74-
"illuminate/events:${{ matrix.laravel }}"
75-
--no-interaction --no-update
76-
77-
- name: Install Composer dependencies 💻
78-
run: composer update --${{ matrix.dependency-version }} --no-interaction --prefer-dist --optimize-autoloader
56+
- name: Install Project Dependencies 💻
57+
run: |
58+
composer install --no-interaction --prefer-dist --optimize-autoloader
7959
8060
- name: List Installed Dependencies 📦
8161
run: composer show -D

‎.github/workflows/tests-coverage.yml‎

Lines changed: 0 additions & 94 deletions
This file was deleted.

‎README.md‎

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@
33
# Laravel-Elasticsearch
44

55
[![Latest Stable Version](http://img.shields.io/github/release/pdphilip/laravel-elasticsearch.svg)](https://packagist.org/packages/pdphilip/elasticsearch)
6-
[![GitHub Tests Action Status](https://img.shields.io/github/actions/workflow/status/pdphilip/laravel-elasticsearch/run-tests.yml?branch=main&label=tests&style=flat-square)](https://github.com/pdphilip/laravel-elasticsearch/actions/workflows/run-tests.yml?query=branch%3Amain)
7-
[![Test Coverage](badge-coverage.svg)](https://packagist.org/packages/pdphilip/elasticsearchy)
6+
[![GitHub Tests Action Status](https://img.shields.io/github/actions/workflow/status/pdphilip/laravel-elasticsearch/run-tests.yml?branch=main&label=tests&style=flat-square)](https://github.com/pdphilip/laravel-elasticsearch/actions/workflows/run-tests.yml?query=branch%3Amain)
87
[![GitHub Code Style Action Status](https://img.shields.io/github/actions/workflow/status/pdphilip/laravel-elasticsearch/phpstan.yml?branch=main&label=code%20style&style=flat-square)](https://github.com/pdphilip/laravel-elasticsearch/actions/workflows/phpstan.yml?query=branch%3Amain++)
98
[![Total Downloads](http://img.shields.io/packagist/dm/pdphilip/elasticsearch.svg)](https://packagist.org/packages/pdphilip/elasticsearch)
10-
119
### Laravel-Elasticsearch: An Elasticsearch implementation of Laravel's Eloquent ORM
1210

1311
This package extends Laravel's Eloquent model and query builder with seamless integration of Elasticsearch functionalities. Designed to feel native to Laravel, this package enables you to work with Eloquent models while leveraging the
@@ -40,15 +38,10 @@ $search = UserProfile::phrase('loves espressos')->highlight()->search();
4038
```
4139

4240
### Read the [Documentation](https://elasticsearch.pdphilip.com/)
43-
4441
---
45-
4642
> #### Using [OpenSearch](https://opensearch.pdphilip.com/)? [Github](https://github.com/pdphilip/laravel-opensearch)
47-
4843
---
49-
5044
> #### [Package Tests](https://github.com/pdphilip/laravel-elasticsearch-tests)
51-
5245
---
5346

5447
## Installation
@@ -62,26 +55,26 @@ composer require pdphilip/elasticsearch
6255
```
6356

6457
| Laravel Version | Command | Maintained |
65-
| --------------- | ---------------------------------------------- | ---------- |
66-
| Laravel 10 & 11 | `composer require pdphilip/elasticsearch:~4 ` | ✅ |
67-
| Laravel 9 | `composer require pdphilip/elasticsearch:~3.9` | ✅ |
68-
| Laravel 8 | `composer require pdphilip/elasticsearch:~3.8` | ✅ |
58+
|-----------------|------------------------------------------------|------------|
59+
| Laravel 10 & 11 | `composer require pdphilip/elasticsearch:~4 ` | ✅ |
60+
| Laravel 9 | `composer require pdphilip/elasticsearch:~3.9` | ✅ |
61+
| Laravel 8 | `composer require pdphilip/elasticsearch:~3.8` | ✅ |
6962

7063
### Unmaintained versions (Elasticsearch 8.x):
7164

7265
| Laravel Version | Command | Maintained |
73-
| ----------------- | ---------------------------------------------- | ---------- |
74-
| Laravel 7.x | `composer require pdphilip/elasticsearch:~2.7` | ❌ |
75-
| Laravel 6.x (5.8) | `composer require pdphilip/elasticsearch:~2.6` | ❌ |
66+
|-------------------|------------------------------------------------|------------|
67+
| Laravel 7.x | `composer require pdphilip/elasticsearch:~2.7` | ❌ |
68+
| Laravel 6.x (5.8) | `composer require pdphilip/elasticsearch:~2.6` | ❌ |
7669

7770
### Unmaintained versions (Elasticsearch 7.x):
7871

7972
| Laravel Version | Command | Maintained |
80-
| ----------------- | ---------------------------------------------- | ---------- |
81-
| Laravel 9.x | `composer require pdphilip/elasticsearch:~1.9` | ❌ |
82-
| Laravel 8.x | `composer require pdphilip/elasticsearch:~1.8` | ❌ |
83-
| Laravel 7.x | `composer require pdphilip/elasticsearch:~1.7` | ❌ |
84-
| Laravel 6.x (5.8) | `composer require pdphilip/elasticsearch:~1.6` | ❌ |
73+
|-------------------|------------------------------------------------|------------|
74+
| Laravel 9.x | `composer require pdphilip/elasticsearch:~1.9` | ❌ |
75+
| Laravel 8.x | `composer require pdphilip/elasticsearch:~1.8` | ❌ |
76+
| Laravel 7.x | `composer require pdphilip/elasticsearch:~1.7` | ❌ |
77+
| Laravel 6.x (5.8) | `composer require pdphilip/elasticsearch:~1.6` | ❌ |
8578

8679
## Configuration
8780

‎badge-coverage.svg‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)