Skip to content

Add debug toolbar from 94noni #337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ indent_style = space
indent_size = 4
max_line_length = 120

[*.{yml,json}]
[*.{yml,yaml}]
indent_size = 4

[*.json]
indent_size = 2

[*.{neon,neon.dist}]
Expand Down
5 changes: 5 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
blank_issues_enabled: false
contact_links:
- name: Support questions & other
url: https://discord.meilisearch.com/
about: Support is not handled here but on our Discord
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
name: Feature Request 💡
name: Feature Request & Enhancement 💡
about: Suggest a new idea for the project.
title: ''
labels: ''
Expand Down
7 changes: 0 additions & 7 deletions .github/ISSUE_TEMPLATE/other.md

This file was deleted.

6 changes: 3 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ updates:
- package-ecosystem: composer
directory: "/"
schedule:
interval: daily
interval: "monthly"
time: "04:00"
open-pull-requests-limit: 10
labels:
- dependencies
- skip-changelog
- dependencies
- skip-changelog
rebase-strategy: disabled

- package-ecosystem: "github-actions"
Expand Down
50 changes: 27 additions & 23 deletions .github/release-draft-template.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,37 @@
name-template: 'v$RESOLVED_VERSION 🎵'
tag-template: 'v$RESOLVED_VERSION'
exclude-labels:
- 'skip-changelog'
- 'skip-changelog'
version-resolver:
minor:
labels:
- 'breaking-change'
default: patch
minor:
labels:
- 'breaking-change'
default: patch
categories:
- title: '⚠️ Breaking changes'
label: 'breaking-change'
- title: '🚀 Enhancements'
label: 'enhancement'
- title: '🐛 Bug Fixes'
label: 'bug'
- title: '🔒 Security'
label: 'security'
- title: '⚠️ Breaking changes'
label: 'breaking-change'
- title: '🚀 Enhancements'
label: 'enhancement'
- title: '🐛 Bug Fixes'
label: 'bug'
- title: '🔒 Security'
label: 'security'
- title: '⚙️ Maintenance/misc'
label:
- 'maintenance'
- 'documentation'
template: |
$CHANGES
$CHANGES

Thanks again to $CONTRIBUTORS! 🎉
Thanks again to $CONTRIBUTORS! 🎉
no-changes-template: 'Changes are coming soon 😎'
sort-direction: 'ascending'
replacers:
- search: '/(?:and )?@dependabot-preview(?:\[bot\])?,?/g'
replace: ''
- search: '/(?:and )?@dependabot(?:\[bot\])?,?/g'
replace: ''
- search: '/(?:and )?@bors(?:\[bot\])?,?/g'
replace: ''
- search: '/(?:and )?@meili-bot,?/g'
replace: ''
- search: '/(?:and )?@dependabot-preview(?:\[bot\])?,?/g'
replace: ''
- search: '/(?:and )?@dependabot(?:\[bot\])?,?/g'
replace: ''
- search: '/(?:and )?@bors(?:\[bot\])?,?/g'
replace: ''
- search: '/(?:and )?@meili-bot,?/g'
replace: ''
56 changes: 28 additions & 28 deletions .github/workflows/pre-release-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,33 @@ name: Pre-Release Tests

# Will only run for PRs and pushes to bump-meilisearch-v*
on:
push:
branches:
- bump-meilisearch-v*
pull_request:
branches:
- bump-meilisearch-v*
push:
branches:
- bump-meilisearch-v*
pull_request:
branches:
- bump-meilisearch-v*

jobs:
integration-tests:
runs-on: ubuntu-latest
strategy:
matrix:
php-versions: ['7.4', '8.0']
name: integration-tests-against-rc (PHP ${{ matrix.php-versions }})
steps:
- uses: actions/checkout@v3
- name: Install PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-versions }}
- name: Validate composer.json and composer.lock
run: composer validate
- name: Install dependencies
run: composer install --prefer-dist --no-progress --quiet
- name: Get the latest Meilisearch RC
run: echo "MEILISEARCH_VERSION=$(curl https://raw.githubusercontent.com/meilisearch/integration-guides/main/scripts/get-latest-meilisearch-rc.sh | bash)" >> $GITHUB_ENV
- name: Meilisearch (${{ env.MEILISEARCH_VERSION }}) setup with Docker
run: docker run -d -p 7700:7700 getmeili/meilisearch:${{ env.MEILISEARCH_VERSION }} meilisearch --master-key=masterKey --no-analytics
- name: Run test suite
run: composer test:unit
integration-tests:
runs-on: ubuntu-latest
strategy:
matrix:
php-versions: ['7.4', '8.0']
name: integration-tests-against-rc (PHP ${{ matrix.php-versions }})
steps:
- uses: actions/checkout@v4
- name: Install PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-versions }}
- name: Validate composer.json and composer.lock
run: composer validate
- name: Install dependencies
run: composer install --prefer-dist --no-progress --quiet
- name: Get the latest Meilisearch RC
run: echo "MEILISEARCH_VERSION=$(curl https://raw.githubusercontent.com/meilisearch/integration-guides/main/scripts/get-latest-meilisearch-rc.sh | bash)" >> $GITHUB_ENV
- name: Meilisearch (${{ env.MEILISEARCH_VERSION }}) setup with Docker
run: docker run -d -p 7700:7700 getmeili/meilisearch:${{ env.MEILISEARCH_VERSION }} meilisearch --master-key=masterKey --no-analytics
- name: Run test suite
run: composer test:unit
22 changes: 11 additions & 11 deletions .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
name: Release Drafter

