Merge pull request #98 from laravel/input-options

[2.x] Forward input options to psysh

Author: taylorotwell

composer.json

@@ -14,12 +14,12 @@
         "illuminate/console": "^6.0|^7.0|^8.0",
         "illuminate/contracts": "^6.0|^7.0|^8.0",
         "illuminate/support": "^6.0|^7.0|^8.0",
-        "psy/psysh": "^0.9|^0.10",
-        "symfony/var-dumper": "^4.0|^5.0"
+        "psy/psysh": "^0.10.3",
+        "symfony/var-dumper": "^4.3|^5.0"
     },
     "require-dev": {
         "mockery/mockery": "^1.3.1",
-        "phpunit/phpunit": "^8.0|^9.0"
+        "phpunit/phpunit": "^8.4|^9.0"
     },
     "suggest": {
         "illuminate/database": "The Illuminate Database package (^6.0|^7.0|^8.0)."

src/Console/TinkerCommand.php

@@ -3,9 +3,11 @@
 namespace Laravel\Tinker\Console;
 
 use Illuminate\Console\Command;
+use Illuminate\Support\Env;
 use Laravel\Tinker\ClassAliasAutoloader;
 use Psy\Configuration;
 use Psy\Shell;
+use Psy\VersionUpdater\Checker;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
 
@@ -43,9 +45,8 @@ public function handle()
     {
         $this->getApplication()->setCatchExceptions(false);
 
-        $config = new Configuration([
-            'updateCheck' => 'never',
-        ]);
+        $config = Configuration::fromInput($this->input);
+        $config->setUpdateCheck(Checker::NEVER);
 
         $config->getPresenter()->addCasters(
             $this->getCasters()
@@ -55,11 +56,7 @@ public function handle()
         $shell->addCommands($this->getCommands());
         $shell->setIncludes($this->argument('include'));
 
-        if (isset($_ENV['COMPOSER_VENDOR_DIR'])) {
-            $path = $_ENV['COMPOSER_VENDOR_DIR'];
-        } else {
-            $path = $this->getLaravel()->basePath().DIRECTORY_SEPARATOR.'vendor';
-        }
+        $path = Env::get('COMPOSER_VENDOR_DIR', $this->getLaravel()->basePath().DIRECTORY_SEPARATOR.'vendor');
 
         $path .= '/composer/autoload_classmap.php';