Skip to content

Commit 52d4c3e

Browse files
authored
Merge branch '9.0' into orthogonal
2 parents 55f7f52 + 553482d commit 52d4c3e

40 files changed

+1124
-340
lines changed

.github/workflows/tests.yml

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
name: tests
2+
3+
on:
4+
push:
5+
pull_request:
6+
schedule:
7+
- cron: '0 0 * * *'
8+
9+
jobs:
10+
tests:
11+
12+
runs-on: ubuntu-latest
13+
14+
strategy:
15+
fail-fast: true
16+
matrix:
17+
php: [7.3, 7.4, 8.0]
18+
stability: [prefer-stable]
19+
20+
name: PHP ${{ matrix.php }} - ${{ matrix.stability }}
21+
22+
steps:
23+
- name: Checkout code
24+
uses: actions/checkout@v2
25+
26+
- name: Setup PHP
27+
uses: shivammathur/setup-php@v2
28+
with:
29+
php-version: ${{ matrix.php }}
30+
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, gd, memcached
31+
tools: composer:v2
32+
coverage: none
33+
34+
- name: Setup Memcached
35+
uses: niden/actions-memcached@v7
36+
37+
- name: Install dependencies
38+
uses: nick-invision/retry@v1
39+
with:
40+
timeout_minutes: 5
41+
max_attempts: 5
42+
command: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress
43+
44+
- name: Execute tests
45+
run: vendor/bin/phpunit --verbose

.travis.yml

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

CHANGELOG.md

Lines changed: 156 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,112 @@
88

99
### [Unreleased]
1010

