Skip to content

Commit 6fe1216

Browse files
committed
Merge branch 'main' into refactor-request-anonymous-function
2 parents 5caafa3 + d97c8e6 commit 6fe1216

File tree

72 files changed

+6358
-729
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+6358
-729
lines changed

.github/pull_request_template.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,11 @@
2525
### How can we test the before & after?
2626

2727
??
28+
29+
If the PR has changes in multiple repos please provide the command to checkout all branches, eg.:
30+
```bash
31+
git checkout "dev-branch-name" &&
32+
cd vendor/backpack/crud && git checkout crud-branch-name &&
33+
cd ../pro && git checkout pro-branch-name &&
34+
cd ../../..
35+
```

.github/workflows/coverage.yml

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
name: Generate Code Coverage Report
2+
on:
3+
push:
4+
branches:
5+
- main
6+
permissions:
7+
contents: write
8+
jobs:
9+
test:
10+
if: ${{ github.actor != 'dependabot[bot]' }}
11+
runs-on: ubuntu-latest
12+
name: PHP setup
13+
steps:
14+
15+
- name: Checkout code
16+
uses: actions/checkout@v3
17+
with:
18+
ref: main
19+
fetch-depth: 0
20+
- name: Install SQLite 3
21+
run: |
22+
sudo apt-get update
23+
sudo apt-get install sqlite3
24+
- name: Setup PHP
25+
uses: shivammathur/setup-php@v2
26+
with:
27+
php-version: 8.1
28+
extensions: curl, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, iconv, xdebug
29+
coverage: xdebug
30+
tools: composer:v2
31+
- name: Install dependencies
32+
run: |
33+
composer require "laravel/framework:^9.0" "phpunit/phpunit:^9.0" "doctrine/dbal:^3.0" --no-interaction --no-update --no-suggest
34+
composer update --prefer-dist --no-interaction
35+
- name: Execute tests
36+
run: vendor/bin/phpunit --coverage-clover coverage.xml
37+
- name: Check test coverage
38+
id: test-coverage
39+
uses: johanvanhelden/gha-clover-test-coverage-check@v1
40+
with:
41+
percentage: "1"
42+
filename: coverage.xml
43+
metric: elements
44+
rounded-precision: 2
45+
- name: Generate the badge SVG image
46+
uses: emibcn/badge-action@v1
47+
id: badge
48+
with:
49+
label: coverage
50+
status: ${{ steps.test-coverage.outputs.coverage-rounded-display }}
51+
path: ./test-coverage.svg
52+
color: ${{ steps.test-coverage.outputs.coverage > 90 && 'green' ||
53+
steps.test-coverage.outputs.coverage > 80 && 'yellow,green, green' ||
54+
steps.test-coverage.outputs.coverage > 70 && 'yellow, green' ||
55+
steps.test-coverage.outputs.coverage > 60 && 'yellow,yellow, green' ||
56+
steps.test-coverage.outputs.coverage > 50 && 'orange' ||
57+
steps.test-coverage.outputs.coverage > 40 && 'red,orange' ||
58+
steps.test-coverage.outputs.coverage > 30 && 'red,red,orange' ||
59+
steps.test-coverage.outputs.coverage > 20 && 'red,red,red,orange' ||
60+
'red' }}
61+
- name: Upload badge as artifact
62+
uses: actions/upload-artifact@v3
63+
with:
64+
name: badge
65+
path: test-coverage.svg
66+
if-no-files-found: error
67+
- name: Commit badge
68+
continue-on-error: true
69+
env:
70+
BADGE: test-coverage.svg
71+
run: |
72+
git config --local user.email "[email protected]"
73+
git config --local user.name "GitHub Action"
74+
git add "${BADGE}"
75+
git commit -m "Update Coverage Badge"
76+
- name: Push badge commit
77+
uses: ad-m/github-push-action@master
78+
if: ${{ success() }}
79+
with:
80+
force: true
81+
github_token: ${{ secrets.COVERAGE_TOKEN }}
82+
branch: coverage-badge-dont-delete

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ If you have a solution for it and want to help, you can submit a Pull Request. T
3030
- you'll become one of the Backpack contributors; [welcome to the party! :-)](https://media.giphy.com/media/l0MYt5jPR6QX5pnqM/giphy.gif);
3131
- you'll not just be helping yourself and the maintainers of Backpack, you'd be helping thousants of Backpack developers;
3232

