Merge branch 'main' into v6-livewire-widget

Author: pxpm

.github/workflows/coverage.yml

@@ -30,7 +30,7 @@ jobs:
           tools: composer:v2
       - name: Install dependencies
         run: |
-            composer require "laravel/framework:^10.0" "phpunit/phpunit:^9.0" "doctrine/dbal:^3.0" --no-interaction --no-update --no-suggest
+            composer require "laravel/framework:^10.0" "phpunit/phpunit:^10.0" "doctrine/dbal:^3.0" --no-interaction --no-update --no-suggest
             composer update --prefer-dist --no-interaction
       - name: Execute tests
         run: vendor/bin/phpunit --coverage-clover coverage.xml

.github/workflows/testing.yml

@@ -22,7 +22,7 @@ jobs:
                 php: [8.1, 8.2]
                 dbal: [^3.0]
                 laravel: [10.*]
-                phpunit: [9.*, 10.*]
+                phpunit: [10.*]
                 dependency-version: [stable] # to add: lowest
 
 

.scrutinizer.yml

@@ -12,8 +12,9 @@ filter:
         - 'views/*'
 build:
 build:
+    image: default-bionic
     environment:
-        php: 8.0.2
+        php: 8.1.2
     nodes:
         analysis:
             tests:

CONDUCT.md

@@ -15,7 +15,7 @@ Examples of unacceptable behavior by participants include:
 
 Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every aspect of managing this project. Project maintainers who do not follow or enforce the Code of Conduct may be permanently removed from the project team.
 
-This code of conduct applies both within project spaces and in public spaces when an individual is representing the project or its community in a direct capacity. Personal views, beliefs and values of individuals do not necessarily reflect those of the organisation or affiliated individuals and organisations.
+This code of conduct applies both within project spaces and in public spaces when an individual is representing the project or its community in a direct capacity. Personal views, beliefs and values of individuals do not necessarily reflect those of the organization or affiliated individuals and organizations.
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
 

CONTRIBUTING.md

@@ -28,9 +28,9 @@ PR Rules:
 If you have a solution for it and want to help, you can submit a Pull Request. Tell us you are willing to do that. It takes a little more time from you, but:
 - your fix is guaranteed to be merged a lot faster;
 - you'll become one of the Backpack contributors; [welcome to the party! :-)](https://media.giphy.com/media/l0MYt5jPR6QX5pnqM/giphy.gif);
-- you'll not just be helping yourself and the maintainers of Backpack, you'd be helping thousants of Backpack developers;
+- you'll not just be helping yourself and the maintainers of Backpack, you'd be helping thousands of Backpack developers;
 
-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 :-)
+If you've never submitted a PR before, don't worry, it's not that difficult. Read [this tutorial](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 :-)
 
 
 # Want to help out?

README.md

@@ -30,7 +30,7 @@ https://user-images.githubusercontent.com/33960976/228454020-91f42000-919e-413c-
 -----
 
 Among the FREE features of each admin interface:
-- [List](https://backpackforlaravel.com/docs/5.x/crud-operation-list-entries) operation
+- [List](https://backpackforlaravel.com/docs/crud-operation-list-entries) operation
    - 24 column types
    - 1-1, 1-n and n-n relationships
    - table view with search, pagination
@@ -39,19 +39,19 @@ Among the FREE features of each admin interface:
    - details row
    - easily create new column types
    - easily override an existing column type
-- [Create](https://backpackforlaravel.com/docs/5.x/crud-operation-create) / [Update](https://backpackforlaravel.com/docs/5.x/crud-operation-update) operations
+- [Create](https://backpackforlaravel.com/docs/crud-operation-create) / [Update](https://backpackforlaravel.com/docs/crud-operation-update) operations
    - 29 field types
    - back-end validation using Laravel Form Requests
    - translatable models (multi-language)
    - have multiple fields per line
    - split fields into tabs
-- [Delete](https://backpackforlaravel.com/docs/5.x/crud-operation-delete) operation
-- [Reorder](https://backpackforlaravel.com/docs/5.x/crud-operation-reorder) operation
-- [Revise](https://backpackforlaravel.com/docs/5.x/crud-operation-revisions) operation (aka. audit log)
+- [Delete](https://backpackforlaravel.com/docs/crud-operation-delete) operation
+- [Reorder](https://backpackforlaravel.com/docs/crud-operation-reorder) operation
+- [Revise](https://backpackforlaravel.com/docs/crud-operation-revisions) operation (aka. audit log)
 
 But professionals don't love Backpack just because it's feature-packed. They also love it because it's **ridiculously easy to override a functionality**. Generally, you just need to create a function (or blade file) with the right name. Yes, it can be _that_ easy.
 
-> Need more complex features? Purchase [Backpack PRO](https://backpackforlaravel.com/pricing), our closed-source paid add-on. It will add **5 more operations, 10 filters, 28 more fields, 6 more columns and 1 more widget**. For more info, see our [FREE vs PRO comparison table](https://backpackforlaravel.com/docs/5.x/features-free-vs-paid). We believe it's everything you need to build admin panels of _any_ complexity.
+> Need more complex features? Purchase [Backpack PRO](https://backpackforlaravel.com/pricing), our closed-source paid add-on. It will add **5 more operations, 10 filters, 28 more fields, 6 more columns and 1 more widget**. For more info, see our [FREE vs PRO comparison table](https://backpackforlaravel.com/docs/features-free-vs-paid). We believe it's everything you need to build admin panels of _any_ complexity.
 
 ## Links
 
@@ -74,17 +74,18 @@ Please see [demo.backpackforlaravel.com](https://demo.backpackforlaravel.com/adm
 
 ## Getting Started
 
-Start with the ["Introduction" page in our docs](https://backpackforlaravel.com/docs/5.x/introduction) in our docs. It will explain what you can do with Backpack, and let you choose a guide, depending on how you like to learn:
-- a 31-minute ["Getting Started" video course](https://backpackforlaravel.com/docs/5.x/getting-started-videos);
-- a 20-minute ["Getting Started" text course](https://backpackforlaravel.com/docs/5.x/getting-started-basics);
+Start with the ["Introduction" page in our docs](https://backpackforlaravel.com/docs/introduction) in our docs. It will explain what you can do with Backpack, and let you choose a guide, depending on how you like to learn:
+- a 59-minute ["Getting Started" video course](https://backpackforlaravel.com/docs/getting-started-videos);
+- a 20-minute ["Getting Started" text course](https://backpackforlaravel.com/docs/getting-started-basics);
 - a 4-day, 5min/day ["Getting Started" drip email course](https://sendy.digitallyhappy.com/subscription?f=jlldf83763papd2Ifee0838Xs65TkXSvi17yEAuEnJiNj9ct53p5tikGHM4OkvpCeFUCbwcEYRt763ZSTILFXRWWEQ);
 
 ## Install
 
 For the current version (recommended):
-- [Install Backpack v5 on Laravel 10, 9 or 8](https://backpackforlaravel.com/docs/5.x/installation);
+- [Install Backpack v6 on Laravel 10](https://backpackforlaravel.com/docs/installation);
 
 For the previous versions (not recommended):
+- [Install Backpack v5 on Laravel 10, 9 or 8](https://backpackforlaravel.com/docs/5.x/installation)  - last feature update was 27th April 2023;
 - [Install Backpack 4.1 on Laravel 6, 7 or 8](https://backpackforlaravel.com/docs/4.1/installation) - last feature update was 1st Jan 2021;
 - [Install Backpack 4.0 on Laravel 5.8, 6 or 7](https://backpackforlaravel.com/docs/4.0/installation) - last feature update was 21st Apr 2020;
 - [Install Backpack 3.6 on Laravel 5.8 or 6.x](https://backpackforlaravel.com/docs/3.6/installation) - last feature update was 17th Sep 2019;
@@ -95,7 +96,7 @@ For the previous versions (not recommended):
 
 ## Change Log
 
-For v5.x and v4.x please see [the Releases tab](https://github.com/Laravel-Backpack/CRUD/releases). For previous versions (Backpack <=4.0.x), please see our old [CHANGELOG](CHANGELOG.md) file.
+Please see [the Releases tab](https://github.com/Laravel-Backpack/CRUD/releases). 
 
 ## Security
 
@@ -105,23 +106,21 @@ If you discover any security related issues, please email hello@backpackforlarav
 
 ## License
 
-Starting with v5, Backpack has become open-core. Its features have been separated into two packages:
-- **Backpack CRUD is licensed under the [MIT License](LICENSE.md)** (open-source free software); it is perfect if you're building a simple admin panel - it's packed with features! it's also perfect if you're building an open-source project, the permissive license allows you to do whatever you want;
-- **Backpack PRO is licensed under our [EULA](https://backpackforlaravel.com/eula)**; it is a closed-source, paid add-on; [PRO](https://backpackforlaravel.com/products/pro) will be useful when your admin panel needs grow, because it adds adds A LOT of features for complex use cases (see our [FREE vs PRO comparison](https://backpackforlaravel.com/docs/5.x/features-free-vs-paid));
+Backpack is open-core:
+- **Backpack CRUD is licensed under the [MIT License](LICENSE.md)** (open-source free software); it is perfect if you're building a simple admin panel - it's packed with features! It's also perfect if you're building an open-source project, the permissive license allows you to do whatever you want;
+- **Backpack PRO is licensed under our [EULA](https://backpackforlaravel.com/eula)**; it is a closed-source, paid add-on; [PRO](https://backpackforlaravel.com/products/pro) will be useful when your admin panel needs grow, because it adds A LOT of features for complex use cases (see our [FREE vs PRO comparison](https://backpackforlaravel.com/docs/features-free-vs-paid));
 
-[Our documentation](https://backpackforlaravel.com/docs) covers both CRUD and PRO, with all the PRO features clearly labeled <span class="badge badge-pill badge-info">PRO</span>.
+[Our documentation](https://backpackforlaravel.com/docs) covers both CRUD and PRO, with all the PRO features clearly labeled <span class="badge badge-pill badge-info">PRO</span>. You do not _need_ PRO, that is just an add-on. But we're hoping you find it useful, and pay for it, to support the development of our open-core.
 
 <a name="versioning"></a>
 ## Versioning
 
-Starting with Backpack v5, all our packages follow [semantic versioning](https://semver.org/). Here's what `major.minor.patch` (eg. `5.0.1`) means for us:
+Our packages follow [semantic versioning](https://semver.org/). Here's what `major.minor.patch` (eg. `6.0.1`) means for us:
 - `major` - breaking changes, major new features, complete rewrites; released **once a year**, in the first quarter; it adds features that were previously impossible and upgrades our dependencies; upgrading is done by following our clear and detailed upgrade guides;
 - `minor` - new features, released in backwards-compatible ways; **every few months**; update takes seconds;
 - `patch` - bug fixes & small non-breaking changes; historically **every week**; update takes seconds;
 
-When we release a new Backpack\CRUD version, all paid addons receive support for it the same day. 
-
-When you buy a premium Backpack addon, you get access to not only _updates_, but also _upgrades_ (for 12mo), that means that... **any time you buy a Backpack addon, it is very likely that you're not only buying the _current_ version** (`v5` at the moment), **but also the upgrade to the _next version_** (`v6` for example).
+When we release a new Backpack\CRUD version, all premium addons receive support for it the same day. When you buy a premium Backpack addon, you get access to not only _updates_, but also _upgrades_ (for 12mo), that means that... **any time you buy a Backpack addon, it is very likely that you're not only buying the _current_ version** (`v6` at the moment), **but also the upgrade to the _next version_** (`v7` for example).
 
 ## Contributing Guidelines
 
@@ -131,21 +130,25 @@ For tasks & details about how you can help our project, please see [CONTRIBUTING
 
 ## Credits
 
-- [Cristian Tabacitu](http://tabacitu.ro) - creator & lead maintainer;
-- [Pedro Martins](https://github.com/pxpm) - maintainer;
-- [António Almeida](https://github.com/promatik) - maintainer;
-- [All Contributors][link-contributors]
+- [Cristian Tabacitu](http://tabacitu.ro) - founder & lead maintainer;
+- [Pedro Martins](https://github.com/pxpm) - senior maintainer;
+- [António Almeida](https://github.com/promatik) - senior maintainer;
+- [Mauro Martinez](https://github.com/maurohmartinez) - maintainer & educator;
+- [Karan Datwani](https://github.com/karandatwani92) - maintainer & social media manager;
+- [Jorge Castro](https://github.com/jorgetwgroup) - maintainer;
+- [Mohammad Emran](https://github.com/phpfour) - maintainer;
+- [290+ wonderful contributors][link-contributors]
 
 Special thanks go to:
 - [Owen Melbourne](https://github.com/OwenMelbz), [Oliver Ziegler](https://github.com/OliverZiegler), [Thomas Swonke](https://github.com/tswonke), [Catalin Tudorache](https://github.com/tumf87), [Abby Janke](https://github.com/AbbyJanke), [David Lloyd](https://github.com/lloy0076) - A LOT of new features, bug fixing, support, feedback and code review;
-- [Łukasz Holeczek](https://coreui.io/) - creator of CoreUI (used in Backpack v4);
-- [Abdullah Almsaeed](https://adminlte.io/) - creator of AdminLTE (used in Backpack v3);
-- [John Skoumbourdis](http://www.grocerycrud.com/) - Grocery CRUD for CodeIgniter was a big inspiration for Backpack v1 & v2;
-- [Taylor Otwell](https://github.com/taylorotwell) & Laravel contributors (of course);
+- [Paweł Kuna](https://github.com/codecalm/) - creator of Tabler;
+- [Łukasz Holeczek](https://github.com/mrholek/) - creator of CoreUI;
+- [Taylor Otwell](https://github.com/taylorotwell) & the wonderful Laravel community (of course);
+- everybody who's ever purchased a Backpack license; it's thanks to them that we get to do this daily 🙏
 
 ## Hire us
 
-We've spend more than 10.000 hours creating, polishing and maintaining administration panels on Laravel. We've developed e-Commerce, e-Learning, ERPs, social networks, payment gateways and much more. We've worked on admin panels _so much_, that we've created one of the most popular packages for Laravel - just from making public what was repetitive in our projects.
+We've spent more than 10,000 hours creating, polishing and maintaining administration panels on Laravel. We've developed e-Commerce, e-Learning, ERPs, social networks, payment gateways and much more. We've worked on admin panels _so much_, that we've created one of the most popular packages for Laravel - just from making public what was repetitive in our projects.
 
 If you are looking for a developer/team to help you build an admin panel on Laravel, look no further. You'll have a difficult time finding someone with more experience & enthusiasm for admin panels. This is _what we do_. [Contact us](https://backpackforlaravel.com/need-freelancer-or-development-team).
 

composer.json

@@ -37,7 +37,7 @@
     "require": {
         "laravel/framework": "^10.0",
         "prologue/alerts": "^1.0",
-        "backpack/basset": "^0.16.0",
+        "backpack/basset": "^1.1.1",
         "creativeorange/gravatar": "~1.0",
         "doctrine/dbal": "^3.0",
         "guzzlehttp/guzzle": "^7.0"