Merge branch 'release/0.4.0'

Author: bobthecow

README.md

@@ -36,7 +36,7 @@ chmod +x psysh
 
 ## PsySH configuration
 
-While PsySH strives to detect the right settings automatically, you might want to configure it yourself. Just add a file to `~/.config/psysh/config.php`:
+While PsySH strives to detect the right settings automatically, you might want to configure it yourself. Just add a file to `~/.config/psysh/config.php` (or `C:\Users\{USER}\AppData\Roaming\PsySH` on Windows):
 
 ```php
 <?php
@@ -98,12 +98,22 @@ return array(
     'presenters' => array(
         new \Psy\Presenter\MongoCursorPresenter,
     ),
+
+    // You can disable tab completion if you want to. Not sure why you'd want to.
+    'tabCompletion' => false,
+
+    // You can write your own autocomplete matchers, too! Here's one that enables
+    // autocompletion for MongoDB collection names:
+    'tabCompletionMatchers' => array(
+        new \Psy\TabCompletion\Matcher\MongoClientMatcher,
+        new \Psy\TabCompletion\Matcher\MongoDatabaseMatcher,
+    ),
 );
 ```
 
 ## Downloading the manual
 
-The PsySH `doc` command is great for documenting source code, but you'll need a little something extra for PHP core documentation. Download one of the following PHP Manual files and drop it in `~/.local/share/psysh/`:
+The PsySH `doc` command is great for documenting source code, but you'll need a little something extra for PHP core documentation. Download one of the following PHP Manual files and drop it in `~/.local/share/psysh/` (or `C:\Users\{USER}\AppData\Roaming\PsySH` on Windows):
 
  * **[English](http://psysh.org/manual/en/php_manual.sqlite)**
  * [Brazilian Portuguese](http://psysh.org/manual/pt_BR/php_manual.sqlite)

bin/psysh

@@ -95,6 +95,16 @@ EOL;
     // Pass additional arguments to Shell as 'includes'
     $shell->setIncludes($input->getArgument('include'));
 
-    // And go!
-    $shell->run();
+    try {
+        // And go!
+        $shell->run();
+    } catch (Exception $e) {
+        echo $e->getMessage() . PHP_EOL;
+
+        // TODO: this triggers the "exited unexpectedly" logic in the
+        // ForkingLoop, so we can't exit(1) after starting the shell...
+        // fix this :)
+
+        // exit(1);
+    }
 });

composer.json

@@ -28,7 +28,8 @@
     "suggest": {
         "ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)",
         "ext-posix": "If you have PCNTL, you'll want the POSIX extension as well.",
-        "ext-readline": "Enables support for arrow-key history navigation, and showing and manipulating command history."
+        "ext-readline": "Enables support for arrow-key history navigation, and showing and manipulating command history.",
+        "ext-pdo-sqlite": "The doc command requires SQLite to work."
     },
     "autoload": {
         "files": ["src/Psy/functions.php"],

src/Psy/CodeCleaner/ValidClassNamePass.php

@@ -81,7 +81,7 @@ protected function validateClassStatement(ClassStmt $stmt)
     }
 
     /**
-     * Validate an interface definition statment.
+     * Validate an interface definition statement.
      *
      * @param InterfaceStmt $stmt
      */
@@ -92,7 +92,7 @@ protected function validateInterfaceStatement(InterfaceStmt $stmt)
     }
 
     /**
-     * Validate a trait definition statment.
+     * Validate a trait definition statement.
      *
      * @param TraitStmt $stmt
      */
@@ -130,6 +130,8 @@ protected function validateClassConstFetchExpression(ClassConstFetch $stmt)
     /**
      * Ensure that no class, interface or trait name collides with a new definition.
      *
+     * @throws FatalErrorException
+     *
      * @param Stmt $stmt
      */
     protected function ensureCanDefine(Stmt $stmt)
@@ -158,6 +160,8 @@ protected function ensureCanDefine(Stmt $stmt)
     /**
      * Ensure that a referenced class exists.
      *
+     * @throws FatalErrorException
+     *
      * @param string $name
      * @param Stmt   $stmt
      */
