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

[5.6] Symfony 4 Upgrade #22450

Merged
merged 2 commits into from
Dec 16, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 13 additions & 13 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@
"psr/simple-cache": "^1.0",
"ramsey/uuid": "~3.0",
"swiftmailer/swiftmailer": "~6.0",
"symfony/console": "~3.3",
"symfony/debug": "~3.3",
"symfony/finder": "~3.3",
"symfony/http-foundation": "~3.3",
"symfony/http-kernel": "~3.3",
"symfony/process": "~3.3",
"symfony/routing": "~3.3",
"symfony/var-dumper": "~3.3",
"tijsverkoyen/css-to-inline-styles": "~2.2",
"symfony/console": "~4.0",
"symfony/debug": "~4.0",
"symfony/finder": "~4.0",
"symfony/http-foundation": "~4.0",
"symfony/http-kernel": "~4.0",
"symfony/process": "~4.0",
"symfony/routing": "~4.0",
"symfony/var-dumper": "~4.0",
"tijsverkoyen/css-to-inline-styles": "dev-master",
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Waiting on new tagged release here.

"vlucas/phpdotenv": "~2.2"
},
"replace": {
Expand Down Expand Up @@ -79,8 +79,8 @@
"pda/pheanstalk": "~3.0",
"phpunit/phpunit": "~6.0",
"predis/predis": "^1.1.1",
"symfony/css-selector": "~3.3",
"symfony/dom-crawler": "~3.3"
"symfony/css-selector": "~4.0",
"symfony/dom-crawler": "~4.0"
},
"autoload": {
"files": [
Expand Down Expand Up @@ -119,8 +119,8 @@
"pda/pheanstalk": "Required to use the beanstalk queue driver (~3.0).",
"predis/predis": "Required to use the redis cache and queue drivers (~1.0).",
"pusher/pusher-php-server": "Required to use the Pusher broadcast driver (~3.0).",
"symfony/css-selector": "Required to use some of the crawler integration testing tools (~3.3).",
"symfony/dom-crawler": "Required to use most of the crawler integration testing tools (~3.3).",
"symfony/css-selector": "Required to use some of the crawler integration testing tools (~4.0).",
"symfony/dom-crawler": "Required to use most of the crawler integration testing tools (~4.0).",
"symfony/psr-http-message-bridge": "Required to psr7 bridging features (~1.0)."
},
"config": {
Expand Down
4 changes: 2 additions & 2 deletions src/Illuminate/Console/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"php": "^7.1.3",
"illuminate/contracts": "5.6.*",
"illuminate/support": "5.6.*",
"symfony/console": "~3.3"
"symfony/console": "~4.0"
},
"autoload": {
"psr-4": {
Expand All @@ -32,7 +32,7 @@
"suggest": {
"dragonmantank/cron-expression": "Required to use scheduling component (~2.0).",
"guzzlehttp/guzzle": "Required to use the ping methods on schedules (~6.0).",
"symfony/process": "Required to use scheduling component (~3.3)."
"symfony/process": "Required to use scheduling component (~4.0)."
},
"config": {
"sort-packages": true
Expand Down
4 changes: 2 additions & 2 deletions src/Illuminate/Cookie/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
"php": "^7.1.3",
"illuminate/contracts": "5.6.*",
"illuminate/support": "5.6.*",
"symfony/http-foundation": "~3.3",
"symfony/http-kernel": "~3.3"
"symfony/http-foundation": "~4.0",
"symfony/http-kernel": "~4.0"
},
"autoload": {
"psr-4": {
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Filesystem/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"php": "^7.1.3",
"illuminate/contracts": "5.6.*",
"illuminate/support": "5.6.*",
"symfony/finder": "~3.3"
"symfony/finder": "~4.0"
},
"autoload": {
"psr-4": {
Expand Down
4 changes: 2 additions & 2 deletions src/Illuminate/Http/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
"php": "^7.1.3",
"illuminate/session": "5.6.*",
"illuminate/support": "5.6.*",
"symfony/http-foundation": "~3.3",
"symfony/http-kernel": "~3.3"
"symfony/http-foundation": "~4.0",
"symfony/http-kernel": "~4.0"
},
"autoload": {
"psr-4": {
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Mail/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"illuminate/support": "5.6.*",
"psr/log": "~1.0",
"swiftmailer/swiftmailer": "~6.0",
"tijsverkoyen/css-to-inline-styles": "~2.2"
"tijsverkoyen/css-to-inline-styles": "dev-master"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And here.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@GrahamCampbell This has been tagged 27 days ago (2.2.1) is it worth changing it from dev-master. Seems that laravel shouldn't really rely on a branch as a dependency.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this was updated 27 days ago.

},
"autoload": {
"psr-4": {
Expand Down
4 changes: 2 additions & 2 deletions src/Illuminate/Queue/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
"illuminate/database": "5.6.*",
"illuminate/filesystem": "5.6.*",
"illuminate/support": "5.6.*",
"symfony/debug": "~3.3",
"symfony/process": "~3.3"
"symfony/debug": "~4.0",
"symfony/process": "~4.0"
},
"autoload": {
"psr-4": {
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Routing/RouteCompiler.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public function compile()
$uri = preg_replace('/\{(\w+?)\?\}/', '{$1}', $this->route->uri());

return (
new SymfonyRoute($uri, $optionals, $this->route->wheres, [], $this->route->getDomain() ?: '')
new SymfonyRoute($uri, $optionals, $this->route->wheres, ['utf8' => true], $this->route->getDomain() ?: '')
)->compile();
}

Expand Down
8 changes: 4 additions & 4 deletions src/Illuminate/Routing/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
"illuminate/pipeline": "5.6.*",
"illuminate/session": "5.6.*",
"illuminate/support": "5.6.*",
"symfony/debug": "~3.3",
"symfony/http-foundation": "~3.3",
"symfony/http-kernel": "~3.3",
"symfony/routing": "~3.3"
"symfony/debug": "~4.0",
"symfony/http-foundation": "~4.0",
"symfony/http-kernel": "~4.0",
"symfony/routing": "~4.0"
},
"autoload": {
"psr-4": {
Expand Down
4 changes: 2 additions & 2 deletions src/Illuminate/Session/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"illuminate/contracts": "5.6.*",
"illuminate/filesystem": "5.6.*",
"illuminate/support": "5.6.*",
"symfony/finder": "~3.3",
"symfony/http-foundation": "~3.3"
"symfony/finder": "~4.0",
"symfony/http-foundation": "~4.0"
},
"autoload": {
"psr-4": {
Expand Down
4 changes: 2 additions & 2 deletions src/Illuminate/Support/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
},
"suggest": {
"illuminate/filesystem": "Required to use the composer class (5.2.*).",
"symfony/process": "Required to use the composer class (~3.3).",
"symfony/var-dumper": "Required to use the dd function (~3.3)."
"symfony/process": "Required to use the composer class (~4.0).",
"symfony/var-dumper": "Required to use the dd function (~4.0)."
},
"config": {
"sort-packages": true
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Validation/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"illuminate/contracts": "5.6.*",
"illuminate/support": "5.6.*",
"illuminate/translation": "5.6.*",
"symfony/http-foundation": "~3.3"
"symfony/http-foundation": "~4.0"
},
"autoload": {
"psr-4": {
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/View/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"illuminate/events": "5.6.*",
"illuminate/filesystem": "5.6.*",
"illuminate/support": "5.6.*",
"symfony/debug": "~3.3"
"symfony/debug": "~4.0"
},
"autoload": {
"psr-4": {
Expand Down