11+
### [v9.19.0] - 2022-01-18
12+
13+
- Support for Laravel 9 #2727
14+
- Don't trash the exception stack trace (#2714) #2724
15+
16+
### [v9.18.2] - 2021-06-28
17+
18+
- Return empty string for null request keyword #2700
19+
20+
### [v9.18.1] - 2021-06-28
21+
22+
- Query with subqueries exception fix. #2642
23+
24+
### [v9.18.0] - 2021-04-16
25+
26+
- Improve count performance for simple queries. #2616
27+
- Fixes #1928
28+
- Make prepareCountQuery() public so its easy to test.
29+
30+
### [v9.17.4] - 2021-04-15
31+
32+
- Revert changes on count. #2614
33+
- Fix #2613
34+
- Reverts: #2611 and #2612
35+
36+
### [v9.17.3] - 2021-04-14
37+
38+
- Fix the regression when using a having condition in a query. #2612
39+
- Fix #1928
40+
- Code cleanup in QueryDataTable class #2606
41+
42+
### [v9.17.2] - 2021-04-12
43+
44+
- Remove unnecessary wrap to avoid performance issues #2608.
45+
- Fixes #1928.
46+
47+
### [v9.17.1] - 2021-03-23
48+
49+
- Fix morph relation support with multi level relations. #2588 #2590
50+
- Fix tests and doc blocks. #2586
51+
- Fixes #2587, #2589, #2580
52+
53+
### [v9.17.0] - 2021-03-19
54+
55+
- feat(relations): add partial polymorphic support [#2580]
56+
57+
### [v9.16.0] - 2021-03-19
58+
59+
- Add set multi term on runtime [#2585]
60+
61+
### [v9.15.2] - 2020-12-04
62+
63+
- Remove raw sql when using regex and wrap the column name.
64+
65+
### [v9.15.1] - 2020-12-03
66+
67+
- Fix search pane builder instance when using eloquent. [#2540]
68+
69+
### [v9.15.0] - 2020-11-28
70+
71+
- PHP8 support [#2536]
72+
73+
### [v9.14.2] - 2020-11-27
74+
75+
- Fix PHP8 error, method exists now throws an exception if the first argument is not string|object [#2535]
76+
- Fixes [#2534]
77+
78+
### [v9.14.1] - 2020-11-11
79+
80+
- Fix resolution of custom search pane query builder. [#2513]
81+
82+
### [v9.14.0] - 2020-11-03
83+
84+
- Add column formatter. [#2193]
85+
- Fix [yajra/laravel-datatables-editor#33](https://github.com/yajra/laravel-datatables-editor/issues/33)
86+
87+
### [v9.13.0] - 2020-10-31
88+
89+
- Add support for search panes. [#2475]
90+
- Fix [#2463], [#2471]
91+
92+
### [v9.12.0] - 2020-10-31
93+
94+
- Add disable ordering via orderColumn. [#2481], credits to [@gredimano]
95+
- Fix [#1953]
96+
97+
### [v9.11.1] - 2020-10-06
98+
99+
- Use simple numeric sorting when dealing with numeric values [#2478], credits to [@miken32]
100+
- Fix [#1934].
101+
102+
### [v9.11.0] - 2020-09-09
103+
104+
- Add support for Laravel 8. [#2457] by [@lloricode]
105+
106+
### [v9.10.2] - 2020-06-17
107+
108+
- Escape row in data processor also accepts Htmlable [#2414], credits to [@edwwaarrdd].
109+
110+
### [v9.10.1] - 2020-05-30
111+
112+
- Fix type casting issue [#2399], credits to [@ehsanrasta].
113+
- Fix [#1975] , [#1747].
114+
- Fix issue with non-existing variables/attributes on Collection. [#2391], credits to [@mgralikowski].
115+
- Add laravel missing versions on every docs [#2382], credits to [@lloricode].
116+
11117
### [v9.10.0] - 2020-04-23
12118

13119
- Add support for HasOneThrough [#2368], credits to [@warlof]
@@ -374,7 +480,29 @@ return (new CollectionDataTable(User::all())->toJson();
374480
- Fix orderColumn api where related tables are not joined.
375481
- Fix nested with relation search and sort function.
376482

377-
[Unreleased]: https://github.com/yajra/laravel-datatables/compare/v9.10.0...9.0
483+
[Unreleased]: https://github.com/yajra/laravel-datatables/compare/v9.19.0...9.0
484+
[v9.19.0]: https://github.com/yajra/laravel-datatables/compare/v9.18.2...v9.19.0
485+
[v9.18.2]: https://github.com/yajra/laravel-datatables/compare/v9.18.1...v9.18.2
486+
[v9.18.1]: https://github.com/yajra/laravel-datatables/compare/v9.18.0...v9.18.1
487+
[v9.18.0]: https://github.com/yajra/laravel-datatables/compare/v9.17.4...v9.18.0
488+
[v9.17.4]: https://github.com/yajra/laravel-datatables/compare/v9.17.3...v9.17.4
489+
[v9.17.3]: https://github.com/yajra/laravel-datatables/compare/v9.17.2...v9.17.3
490+
[v9.17.2]: https://github.com/yajra/laravel-datatables/compare/v9.17.1...v9.17.2
491+
[v9.17.1]: https://github.com/yajra/laravel-datatables/compare/v9.17.0...v9.17.1
492+
[v9.17.0]: https://github.com/yajra/laravel-datatables/compare/v9.16.0...v9.17.0
493+
[v9.16.0]: https://github.com/yajra/laravel-datatables/compare/v9.15.2...v9.16.0
494+
[v9.15.2]: https://github.com/yajra/laravel-datatables/compare/v9.15.1...v9.15.2
495+
[v9.15.1]: https://github.com/yajra/laravel-datatables/compare/v9.15.0...v9.15.1
496+
[v9.15.0]: https://github.com/yajra/laravel-datatables/compare/v9.14.2...v9.15.0
497+
[v9.14.2]: https://github.com/yajra/laravel-datatables/compare/v9.14.1...v9.14.2
498+
[v9.14.1]: https://github.com/yajra/laravel-datatables/compare/v9.14.0...v9.14.1
499+
[v9.14.0]: https://github.com/yajra/laravel-datatables/compare/v9.13.0...v9.14.0
500+
[v9.13.0]: https://github.com/yajra/laravel-datatables/compare/v9.12.0...v9.13.0
501+
[v9.12.0]: https://github.com/yajra/laravel-datatables/compare/v9.11.1...v9.12.0
502+
[v9.11.1]: https://github.com/yajra/laravel-datatables/compare/v9.11.0...v9.11.1
503+
[v9.11.0]: https://github.com/yajra/laravel-datatables/compare/v9.10.2...v9.11.0
504+
[v9.10.2]: https://github.com/yajra/laravel-datatables/compare/v9.10.1...v9.10.2
505+
[v9.10.1]: https://github.com/yajra/laravel-datatables/compare/v9.10.0...v9.10.1
378506
[v9.10.0]: https://github.com/yajra/laravel-datatables/compare/v9.9.0...v9.10.0
379507
[v9.9.0]: https://github.com/yajra/laravel-datatables/compare/v9.8.0...v9.9.0
380508
[v9.8.0]: https://github.com/yajra/laravel-datatables/compare/v9.7.2...v9.8.0
@@ -508,7 +636,22 @@ return (new CollectionDataTable(User::all())->toJson();
508636
[#2263]: https://github.com/yajra/laravel-datatables/pull/2263
509637
[#2332]: https://github.com/yajra/laravel-datatables/pull/2332
510638
[#2368]: https://github.com/yajra/laravel-datatables/pull/2368
511-
639+
[#2399]: https://github.com/yajra/laravel-datatables/pull/2399
640+
[#2391]: https://github.com/yajra/laravel-datatables/pull/2391
641+
[#2382]: https://github.com/yajra/laravel-datatables/pull/2382
642+
[#2414]: https://github.com/yajra/laravel-datatables/pull/2414
643+
[#2478]: https://github.com/yajra/laravel-datatables/pull/2478
644+
[#2481]: https://github.com/yajra/laravel-datatables/pull/2481
645+
[#2475]: https://github.com/yajra/laravel-datatables/pull/2475
646+
[#2193]: https://github.com/yajra/laravel-datatables/pull/2193
647+
[#2513]: https://github.com/yajra/laravel-datatables/pull/2513
648+
[#2535]: https://github.com/yajra/laravel-datatables/pull/2535
649+
[#2536]: https://github.com/yajra/laravel-datatables/pull/2536
650+
[#2540]: https://github.com/yajra/laravel-datatables/pull/2540
651+
[#2585]: https://github.com/yajra/laravel-datatables/pull/2585
652+
[#2580]: https://github.com/yajra/laravel-datatables/pull/2580
653+
654+
[#1934]: https://github.com/yajra/laravel-datatables/issues/1934
512655
[#2091]: https://github.com/yajra/laravel-datatables/issues/2091
513656
[#2058]: https://github.com/yajra/laravel-datatables/issues/2058
514657
[#1626]: https://github.com/yajra/laravel-datatables/issues/1626
@@ -545,6 +688,12 @@ return (new CollectionDataTable(User::all())->toJson();
545688
[#1822]: https://github.com/yajra/laravel-datatables/issues/1822
546689
[#1738]: https://github.com/yajra/laravel-datatables/issues/1738
547690
[#2202]: https://github.com/yajra/laravel-datatables/issues/2202
691+
[#1975]: https://github.com/yajra/laravel-datatables/issues/1975
692+
[#1747]: https://github.com/yajra/laravel-datatables/issues/1747
693+
[#1953]: https://github.com/yajra/laravel-datatables/issues/1953
694+
[#2463]: https://github.com/yajra/laravel-datatables/issues/2463
695+
[#2471]: https://github.com/yajra/laravel-datatables/issues/2471
696+
[#2534]: https://github.com/yajra/laravel-datatables/issues/2534
548697

549698
[laravel-datatables-fractal]: https://github.com/yajra/laravel-datatables-fractal
550699

@@ -583,3 +732,8 @@ return (new CollectionDataTable(User::all())->toJson();
583732
[@imTigger]: https://github.com/imTigger
584733
[@barryvdh]: https://github.com/barryvdh
585734
[@warlof]: https://github.com/warlof
735+
[@ehsanrasta]: https://github.com/ehsanrasta
736+
[@mgralikowski]: https://github.com/mgralikowski
737+
[@edwwaarrdd]: https://github.com/edwwaarrdd
738+
[@miken32]: https://github.com/miken32
739+
[@gredimano]: https://github.com/gredimano

CONDUCT.md

Lines changed: 55 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,64 @@
1-
# Contributor Code of Conduct
1+
# Contributor Covenant Code of Conduct
22

3-
As contributors and maintainers of this project, and in the interest of fostering an open and welcoming community, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
3+
## Our Pledge
4+
We as members, contributors, and leaders pledge to make participation in our community a harassment-free experience for everyone, regardless of age, body size, visible or invisible disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, caste, color, religion, or sexual identity and orientation.
45

5-
We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, or nationality.
6+
We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community.
67

7-
Examples of unacceptable behavior by participants include:
8+
## Our Standards
9+
Examples of behavior that contributes to a positive environment for our community include:
10+
* Demonstrating empathy and kindness toward other people
11+
* Being respectful of differing opinions, viewpoints, and experiences
12+
* Giving and gracefully accepting constructive feedback
13+
* Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience
14+
* Focusing on what is best not just for us as individuals, but for the overall community
815

9-
* The use of sexualized language or imagery
10-
* Personal attacks
11-
* Trolling or insulting/derogatory comments
16+
Examples of unacceptable behavior include:
17+
* The use of sexualized language or imagery, and sexual attention or advances of any kind
18+
* Trolling, insulting or derogatory comments, and personal or political attacks
1219
* Public or private harassment
13-
* Publishing other's private information, such as physical or electronic addresses, without explicit permission
14-
* Other unethical or unprofessional conduct.
20+
* Publishing others’ private information, such as a physical or email address, without their explicit permission
21+
* Other conduct which could reasonably be considered inappropriate in a professional setting
1522

16-
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.
23+
## Enforcement Responsibilities
24+
Community leaders are responsible for clarifying and enforcing our standards of acceptable behavior and will take appropriate and fair corrective action in response to any behavior that they deem inappropriate, threatening, offensive, or harmful.
1725

18-
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.
26+
Community leaders 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, and will communicate reasons for moderation decisions when appropriate.
1927

20-
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
28+
## Scope
29+
This Code of Conduct applies within all community spaces, and also applies when an individual is officially representing the community in public spaces. Examples of representing our community include using an official e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event.
2130

22-
This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.2.0, available at [http://contributor-covenant.org/version/1/2/0/](http://contributor-covenant.org/version/1/2/0/)
31+
## Enforcement
32+
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at [INSERT CONTACT METHOD]. All complaints will be reviewed and investigated promptly and fairly.
33+
34+
All community leaders are obligated to respect the privacy and security of the reporter of any incident.
35+
36+
## Enforcement Guidelines
37+
Community leaders will follow these Community Impact Guidelines in determining the consequences for any action they deem in violation of this Code of Conduct:
38+
39+
### 1. Correction
40+
Community Impact: Use of inappropriate language or other behavior deemed unprofessional or unwelcome in the community.
41+
42+
Consequence: A private, written warning from community leaders, providing clarity around the nature of the violation and an explanation of why the behavior was inappropriate. A public apology may be requested.
43+
44+
### 2. Warning
45+
Community Impact: A violation through a single incident or series of actions.
46+
47+
Consequence: A warning with consequences for continued behavior. No interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, for a specified period of time. This includes avoiding interactions in community spaces as well as external channels like social media. Violating these terms may lead to a temporary or permanent ban.
48+
49+
### 3. Temporary Ban
50+
Community Impact: A serious violation of community standards, including sustained inappropriate behavior.
51+
52+
Consequence: A temporary ban from any sort of interaction or public communication with the community for a specified period of time. No public or private interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, is allowed during this period. Violating these terms may lead to a permanent ban.
53+
54+
### 4. Permanent Ban
55+
Community Impact: Demonstrating a pattern of violation of community standards, including sustained inappropriate behavior, harassment of an individual, or aggression toward or disparagement of classes of individuals.
56+
57+
Consequence: A permanent ban from any sort of public interaction within the community.
58+
59+
## Attribution
60+
This Code of Conduct is adapted from the Contributor Covenant, version 2.1, available at https://www.contributor-covenant.org/version/2/1/code_of_conduct.html.
61+
62+
Community Impact Guidelines were inspired by Mozilla’s code of conduct enforcement ladder.
63+
64+
For answers to common questions about this code of conduct, see the FAQ at https://www.contributor-covenant.org/faq. Translations are available at https://www.contributor-covenant.org/translations.

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
(The MIT License)
22

3-
Copyright (c) 2013-2019 Arjay Angeles <[email protected]>
3+
Copyright (c) 2013-2021 Arjay Angeles <[email protected]>
44

55
Permission is hereby granted, free of charge, to any person obtaining
66
a copy of this software and associated documentation files (the

README.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
# jQuery DataTables API for Laravel 4|5|6
1+
# jQuery DataTables API for Laravel 4|5|6|7|8
22

33
[![Join the chat at https://gitter.im/yajra/laravel-datatables](https://badges.gitter.im/yajra/laravel-datatables.svg)](https://gitter.im/yajra/laravel-datatables?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
44
[![Donate](https://img.shields.io/badge/donate-paypal-blue.svg)](https://www.paypal.me/yajra)
55
[![Donate](https://img.shields.io/badge/donate-patreon-blue.svg)](https://www.patreon.com/bePatron?u=4521203)
66

7-
[![Laravel 4.2|5.x|6.x](https://img.shields.io/badge/Laravel-4.2|5.x-orange.svg)](http://laravel.com)
7+
[![Laravel 4.2|5.x|6|7|8](https://img.shields.io/badge/Laravel-4.2|5.x|6|7|8-orange.svg)](http://laravel.com)
88
[![Latest Stable Version](https://img.shields.io/packagist/v/yajra/laravel-datatables-oracle.svg)](https://packagist.org/packages/yajra/laravel-datatables-oracle)
99
[![Latest Unstable Version](https://poser.pugx.org/yajra/laravel-datatables-oracle/v/unstable.svg)](https://packagist.org/packages/yajra/laravel-datatables-oracle)
10-
[![Build Status](https://travis-ci.org/yajra/laravel-datatables.svg?branch=master)](https://travis-ci.org/yajra/laravel-datatables)
10+
![Build Status](https://github.com/yajra/laravel-datatables-html/workflows/tests/badge.svg)
1111
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/yajra/laravel-datatables/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/yajra/laravel-datatables/?branch=master)
1212
[![Total Downloads](https://poser.pugx.org/yajra/laravel-datatables-oracle/downloads.png)](https://packagist.org/packages/yajra/laravel-datatables-oracle)
1313
[![License](https://img.shields.io/github/license/mashape/apistatus.svg)](https://packagist.org/packages/yajra/laravel-datatables-oracle)
@@ -30,7 +30,7 @@ return datatables(User::all())->toJson();
3030

3131
## Requirements
3232
- [PHP >= 7.0](http://php.net/)
33-
- [Laravel 5.x|6.x](https://github.com/laravel/framework)
33+
- [Laravel 4.2|5.x|6|7|8](https://github.com/laravel/framework)
3434
- [jQuery DataTables v1.10.x](http://datatables.net/)
3535

3636
## Documentations
@@ -60,6 +60,7 @@ return datatables(User::all())->toJson();
6060
5.8.x | 9.x
6161
6.x.x | 9.x
6262
7.x.x | 9.x
63+
8.x.x | 9.x
6364

6465
## DataTables 8.x Upgrade Guide
6566
There are breaking changes since DataTables v8.x.
@@ -70,7 +71,7 @@ If you are upgrading from v7.x to v8.x, please see [upgrade guide](https://yajra
7071
$ composer require yajra/laravel-datatables-oracle:"~9.0"
7172
```
7273

73-
#### Service Provider & Facade (Optional on Laravel 5.5)
74+
#### Service Provider & Facade (Optional on Laravel 5.5+)
7475
Register provider and facade on your `config/app.php` file.
7576
```php
7677
'providers' => [

0 commit comments

Comments
 (0)