33-
If you've never submitted a PR before, don't worry, it's not that difficult. Read [this tutoral](https://mattstauffer.co/blog/how-to-contribute-to-an-open-source-github-project-using-your-own-fork) and the rules above. I promise, you'll enjoy sending PRs after a while :-)
33+
If you've never submitted a PR before, don't worry, it's not that difficult. Read [this tutoral](https://mattstauffer.com/blog/how-to-contribute-to-an-open-source-github-project-using-your-own-fork) and the rules above. I promise, you'll enjoy sending PRs after a while :-)
3434

3535

3636
# Want to help out?

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<a href="https://scrutinizer-ci.com/g/laravel-backpack/crud" title="Quality Score"><img src="https://img.shields.io/scrutinizer/g/laravel-backpack/crud.svg?style=flat-square"></a>
2020
<a href="https://travis-ci.org/Laravel-Backpack/CRUD" title="Build Status"><img src="https://img.shields.io/travis/Laravel-Backpack/CRUD/master.svg?style=flat-square"></a>
2121
<a href="https://styleci.io/repos/53581270" title="Style CI"><img src="https://styleci.io/repos/53581270/shield"></a>
22-
<a href="https://scrutinizer-ci.com/g/laravel-backpack/crud/code-structure" title="Coverage Status"><img src="https://img.shields.io/scrutinizer/coverage/g/laravel-backpack/crud.svg?style=flat-square"></a>
22+
<a href="https://scrutinizer-ci.com/g/laravel-backpack/crud/code-structure" title="Coverage Status"><img src="https://raw.githubusercontent.com/laravel-backpack/CRUD/coverage-badge-dont-delete/test-coverage.svg"></a>
2323
<a href="LICENSE.md" title="Software License"><img src="https://img.shields.io/github/license/laravel-backpack/crud?style=flat-square"></a>
2424
<a href="https://github.com/the-whole-fruit/manifesto"><img src="https://img.shields.io/badge/writing%20standard-the%20whole%20fruit-brightgreen?style=flat-square" title="We believe writing good code is not only about writing good code. It’s also about the words around it. We aims to deliver both: code and words."></a>
2525
</p>

