Skip to content
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.

Sign up for GitHub

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

Laravel 8 support - bring guzzle adapter in house #2547

Merged
merged 15 commits into from
Oct 5, 2020
Merged

Laravel 8 support - bring guzzle adapter in house #2547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
1dfd247
bring guzzleadapater in house (#2382)
edalzell Sep 27, 2020
96dbebb
update the constratins for Laravel 8 and add legacy factories to get …
edalzell Sep 27, 2020
fe00e12
factories only needed for testing, so move to dev
edalzell Sep 27, 2020
8363448
fix test running without legacy-factories package
mrmonat Oct 1, 2020
79f8f83
Not using factories anymore
edalzell Oct 1, 2020
ebd907d
add Laravel 8 to tests…hopefully
edalzell Oct 1, 2020
38781ba
styleci
edalzell Oct 1, 2020
cc2e686
L8 doesn’t work w/ PHP 7.2
edalzell Oct 1, 2020
e98f094
don’t set php here, use the matrix
edalzell Oct 1, 2020
1a111df
Merge branch 'bring-guzzle-adapter-in-house' into remove-legacy-facto…
edalzell Oct 1, 2020
16c284a
Merge pull request #415 from mrmonat/remove-legacy-factories
edalzell Oct 1, 2020
f55caa8
StyleCI
edalzell Oct 1, 2020
a803426
whoops, this is needed. Silly Erin.
edalzell Oct 1, 2020
f5a95bf
use Faker
edalzell Oct 3, 2020
f20219f
not needed
edalzell Oct 5, 2020
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
7 changes: 6 additions & 1 deletion .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,22 @@ jobs:
strategy:
matrix:
php: [7.4, 7.3, 7.2]
laravel: [7.*, 6.*]
laravel: [8.*, 7.*, 6.*]
dependency-version: [prefer-lowest, prefer-stable]
os: [ubuntu-latest]
include:
- laravel: 8.*
testbench: 6.*
- laravel: 7.*
testbench: 5.*
- laravel: 6.*
testbench: 4.*
- php: 7.4
dependency-version: prefer-lowest
additional-deps: '"mockery/mockery:>=1.2.3"'
exclude:
- laravel: 8.*
php: 7.2

name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}

Expand Down
7 changes: 3 additions & 4 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"require": {
"composer/composer": "^1.10",
"facade/ignition-contracts": "^1.0",
"guzzlehttp/guzzle": "^6.3",
"laravel/framework": "^6.0 || ^7.0",
"guzzlehttp/guzzle": "^6.3 || ^7.0",
"laravel/framework": "^6.0 || ^7.0 || ^8.0",
"laravel/helpers": "^1.1",
"league/commonmark": "^1.5",
"league/csv": "^9.0",
Expand All @@ -22,7 +22,6 @@
"statamic/stringy": "^3.1",
"symfony/var-exporter": "^4.3",
"symfony/yaml": "^4.1 || ^5.1",
"twistor/flysystem-guzzle": "^6.0",
"ueberdosis/html-to-prosemirror": "^1.0",
"ueberdosis/prosemirror-to-html": "^2.0",
"wilderborn/partyline": "^1.0"
Expand All @@ -31,7 +30,7 @@
"fzaninotto/faker": "~1.4",
"google/cloud-translate": "^1.6",
"mockery/mockery": "^1.2.3",
"orchestra/testbench": "^4.0 || ^5.0"
"orchestra/testbench": "^4.0 || ^5.0 || ^6.0"
},
"config": {
"optimize-autoloader": true,
Expand Down
Loading