Skip to content

Commit

Permalink
Make the master branch L5.4 (#13812)
Browse files Browse the repository at this point in the history
  • Loading branch information
GrahamCampbell authored and taylorotwell committed Jun 1, 2016
1 parent 95fdfb5 commit 5fec044
Show file tree
Hide file tree
Showing 30 changed files with 144 additions and 144 deletions.
28 changes: 14 additions & 14 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@
"paragonie/random_compat": "~1.4",
"psy/psysh": "0.7.*",
"swiftmailer/swiftmailer": "~5.1",
"symfony/console": "3.1.*",
"symfony/debug": "3.1.*",
"symfony/finder": "3.1.*",
"symfony/http-foundation": "3.1.*",
"symfony/http-kernel": "3.1.*",
"symfony/process": "3.1.*",
"symfony/routing": "3.1.*",
"symfony/translation": "3.1.*",
"symfony/var-dumper": "3.1.*",
"symfony/console": "3.2.*",
"symfony/debug": "3.2.*",
"symfony/finder": "3.2.*",
"symfony/http-foundation": "3.2.*",
"symfony/http-kernel": "3.2.*",
"symfony/process": "3.2.*",
"symfony/routing": "3.2.*",
"symfony/translation": "3.2.*",
"symfony/var-dumper": "3.2.*",
"vlucas/phpdotenv": "~2.2"
},
"replace": {
Expand Down Expand Up @@ -75,8 +75,8 @@
"pda/pheanstalk": "~3.0",
"phpunit/phpunit": "~5.4",
"predis/predis": "~1.0",
"symfony/css-selector": "3.1.*",
"symfony/dom-crawler": "3.1.*"
"symfony/css-selector": "3.2.*",
"symfony/dom-crawler": "3.2.*"
},
"autoload": {
"classmap": [
Expand All @@ -92,7 +92,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "5.3-dev"
"dev-master": "5.4-dev"
}
},
"suggest": {
Expand All @@ -105,8 +105,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 (~2.0).",
"symfony/css-selector": "Required to use some of the crawler integration testing tools (3.1.*).",
"symfony/dom-crawler": "Required to use most of the crawler integration testing tools (3.1.*).",
"symfony/css-selector": "Required to use some of the crawler integration testing tools (3.2.*).",
"symfony/dom-crawler": "Required to use most of the crawler integration testing tools (3.2.*).",
"symfony/psr-http-message-bridge": "Required to psr7 bridging features (0.2.*)."
},
"minimum-stability": "dev"
Expand Down
14 changes: 7 additions & 7 deletions src/Illuminate/Auth/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
],
"require": {
"php": ">=5.6.4",
"illuminate/contracts": "5.3.*",
"illuminate/http": "5.3.*",
"illuminate/support": "5.3.*",
"illuminate/contracts": "5.4.*",
"illuminate/http": "5.4.*",
"illuminate/support": "5.4.*",
"nesbot/carbon": "~1.20"
},
"autoload": {
Expand All @@ -27,13 +27,13 @@
},
"extra": {
"branch-alias": {
"dev-master": "5.3-dev"
"dev-master": "5.4-dev"
}
},
"suggest": {
"illuminate/console": "Required to use the auth:clear-resets command (5.3.*).",
"illuminate/queue": "Required to fire login / logout events (5.3.*).",
"illuminate/session": "Required to use the session based guard (5.3.*)."
"illuminate/console": "Required to use the auth:clear-resets command (5.4.*).",
"illuminate/queue": "Required to fire login / logout events (5.4.*).",
"illuminate/session": "Required to use the session based guard (5.4.*)."
},
"minimum-stability": "dev"
}
6 changes: 3 additions & 3 deletions src/Illuminate/Broadcasting/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
],
"require": {
"php": ">=5.6.4",
"illuminate/contracts": "5.3.*",
"illuminate/support": "5.3.*"
"illuminate/contracts": "5.4.*",
"illuminate/support": "5.4.*"
},
"autoload": {
"psr-4": {
Expand All @@ -25,7 +25,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "5.3-dev"
"dev-master": "5.4-dev"
}
},
"suggest": {
Expand Down
8 changes: 4 additions & 4 deletions src/Illuminate/Bus/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
],
"require": {
"php": ">=5.6.4",
"illuminate/contracts": "5.3.*",
"illuminate/pipeline": "5.3.*",
"illuminate/support": "5.3.*"
"illuminate/contracts": "5.4.*",
"illuminate/pipeline": "5.4.*",
"illuminate/support": "5.4.*"
},
"autoload": {
"psr-4": {
Expand All @@ -26,7 +26,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "5.3-dev"
"dev-master": "5.4-dev"
}
},
"minimum-stability": "dev"
Expand Down
12 changes: 6 additions & 6 deletions src/Illuminate/Cache/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
],
"require": {
"php": ">=5.6.4",
"illuminate/contracts": "5.3.*",
"illuminate/support": "5.3.*",
"illuminate/contracts": "5.4.*",
"illuminate/support": "5.4.*",
"nesbot/carbon": "~1.20"
},
"autoload": {
Expand All @@ -26,13 +26,13 @@
},
"extra": {
"branch-alias": {
"dev-master": "5.3-dev"
"dev-master": "5.4-dev"
}
},
"suggest": {
"illuminate/database": "Required to use the database cache driver (5.3.*).",
"illuminate/filesystem": "Required to use the file cache driver (5.3.*).",
"illuminate/redis": "Required to use the redis cache driver (5.3.*)."
"illuminate/database": "Required to use the database cache driver (5.4.*).",
"illuminate/filesystem": "Required to use the file cache driver (5.4.*).",
"illuminate/redis": "Required to use the redis cache driver (5.4.*)."
},
"minimum-stability": "dev"
}
8 changes: 4 additions & 4 deletions src/Illuminate/Config/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
],
"require": {
"php": ">=5.6.4",
"illuminate/contracts": "5.3.*",
"illuminate/filesystem": "5.3.*",
"illuminate/support": "5.3.*"
"illuminate/contracts": "5.4.*",
"illuminate/filesystem": "5.4.*",
"illuminate/support": "5.4.*"
},
"autoload": {
"psr-4": {
Expand All @@ -26,7 +26,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "5.3-dev"
"dev-master": "5.4-dev"
}
},
"minimum-stability": "dev"
Expand Down
10 changes: 5 additions & 5 deletions src/Illuminate/Console/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
],
"require": {
"php": ">=5.6.4",
"illuminate/contracts": "5.3.*",
"illuminate/support": "5.3.*",
"illuminate/contracts": "5.4.*",
"illuminate/support": "5.4.*",
"nesbot/carbon": "~1.20",
"symfony/console": "3.1.*"
"symfony/console": "3.2.*"
},
"autoload": {
"psr-4": {
Expand All @@ -27,13 +27,13 @@
},
"extra": {
"branch-alias": {
"dev-master": "5.3-dev"
"dev-master": "5.4-dev"
}
},
"suggest": {
"guzzlehttp/guzzle": "Required to use the ping methods on schedules (~5.3|~6.0).",
"mtdowling/cron-expression": "Required to use scheduling component (~1.0).",
"symfony/process": "Required to use scheduling component (3.1.*)."
"symfony/process": "Required to use scheduling component (3.2.*)."
},
"minimum-stability": "dev"
}
4 changes: 2 additions & 2 deletions src/Illuminate/Container/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
],
"require": {
"php": ">=5.6.4",
"illuminate/contracts": "5.3.*"
"illuminate/contracts": "5.4.*"
},
"autoload": {
"psr-4": {
Expand All @@ -24,7 +24,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "5.3-dev"
"dev-master": "5.4-dev"
}
},
"minimum-stability": "dev"
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Contracts/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "5.3-dev"
"dev-master": "5.4-dev"
}
},
"minimum-stability": "dev"
Expand Down
10 changes: 5 additions & 5 deletions src/Illuminate/Cookie/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
],
"require": {
"php": ">=5.6.4",
"illuminate/contracts": "5.3.*",
"illuminate/support": "5.3.*",
"symfony/http-foundation": "3.1.*",
"symfony/http-kernel": "3.1.*"
"illuminate/contracts": "5.4.*",
"illuminate/support": "5.4.*",
"symfony/http-foundation": "3.2.*",
"symfony/http-kernel": "3.2.*"
},
"autoload": {
"psr-4": {
Expand All @@ -27,7 +27,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "5.3-dev"
"dev-master": "5.4-dev"
}
},
"minimum-stability": "dev"
Expand Down
16 changes: 8 additions & 8 deletions src/Illuminate/Database/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
],
"require": {
"php": ">=5.6.4",
"illuminate/container": "5.3.*",
"illuminate/contracts": "5.3.*",
"illuminate/support": "5.3.*",
"illuminate/container": "5.4.*",
"illuminate/contracts": "5.4.*",
"illuminate/support": "5.4.*",
"nesbot/carbon": "~1.20"
},
"autoload": {
Expand All @@ -28,16 +28,16 @@
},
"extra": {
"branch-alias": {
"dev-master": "5.3-dev"
"dev-master": "5.4-dev"
}
},
"suggest": {
"doctrine/dbal": "Required to rename columns and drop SQLite columns (~2.4).",
"fzaninotto/faker": "Required to use the eloquent factory builder (~1.4).",
"illuminate/console": "Required to use the database commands (5.3.*).",
"illuminate/events": "Required to use the observers with Eloquent (5.3.*).",
"illuminate/filesystem": "Required to use the migrations (5.3.*).",
"illuminate/pagination": "Required to paginate the result set (5.3.*)."
"illuminate/console": "Required to use the database commands (5.4.*).",
"illuminate/events": "Required to use the observers with Eloquent (5.4.*).",
"illuminate/filesystem": "Required to use the migrations (5.4.*).",
"illuminate/pagination": "Required to paginate the result set (5.4.*)."
},
"minimum-stability": "dev"
}
6 changes: 3 additions & 3 deletions src/Illuminate/Encryption/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
"php": ">=5.6.4",
"ext-mbstring": "*",
"ext-openssl": "*",
"illuminate/contracts": "5.3.*",
"illuminate/support": "5.3.*",
"illuminate/contracts": "5.4.*",
"illuminate/support": "5.4.*",
"paragonie/random_compat": "~1.4"
},
"autoload": {
Expand All @@ -28,7 +28,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "5.3-dev"
"dev-master": "5.4-dev"
}
},
"minimum-stability": "dev"
Expand Down
8 changes: 4 additions & 4 deletions src/Illuminate/Events/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
],
"require": {
"php": ">=5.6.4",
"illuminate/container": "5.3.*",
"illuminate/contracts": "5.3.*",
"illuminate/support": "5.3.*"
"illuminate/container": "5.4.*",
"illuminate/contracts": "5.4.*",
"illuminate/support": "5.4.*"
},
"autoload": {
"psr-4": {
Expand All @@ -26,7 +26,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "5.3-dev"
"dev-master": "5.4-dev"
}
},
"minimum-stability": "dev"
Expand Down
8 changes: 4 additions & 4 deletions src/Illuminate/Filesystem/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
],
"require": {
"php": ">=5.6.4",
"illuminate/contracts": "5.3.*",
"illuminate/support": "5.3.*",
"symfony/finder": "3.1.*"
"illuminate/contracts": "5.4.*",
"illuminate/support": "5.4.*",
"symfony/finder": "3.2.*"
},
"autoload": {
"psr-4": {
Expand All @@ -26,7 +26,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "5.3-dev"
"dev-master": "5.4-dev"
}
},
"suggest": {
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Foundation/Application.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class Application extends Container implements ApplicationContract, HttpKernelIn
*
* @var string
*/
const VERSION = '5.3.0-Dev';
const VERSION = '5.4.0-Dev';

/**
* The base path for the Laravel installation.
Expand Down
6 changes: 3 additions & 3 deletions src/Illuminate/Hashing/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
],
"require": {
"php": ">=5.6.4",
"illuminate/contracts": "5.3.*",
"illuminate/support": "5.3.*"
"illuminate/contracts": "5.4.*",
"illuminate/support": "5.4.*"
},
"autoload": {
"psr-4": {
Expand All @@ -25,7 +25,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "5.3-dev"
"dev-master": "5.4-dev"
}
},
"minimum-stability": "dev"
Expand Down
Loading

0 comments on commit 5fec044

Please sign in to comment.