mix-manifest.json

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4145,6 +4145,18 @@
41454145
"/src/public/packages/places.js/dist/cdn/placesInstantsearchWidget.min.js.map": "/src/public/packages/places.js/dist/cdn/placesInstantsearchWidget.min.js.map",
41464146
"/src/public/packages/jquery-ui-touch-punch/jquery.ui.touch-punch.min.js": "/src/public/packages/jquery-ui-touch-punch/jquery.ui.touch-punch.min.js",
41474147
"/src/public/packages/URI.js/URI.min.js": "/src/public/packages/URI.js/URI.min.js",
4148+
"/src/public/packages/intl-tel-input/build/css/demo.css": "/src/public/packages/intl-tel-input/build/css/demo.css",
4149+
"/src/public/packages/intl-tel-input/build/css/intlTelInput.css": "/src/public/packages/intl-tel-input/build/css/intlTelInput.css",
4150+
"/src/public/packages/intl-tel-input/build/css/intlTelInput.min.css": "/src/public/packages/intl-tel-input/build/css/intlTelInput.min.css",
4151+
"/src/public/packages/intl-tel-input/build/img/flags.png": "/src/public/packages/intl-tel-input/build/img/flags.png",
4152+
"/src/public/packages/intl-tel-input/build/img/[email protected]": "/src/public/packages/intl-tel-input/build/img/[email protected]",
4153+
"/src/public/packages/intl-tel-input/build/js/data.js": "/src/public/packages/intl-tel-input/build/js/data.js",
4154+
"/src/public/packages/intl-tel-input/build/js/data.min.js": "/src/public/packages/intl-tel-input/build/js/data.min.js",
4155+
"/src/public/packages/intl-tel-input/build/js/intlTelInput-jquery.js": "/src/public/packages/intl-tel-input/build/js/intlTelInput-jquery.js",
4156+
"/src/public/packages/intl-tel-input/build/js/intlTelInput-jquery.min.js": "/src/public/packages/intl-tel-input/build/js/intlTelInput-jquery.min.js",
4157+
"/src/public/packages/intl-tel-input/build/js/intlTelInput.js": "/src/public/packages/intl-tel-input/build/js/intlTelInput.js",
4158+
"/src/public/packages/intl-tel-input/build/js/intlTelInput.min.js": "/src/public/packages/intl-tel-input/build/js/intlTelInput.min.js",
4159+
"/src/public/packages/intl-tel-input/build/js/utils.js": "/src/public/packages/intl-tel-input/build/js/utils.js",
41484160
"/public/assets/css/backpack_electric_purple_overlay.css": "/public/assets/css/backpack_electric_purple_overlay.css",
41494161
"/public/assets/js/ga.js": "/public/assets/js/ga.js",
41504162
"/public/assets/js/monster/fields.js": "/public/assets/js/monster/fields.js",
@@ -7610,6 +7622,18 @@
76107622
"/public/packages/datatables.net-responsive-bs4/types/responsive.bootstrap4.d.ts": "/public/packages/datatables.net-responsive-bs4/types/responsive.bootstrap4.d.ts",
76117623
"/public/packages/easymde/dist/easymde.min.css": "/public/packages/easymde/dist/easymde.min.css",
76127624
"/public/packages/easymde/dist/easymde.min.js": "/public/packages/easymde/dist/easymde.min.js",
7625+
"/public/packages/intl-tel-input/build/css/demo.css": "/public/packages/intl-tel-input/build/css/demo.css",
7626+
"/public/packages/intl-tel-input/build/css/intlTelInput.css": "/public/packages/intl-tel-input/build/css/intlTelInput.css",
7627+
"/public/packages/intl-tel-input/build/css/intlTelInput.min.css": "/public/packages/intl-tel-input/build/css/intlTelInput.min.css",
7628+
"/public/packages/intl-tel-input/build/img/flags.png": "/public/packages/intl-tel-input/build/img/flags.png",
7629+
"/public/packages/intl-tel-input/build/img/[email protected]": "/public/packages/intl-tel-input/build/img/[email protected]",
7630+
"/public/packages/intl-tel-input/build/js/data.js": "/public/packages/intl-tel-input/build/js/data.js",
7631+
"/public/packages/intl-tel-input/build/js/data.min.js": "/public/packages/intl-tel-input/build/js/data.min.js",
7632+
"/public/packages/intl-tel-input/build/js/intlTelInput-jquery.js": "/public/packages/intl-tel-input/build/js/intlTelInput-jquery.js",
7633+
"/public/packages/intl-tel-input/build/js/intlTelInput-jquery.min.js": "/public/packages/intl-tel-input/build/js/intlTelInput-jquery.min.js",
7634+
"/public/packages/intl-tel-input/build/js/intlTelInput.js": "/public/packages/intl-tel-input/build/js/intlTelInput.js",
7635+
"/public/packages/intl-tel-input/build/js/intlTelInput.min.js": "/public/packages/intl-tel-input/build/js/intlTelInput.min.js",
7636+
"/public/packages/intl-tel-input/build/js/utils.js": "/public/packages/intl-tel-input/build/js/utils.js",
76137637
"/public/packages/jquery-colorbox/LICENSE.md": "/public/packages/jquery-colorbox/LICENSE.md",
76147638
"/public/packages/jquery-colorbox/README.md": "/public/packages/jquery-colorbox/README.md",
76157639
"/public/packages/jquery-colorbox/bower.json": "/public/packages/jquery-colorbox/bower.json",

0 commit comments

Comments
 (0)