on:
push:
branches:
- main
push:
branches:
- main

jobs:
update_release_draft:
runs-on: ubuntu-latest
steps:
- uses: release-drafter/release-drafter@v5
with:
config-name: release-draft-template.yml
env:
GITHUB_TOKEN: ${{ secrets.RELEASE_DRAFTER_TOKEN }}
update_release_draft:
runs-on: ubuntu-latest
steps:
- uses: release-drafter/release-drafter@v6
with:
config-name: release-draft-template.yml
env:
GITHUB_TOKEN: ${{ secrets.RELEASE_DRAFTER_TOKEN }}
116 changes: 91 additions & 25 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,68 +9,102 @@ on:
- staging
- main

env:
fail-fast: true

jobs:
integration-tests:
# Will not run if the event is a PR to bump-meilisearch-v* (so a pre-release PR)
# Will still run for each push to bump-meilisearch-v*
if: github.event_name != 'pull_request' || !startsWith(github.base_ref, 'bump-meilisearch-v')
runs-on: ubuntu-latest
services:
meilisearch:
image: getmeili/meilisearch:latest
ports:
- 7700:7700
env:
MEILI_MASTER_KEY: masterKey
MEILI_NO_ANALYTICS: true
strategy:
matrix:
php-version: ['7.4', '8.0', '8.1', '8.2']
include:
php-version: ['7.4', '8.1', '8.2', '8.3']
sf-version: ['5.4', '6.4', '7.0', '7.1']
exclude:
- php-version: '7.4'
sf-version: '4.4.*'
sf-version: '6.4'
- php-version: '7.4'
sf-version: '5.4.*'
- php-version: '8.0'
sf-version: '6.0.*'
sf-version: '7.0'
- php-version: '7.4'
sf-version: '7.1'
- php-version: '8.1'
sf-version: '5.4'
- php-version: '8.1'
sf-version: '6.0.*'
sf-version: '7.0'
- php-version: '8.1'
sf-version: '6.1.*'
sf-version: '7.1'
- php-version: '8.2'
sf-version: '6.2.*'
sf-version: '5.4'
- php-version: '8.3'
sf-version: '5.4'
- php-version: '8.3'
sf-version: '5.4'

name: integration-tests (PHP ${{ matrix.php-version }}) (Symfony ${{ matrix.sf-version }})
name: integration-tests (PHP ${{ matrix.php-version }}) (Symfony ${{ matrix.sf-version }}.*)
steps:
- uses: actions/checkout@v3
- name: Checkout code
uses: actions/checkout@v4

- name: Install PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-version }}
tools: composer:v2, flex
tools: composer, flex

- name: Validate composer.json and composer.lock
run: composer validate

- name: Remove doctrine/annotations
if: matrix.php-version != '7.4'
run: sed -i '/doctrine\/annotations/d' composer.json

- name: Install dependencies
uses: ramsey/composer-install@v3
env:
SYMFONY_REQUIRE: ${{ matrix.sf-version }}
run: composer install --prefer-dist --no-progress --quiet
- name: "Remove doctrine/annotations"
if: matrix.php-version != '7.4'
run: |
composer remove --dev doctrine/annotations
- name: Meilisearch setup with Docker
run: docker run -d -p 7700:7700 getmeili/meilisearch:latest meilisearch --master-key=masterKey --no-analytics
SYMFONY_REQUIRE: ${{ matrix.sf-version }}.*
with:
dependency-versions: 'highest'

- name: Run test suite
run: composer test:unit
run: composer test:unit -- --coverage-clover coverage.xml

- name: Upload coverage file
uses: actions/upload-artifact@v4
with:
name: 'phpunit-${{ matrix.php-version }}-${{ matrix.sf-version }}-coverage'
path: 'coverage.xml'

code-style:
runs-on: ubuntu-latest
name: 'Code style'
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.1'
php-version: 8.3

- name: Validate composer.json and composer.lock
run: composer validate

- name: Install dependencies
run: composer install --prefer-dist --no-progress --quiet
uses: ramsey/composer-install@v3
env:
SYMFONY_REQUIRE: 7.1.*
with:
composer-options: '--no-progress --quiet'
dependency-versions: 'highest'

- name: PHP CS Fixer
run: composer lint:check
Expand All @@ -79,7 +113,39 @@ jobs:
run: composer phpmd
continue-on-error: true

- name: PHPstan
- name: PHPStan
run: |
vendor/bin/simple-phpunit --version
composer phpstan

yaml-lint:
name: Yaml linting check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Yaml lint check
uses: ibiqlik/action-yamllint@v3
with:
config_file: .yamllint.yml

upload-coverage:
name: Upload coverage to Codecov
runs-on: ubuntu-latest
needs:
- integration-tests

steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 2

- name: Download coverage files
uses: actions/download-artifact@v4
with:
path: reports

- name: Upload to Codecov
uses: codecov/codecov-action@v4
with:
directory: reports
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
composer.lock
/vendor/
/var/
phpstan.neon

# Meilisearch
/data.ms/*
Expand Down
Loading