Merge pull request #4083 from laravel/tinker

[5.4] Added tinker to the default app
2016-12-29 16:55:25 -06:00 · 2016-12-29 16:55:25 -06:00 · b748931666
parent df1298bfcc 380c3a76a0
commit b748931666
2 changed files with 3 additions and 3 deletions
--- a/composer.json
+++ b/composer.json
@ -6,7 +6,8 @@
    "type": "project",
    "require": {
        "php": ">=5.6.4",
-        "laravel/framework": "5.4.*"
+        "laravel/framework": "5.4.*",
+        "laravel/tinker": "~1.0"
    },
    "require-dev": {
        "fzaninotto/faker": "~1.4",
--- a/config/app.php
+++ b/config/app.php
@ -166,8 +166,7 @@
        /*
         * Package Service Providers...
         */
-
-        //
+        Laravel\Tinker\TinkerServiceProvider::class,

        /*
         * Application Service Providers...