@@ -171,12 +175,15 @@ protected function ensureClassExists($name, $stmt)
     /**
      * Ensure that a referenced interface exists.
      *
-     * @param string $name
-     * @param Stmt   $stmt
+     * @throws FatalErrorException
+     *
+     * @param $interfaces
+     * @param Stmt $stmt
      */
     protected function ensureInterfacesExist($interfaces, $stmt)
     {
         foreach ($interfaces as $interface) {
+            /** @var string $name */
             $name = $this->getFullyQualifiedName($interface);
             if (!$this->interfaceExists($name)) {
                 throw $this->createError(sprintf('Interface \'%s\' not found', $name), $stmt);
@@ -243,7 +250,7 @@ protected function traitExists($name)
      *
      * @param string $name
      *
-     * @return string
+     * @return string|null
      */
     protected function findInScope($name)
     {
@@ -254,7 +261,7 @@ protected function findInScope($name)
     }
 
     /**
-     * Error creation factory
+     * Error creation factory.
      *
      * @param string $msg
      * @param Stmt   $stmt

src/Psy/CodeCleaner/ValidFunctionNamePass.php

@@ -49,7 +49,6 @@ public function leaveNode(Node $node)
             if (!$name instanceof Expression && !$name instanceof Variable) {
                 $shortName = implode('\\', $name->parts);
                 $fullName  = $this->getFullyQualifiedName($name);
-
                 $inScope = isset($this->currentScope[strtolower($fullName)]);
                 if (!$inScope && !function_exists($shortName) && !function_exists($fullName)) {
                     $message = sprintf('Call to undefined function %s()', $name);

src/Psy/Command/Command.php

@@ -14,6 +14,10 @@
 use Psy\Shell;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Command\Command as BaseCommand;
+use Symfony\Component\Console\Helper\Table;
+use Symfony\Component\Console\Helper\TableHelper;
+use Symfony\Component\Console\Helper\TableStyle;
+use Symfony\Component\Console\Output\OutputInterface;
 
 /**
  * The Psy Shell base command.
@@ -233,4 +237,46 @@ private function formatDefaultValue($default)
 
         return str_replace("\n", '', var_export($default, true));
     }
+
+    /**
+     * Get a Table instance.
+     *
+     * Falls back to legacy TableHelper.
+     *
+     * @return Table|TableHelper
+     */
+    protected function getTable(OutputInterface $output)
+    {
+        if (!class_exists('Symfony\Component\Console\Helper\Table')) {
+            return $this->getTableHelper();
+        }
+
+        $style = new TableStyle();
+        $style
+            ->setVerticalBorderChar(' ')
+            ->setHorizontalBorderChar('')
+            ->setCrossingChar('');
+
+        $table = new Table($output);
+
+        return $table
+            ->setRows(array())
+            ->setStyle($style);
+    }
+
+    /**
+     * Legacy fallback for getTable.
+     *
+     * @return TableHelper
+     */
+    protected function getTableHelper()
+    {
+        $table = $this->getApplication()->getHelperSet()->get('table');
+
+        return $table
+            ->setRows(array())
+            ->setLayout(TableHelper::LAYOUT_BORDERLESS)
+            ->setHorizontalBorderChar('')
+            ->setCrossingChar('');
+    }
 }

src/Psy/Command/HelpCommand.php

@@ -66,7 +66,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             // list available commands
             $commands = $this->getApplication()->all();
 
-            $table = $this->getTable();
+            $table = $this->getTable($output);
 
             foreach ($commands as $name => $command) {
                 if ($name !== $command->getName()) {
@@ -86,28 +86,13 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 ));
             }
 
-            $output->page(function ($output) use ($table) {
+            $output->startPaging();
+            if ($table instanceof TableHelper) {
                 $table->render($output);
-            });
+            } else {
+                $table->render();
+            }
+            $output->stopPaging();
         }
     }
-
-    /**
-     * Get a TableHelper instance.
-     *
-     * @return TableHelper
-     */
-    protected function getTable()
-    {
-        $old = error_reporting();
-        error_reporting($old & ~E_USER_DEPRECATED);
-        $table = $this->getApplication()->getHelperSet()->get('table');
-        error_reporting($old);
-
-        return $table
-                ->setRows(array())
-                ->setLayout(TableHelper::LAYOUT_BORDERLESS)
-                ->setHorizontalBorderChar('')
-                ->setCrossingChar('');
-    }
 }

src/Psy/Command/ListCommand.php

@@ -24,12 +24,12 @@
 use Psy\Exception\RuntimeException;
 use Psy\Presenter\PresenterManager;
 use Psy\Presenter\PresenterManagerAware;
+use Symfony\Component\Console\Helper\TableHelper;
 use Symfony\Component\Console\Formatter\OutputFormatter;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Helper\TableHelper;
 
 /**
  * List available local variables, object properties, etc.
@@ -190,7 +190,7 @@ protected function writeLong(OutputInterface $output, array $result = null)
             return;
         }
 
-        $table = $this->getTable();
+        $table = $this->getTable($output);
 
         foreach ($result as $label => $items) {
             $output->writeln('');
@@ -201,7 +201,11 @@ protected function writeLong(OutputInterface $output, array $result = null)
                 $table->addRow(array($this->formatItemName($item), $item['value']));
             }
 
-            $table->render($output);
+            if ($table instanceof TableHelper) {
+                $table->render($output);
+            } else {
+                $table->render();
+            }
         }
     }
 
@@ -271,22 +275,4 @@ private function validateInput(InputInterface $input)
             $input->setOption('methods',    true);
         }
     }
-
-    /**
-     * Get a TableHelper instance.
-     *
-     * @return TableHelper
-     */
-    private function getTable()
-    {
-        $old = error_reporting();
-        error_reporting($old & ~E_USER_DEPRECATED);
-        $table = $this->getApplication()->getHelperSet()->get('table');
-        error_reporting($old);
-
-        return $table
-            ->setLayout(TableHelper::LAYOUT_BORDERLESS)
-            ->setHorizontalBorderChar('')
-            ->setCrossingChar('');
-    }
 }

src/Psy/Command/ReflectingCommand.php

@@ -29,9 +29,9 @@ abstract class ReflectingCommand extends Command implements ContextAware
     const INSTANCE_STATIC = '/^\$(\w+)::\$(\w+)$/';
 
     /**
-     * Context instance (for ContextAware interface)
+     * Context instance (for ContextAware interface).
      *
-     * @type Context
+     * @var Context
      */
     protected $context;