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.

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

[7.x] Delete Me #32304

Closed
wants to merge 76 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
e6121e0
Fixed merge
GrahamCampbell Feb 19, 2020
828bf37
Bumped version (#31529)
GrahamCampbell Feb 19, 2020
5c6c916
Merge branch '7.x'
GrahamCampbell Feb 19, 2020
14a9515
Use testbench-core 6
GrahamCampbell Feb 20, 2020
382875a
Merge pull request #31538 from laravel/testbench-core
driesvints Feb 20, 2020
2c455dc
Merge branch '7.x'
GrahamCampbell Feb 20, 2020
0f1b6c9
Merge branch '7.x'
GrahamCampbell Feb 21, 2020
58d08d7
Merge branch '7.x'
GrahamCampbell Feb 22, 2020
2e6eb24
Merge branch '7.x'
GrahamCampbell Feb 22, 2020
d373bdf
Merge branch '7.x'
GrahamCampbell Feb 23, 2020
6fd2eda
Merge branch '7.x'
driesvints Feb 24, 2020
ac94825
Merge branch '7.x'
GrahamCampbell Feb 24, 2020
5730dfa
Bumped minimum symfony (#31542)
GrahamCampbell Feb 24, 2020
aa60586
Merge branch '6.x'
taylorotwell Feb 24, 2020
be1494a
Merge branch '6.x'
taylorotwell Feb 24, 2020
56dc495
Merge branch '7.x'
GrahamCampbell Feb 25, 2020
735efaf
Fixed merge
GrahamCampbell Feb 25, 2020
bee5307
Merge branch '7.x'
GrahamCampbell Feb 25, 2020
83e0e92
Merge branch '7.x'
GrahamCampbell Feb 25, 2020
b484d8e
Merge branch '7.x'
GrahamCampbell Feb 26, 2020
ba37847
Merge branch '6.x'
taylorotwell Feb 28, 2020
e1e0060
Merge branch '7.x'
GrahamCampbell Feb 28, 2020
a6b1016
Merge branch '7.x'
GrahamCampbell Feb 29, 2020
7dfd5d0
Merge branch '7.x'
GrahamCampbell Mar 1, 2020
79132b3
Merge branch '7.x'
GrahamCampbell Mar 2, 2020
f3e2824
Merge branch '7.x'
GrahamCampbell Mar 2, 2020
315ac7f
Merge branch '7.x'
GrahamCampbell Mar 3, 2020
0fb3263
fix conflicts
taylorotwell Mar 3, 2020
aabae2d
Merge branch '7.x'
GrahamCampbell Mar 4, 2020
4f4cf28
Merge branch '7.x'
GrahamCampbell Mar 6, 2020
a567426
Merge branch '7.x'
GrahamCampbell Mar 6, 2020
c360365
Merge branch '7.x'
GrahamCampbell Mar 9, 2020
b91ba76
Make offsetExists behave correctly for isset on Collection (#31800)
phroggyy Mar 9, 2020
b6063e6
Merge branch '7.x'
GrahamCampbell Mar 9, 2020
a31178b
Merge branch '7.x'
GrahamCampbell Mar 10, 2020
e67b7fb
Merge branch '7.x'
GrahamCampbell Mar 11, 2020
c05c4a8
Merge branch '7.x'
GrahamCampbell Mar 12, 2020
8de565f
Merge branch '7.x'
GrahamCampbell Mar 12, 2020
d2b58f1
Merge branch '7.x'
GrahamCampbell Mar 12, 2020
d1fb42f
Merge branch '7.x'
GrahamCampbell Mar 12, 2020
f9a0c2c
Merge branch '7.x'
GrahamCampbell Mar 12, 2020
a995889
Merge branch '7.x'
GrahamCampbell Mar 13, 2020
4f3a6d1
Merge branch '7.x'
GrahamCampbell Mar 15, 2020
82ecb04
Merge branch '7.x'
GrahamCampbell Mar 17, 2020
8200bd8
Merge branch '7.x'
GrahamCampbell Mar 19, 2020
4655618
Merge branch '7.x'
GrahamCampbell Mar 21, 2020
2f20a5d
Merge branch '7.x'
GrahamCampbell Mar 22, 2020
2653f46
Merge branch '7.x'
driesvints Mar 23, 2020
326757c
Merge branch '7.x'
GrahamCampbell Mar 23, 2020
9e55f71
Merge branch '7.x'
GrahamCampbell Mar 24, 2020
bc6a289
Merge branch '7.x'
GrahamCampbell Mar 24, 2020
21382b7
Merge branch 'master' of github.com:laravel/framework
GrahamCampbell Mar 24, 2020
7527907
Merge branch '7.x'
driesvints Mar 24, 2020
41a059f
Merge branch '7.x'
GrahamCampbell Mar 24, 2020
7ae31e3
Merge branch '7.x'
GrahamCampbell Mar 25, 2020
a988b65
Switched to dragonmantank/cron-expression v3 (#32114)
GrahamCampbell Mar 26, 2020
169cbe8
[7.x] Fixed component class view reference (#32132)
innoflash Mar 27, 2020
c77bdd7
Merge branch '7.x'
GrahamCampbell Mar 29, 2020
af79dd1
Merge branch '7.x'
driesvints Mar 30, 2020
cdf7ebc
[8.x] Removed deprecated code (#32092)
GrahamCampbell Mar 30, 2020
9c4ed34
Return exit code 0 instead of boolean true (#32200)
JaZo Apr 2, 2020
8a243a9
fix conflicts
taylorotwell Apr 2, 2020
4d228d6
pass arguments to castUsing
taylorotwell Apr 2, 2020
9ffd755
test using anonymous class
taylorotwell Apr 2, 2020
39882f5
Merge branch '7.x'
GrahamCampbell Apr 3, 2020
64b3a65
Merge branch '7.x'
driesvints Apr 3, 2020
c4f596e
Merge branch '7.x'
GrahamCampbell Apr 3, 2020
5d0921f
Merge branch '7.x'
GrahamCampbell Apr 4, 2020
582944c
formatting and fix conflicts
taylorotwell Apr 4, 2020
db92536
Drop ramsey/uuid v3 (#32232)
GrahamCampbell Apr 5, 2020
0b2ce4c
Schema Dump (#32275)
taylorotwell Apr 7, 2020
1ba681e
fix conflicts
taylorotwell Apr 7, 2020
f4c6c63
Merge branch '7.x'
GrahamCampbell Apr 7, 2020
c473d89
Merge branch '7.x'
GrahamCampbell Apr 8, 2020
6a35d38
Merge branch '7.x'
GrahamCampbell Apr 8, 2020
959d726
Replace while with for to optimize performance
lancepioch Apr 9, 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
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
strategy:
fail-fast: true
matrix:
php: [7.2, 7.3, 7.4]
php: [7.3, 7.4]
stability: [prefer-lowest, prefer-stable]

name: PHP ${{ matrix.php }} - ${{ matrix.stability }}
Expand Down
2 changes: 1 addition & 1 deletion bin/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ then
exit 1
fi

RELEASE_BRANCH="7.x"
RELEASE_BRANCH="master"
CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
VERSION=$1

Expand Down
2 changes: 1 addition & 1 deletion bin/split.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -e
set -x

CURRENT_BRANCH="7.x"
CURRENT_BRANCH="master"

function split()
{
Expand Down
34 changes: 16 additions & 18 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
}
],
"require": {
"php": "^7.2.5",
"php": "^7.3",
"ext-json": "*",
"ext-mbstring": "*",
"ext-openssl": "*",
"doctrine/inflector": "^1.1",
"dragonmantank/cron-expression": "^2.0",
"dragonmantank/cron-expression": "^3.0",
"egulias/email-validator": "^2.1.10",
"league/commonmark": "^1.3",
"league/flysystem": "^1.0.8",
Expand All @@ -29,17 +29,17 @@
"opis/closure": "^3.1",
"psr/container": "^1.0",
"psr/simple-cache": "^1.0",
"ramsey/uuid": "^3.7|^4.0",
"ramsey/uuid": "^4.0",
"swiftmailer/swiftmailer": "^6.0",
"symfony/console": "^5.0",
"symfony/error-handler": "^5.0",
"symfony/finder": "^5.0",
"symfony/http-foundation": "^5.0",
"symfony/http-kernel": "^5.0",
"symfony/mime": "^5.0",
"symfony/process": "^5.0",
"symfony/routing": "^5.0",
"symfony/var-dumper": "^5.0",
"symfony/console": "^5.1",
"symfony/error-handler": "^5.1",
"symfony/finder": "^5.1",
"symfony/http-foundation": "^5.1",
"symfony/http-kernel": "^5.1",
"symfony/mime": "^5.1",
"symfony/process": "^5.1",
"symfony/routing": "^5.1",
"symfony/var-dumper": "^5.1",
"tijsverkoyen/css-to-inline-styles": "^2.2.2",
"vlucas/phpdotenv": "^4.0",
"voku/portable-ascii": "^1.4.8"
Expand Down Expand Up @@ -82,12 +82,11 @@
"guzzlehttp/guzzle": "^6.3.1|^7.0",
"league/flysystem-cached-adapter": "^1.0",
"mockery/mockery": "^1.3.1",
"moontoast/math": "^1.1",
"orchestra/testbench-core": "^5.0",
"orchestra/testbench-core": "^6.0",
"pda/pheanstalk": "^4.0",
"phpunit/phpunit": "^8.4|^9.0",
"predis/predis": "^1.1.1",
"symfony/cache": "^5.0"
"symfony/cache": "^5.1"
},
"conflict": {
"tightenco/collect": "<5.5.33"
Expand All @@ -111,7 +110,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "7.x-dev"
"dev-master": "8.x-dev"
}
},
"suggest": {
Expand All @@ -130,13 +129,12 @@
"league/flysystem-cached-adapter": "Required to use the Flysystem cache (^1.0).",
"league/flysystem-sftp": "Required to use the Flysystem SFTP driver (^1.0).",
"mockery/mockery": "Required to use mocking (^1.3.1).",
"moontoast/math": "Required to use ordered UUIDs (^1.1).",
"nyholm/psr7": "Required to use PSR-7 bridging features (^1.2).",
"pda/pheanstalk": "Required to use the beanstalk queue driver (^4.0).",
"phpunit/phpunit": "Required to use assertions and run tests (^8.4|^9.0).",
"psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).",
"pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^4.0).",
"symfony/cache": "Required to PSR-6 cache bridge (^5.0).",
"symfony/cache": "Required to PSR-6 cache bridge (^5.1).",
"symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^2.0).",
"wildbit/swiftmailer-postmark": "Required to use Postmark mail driver (^3.0)."
},
Expand Down
18 changes: 9 additions & 9 deletions src/Illuminate/Auth/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
}
],
"require": {
"php": "^7.2.5",
"illuminate/contracts": "^7.0",
"illuminate/http": "^7.0",
"illuminate/queue": "^7.0",
"illuminate/support": "^7.0"
"php": "^7.3",
"illuminate/contracts": "^8.0",
"illuminate/http": "^8.0",
"illuminate/queue": "^8.0",
"illuminate/support": "^8.0"
},
"autoload": {
"psr-4": {
Expand All @@ -27,13 +27,13 @@
},
"extra": {
"branch-alias": {
"dev-master": "7.x-dev"
"dev-master": "8.x-dev"
}
},
"suggest": {
"illuminate/console": "Required to use the auth:clear-resets command (^7.0).",
"illuminate/queue": "Required to fire login / logout events (^7.0).",
"illuminate/session": "Required to use the session based guard (^7.0)."
"illuminate/console": "Required to use the auth:clear-resets command (^8.0).",
"illuminate/queue": "Required to fire login / logout events (^8.0).",
"illuminate/session": "Required to use the session based guard (^8.0)."
},
"config": {
"sort-packages": true
Expand Down
12 changes: 6 additions & 6 deletions src/Illuminate/Broadcasting/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
}
],
"require": {
"php": "^7.2.5",
"php": "^7.3",
"ext-json": "*",
"psr/log": "^1.0",
"illuminate/bus": "^7.0",
"illuminate/contracts": "^7.0",
"illuminate/queue": "^7.0",
"illuminate/support": "^7.0"
"illuminate/bus": "^8.0",
"illuminate/contracts": "^8.0",
"illuminate/queue": "^8.0",
"illuminate/support": "^8.0"
},
"autoload": {
"psr-4": {
Expand All @@ -29,7 +29,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "7.x-dev"
"dev-master": "8.x-dev"
}
},
"suggest": {
Expand Down
10 changes: 5 additions & 5 deletions src/Illuminate/Bus/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
}
],
"require": {
"php": "^7.2.5",
"illuminate/contracts": "^7.0",
"illuminate/pipeline": "^7.0",
"illuminate/support": "^7.0"
"php": "^7.3",
"illuminate/contracts": "^8.0",
"illuminate/pipeline": "^8.0",
"illuminate/support": "^8.0"
},
"autoload": {
"psr-4": {
Expand All @@ -26,7 +26,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "7.x-dev"
"dev-master": "8.x-dev"
}
},
"suggest": {
Expand Down
16 changes: 8 additions & 8 deletions src/Illuminate/Cache/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
}
],
"require": {
"php": "^7.2.5",
"illuminate/contracts": "^7.0",
"illuminate/support": "^7.0"
"php": "^7.3",
"illuminate/contracts": "^8.0",
"illuminate/support": "^8.0"
},
"autoload": {
"psr-4": {
Expand All @@ -25,15 +25,15 @@
},
"extra": {
"branch-alias": {
"dev-master": "7.x-dev"
"dev-master": "8.x-dev"
}
},
"suggest": {
"ext-memcached": "Required to use the memcache cache driver.",
"illuminate/database": "Required to use the database cache driver (^7.0).",
"illuminate/filesystem": "Required to use the file cache driver (^7.0).",
"illuminate/redis": "Required to use the redis cache driver (^7.0).",
"symfony/cache": "Required to PSR-6 cache bridge (^5.0)."
"illuminate/database": "Required to use the database cache driver (^8.0).",
"illuminate/filesystem": "Required to use the file cache driver (^8.0).",
"illuminate/redis": "Required to use the redis cache driver (^8.0).",
"symfony/cache": "Required to PSR-6 cache bridge (^5.1)."
},
"config": {
"sort-packages": true
Expand Down
8 changes: 4 additions & 4 deletions src/Illuminate/Config/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
}
],
"require": {
"php": "^7.2.5",
"illuminate/contracts": "^7.0",
"illuminate/support": "^7.0"
"php": "^7.3",
"illuminate/contracts": "^8.0",
"illuminate/support": "^8.0"
},
"autoload": {
"psr-4": {
Expand All @@ -25,7 +25,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "7.x-dev"
"dev-master": "8.x-dev"
}
},
"config": {
Expand Down
22 changes: 11 additions & 11 deletions src/Illuminate/Console/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
}
],
"require": {
"php": "^7.2.5",
"illuminate/contracts": "^7.0",
"illuminate/support": "^7.0",
"symfony/console": "^5.0",
"symfony/process": "^5.0"
"php": "^7.3",
"illuminate/contracts": "^8.0",
"illuminate/support": "^8.0",
"symfony/console": "^5.1",
"symfony/process": "^5.1"
},
"autoload": {
"psr-4": {
Expand All @@ -27,16 +27,16 @@
},
"extra": {
"branch-alias": {
"dev-master": "7.x-dev"
"dev-master": "8.x-dev"
}
},
"suggest": {
"dragonmantank/cron-expression": "Required to use scheduler (^2.0).",
"dragonmantank/cron-expression": "Required to use scheduler (^3.0).",
"guzzlehttp/guzzle": "Required to use the ping methods on schedules (^6.3.1|^7.0).",
"illuminate/bus": "Required to use the scheduled job dispatcher (^7.0)",
"illuminate/container": "Required to use the scheduler (^7.0)",
"illuminate/filesystem": "Required to use the generator command (^7.0)",
"illuminate/queue": "Required to use closures for scheduled jobs (^7.0)"
"illuminate/bus": "Required to use the scheduled job dispatcher (^8.0)",
"illuminate/container": "Required to use the scheduler (^8.0)",
"illuminate/filesystem": "Required to use the generator command (^8.0)",
"illuminate/queue": "Required to use closures for scheduled jobs (^8.0)"
},
"config": {
"sort-packages": true
Expand Down
6 changes: 3 additions & 3 deletions src/Illuminate/Container/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
}
],
"require": {
"php": "^7.2.5",
"illuminate/contracts": "^7.0",
"php": "^7.3",
"illuminate/contracts": "^8.0",
"psr/container": "^1.0"
},
"autoload": {
Expand All @@ -25,7 +25,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "7.x-dev"
"dev-master": "8.x-dev"
}
},
"config": {
Expand Down
4 changes: 3 additions & 1 deletion src/Illuminate/Contracts/Database/Eloquent/Castable.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ interface Castable
/**
* Get the name of the caster class to use when casting from / to this cast target.
*
* @param array $arguments
* @return string
* @return string|\Illuminate\Contracts\Database\Eloquent\CastsAttributes|\Illuminate\Contracts\Database\Eloquent\CastsInboundAttributes
*/
public static function castUsing();
public static function castUsing(array $arguments);
}
4 changes: 2 additions & 2 deletions src/Illuminate/Contracts/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
}
],
"require": {
"php": "^7.2.5",
"php": "^7.3",
"psr/container": "^1.0",
"psr/simple-cache": "^1.0"
},
Expand All @@ -25,7 +25,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "7.x-dev"
"dev-master": "8.x-dev"
}
},
"config": {
Expand Down
12 changes: 6 additions & 6 deletions src/Illuminate/Cookie/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
}
],
"require": {
"php": "^7.2.5",
"illuminate/contracts": "^7.0",
"illuminate/support": "^7.0",
"symfony/http-foundation": "^5.0",
"symfony/http-kernel": "^5.0"
"php": "^7.3",
"illuminate/contracts": "^8.0",
"illuminate/support": "^8.0",
"symfony/http-foundation": "^5.1",
"symfony/http-kernel": "^5.1"
},
"autoload": {
"psr-4": {
Expand All @@ -27,7 +27,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "7.x-dev"
"dev-master": "8.x-dev"
}
},
"config": {
Expand Down
Loading