Merge branch 'release/0.3.0'

.gitignore

@@ -2,3 +2,4 @@ vendor/
 composer.lock
 manual/
 __pycache__
+.php_cs.cache

.php_cs

@@ -1,16 +1,16 @@
 <?php
 
 use Symfony\CS\Config\Config;
-use Symfony\CS\Fixer;
 use Symfony\CS\FixerInterface;
 
-$config = new Config();
+$config = Config::create()
+    // use default level and extra fixers:
+    ->fixers(array('-concat_without_spaces', 'concat_with_spaces', 'strict'))
+    ->setUsingCache(true)
+    ->setUsingLinter(false);
 
-$config->fixers(array('-concat_without_spaces', 'concat_with_spaces'));
+$finder = $config->getFinder()
+    ->in('src')
+    ->in('test');
 
-$config->getFinder()
-	->in(__DIR__)
-	->exclude('bin')
-	->exclude('vendor');
-
-return $config;
+return $config;

.travis.yml

@@ -1,14 +1,21 @@
 language: php
+
 php:
- - 5.3
- - 5.4
- - 5.5
- - 5.6
- - hhvm
+  - 5.3
+  - 5.4
+  - 5.5
+  - 5.6
+  - hhvm
+
+install:
+  - travis_retry composer install --no-interaction --prefer-source
 
-before_script:
- - composer install
+script:
+  - vendor/bin/phpunit
+  - vendor/bin/phpcs -n --standard=phpcs.xml ./
+  - vendor/bin/php-cs-fixer --diff --dry-run -vv fix
 
 matrix:
   allow_failures:
-    - php: hhvm
+    - php: hhvm
+  fast_finish: true

CONTRIBUTING.md

@@ -1,3 +1,8 @@
+## Code style
+
+Please make your code look like the other code in the project. PsySH follows [PSR-1](http://php-fig.org/psr/psr-1/) and [PSR-2](http://php-fig.org/psr/psr-2/). The easiest way to do make sure you're following the coding standard is to run `vendor/bin/php-cs-fixer fix` before committing.
+
+
 ## Building the manual
 
 ```sh

README.md

@@ -1,8 +1,8 @@
 # PsySH
 
-[![Package version](http://img.shields.io/packagist/v/psy/psysh.svg)](https://packagist.org/packages/psy/psysh)
-[![Build status](http://img.shields.io/travis/bobthecow/psysh/master.svg)](http://travis-ci.org/bobthecow/psysh)
-[![Made out of awesome](http://img.shields.io/badge/made_out_of_awesome-✓-brightgreen.svg)](http://psysh.org)
+[![Package version](http://img.shields.io/packagist/v/psy/psysh.svg?style=flat-square)](https://packagist.org/packages/psy/psysh)
+[![Build status](http://img.shields.io/travis/bobthecow/psysh/master.svg?style=flat-square)](http://travis-ci.org/bobthecow/psysh)
+[![Made out of awesome](http://img.shields.io/badge/made_out_of_awesome-✓-brightgreen.svg?style=flat-square)](http://psysh.org)
 
 Check out the [Interactive Debugging in PHP talk from OSCON](https://presentate.com/bobthecow/talks/php-for-pirates) on Presentate.
 

composer.json

@@ -14,20 +14,24 @@
     ],
     "require": {
         "php": ">=5.3.0",
-        "symfony/console": ">=2.3.10, <2.6.0",
+        "symfony/console": "~2.3.10|~2.4.2|~2.5",
         "nikic/php-parser": "~1.0",
-        "dnoegel/php-xdg-base-dir": "0.1"
+        "dnoegel/php-xdg-base-dir": "0.1",
+        "jakub-onderka/php-console-highlighter": "dev-master"
     },
     "require-dev": {
         "phpunit/phpunit": ">=3.7, <4.3",
-        "symfony/finder": "~2.1"
+        "symfony/finder": "~2.1",
+        "squizlabs/php_codesniffer": "~2.0",
+        "fabpot/php-cs-fixer": "2.0.*@dev"
     },
     "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."
     },
     "autoload": {
+        "files": ["src/Psy/functions.php"],
         "psr-0": {
             "Psy\\": "src/"
         }

phpcs.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<ruleset name="PsySH Coding Standard">
+  <description>The coding standard for PsySH</description>
+
+  <exclude-pattern>*/bin/*</exclude-pattern>
+  <exclude-pattern>*/vendor/*</exclude-pattern>
+
+  <rule ref="PSR2">
+    <exclude name="Generic.Functions.FunctionCallArgumentSpacing.TooMuchSpaceAfterComma"/>
+  </rule>
+</ruleset>

src/Psy/CodeCleaner.php

@@ -23,6 +23,7 @@
 use Psy\CodeCleaner\ImplicitReturnPass;
 use Psy\CodeCleaner\InstanceOfPass;
 use Psy\CodeCleaner\LeavePsyshAlonePass;
+use Psy\CodeCleaner\LegacyEmptyPass;
 use Psy\CodeCleaner\MagicConstantsPass;
 use Psy\CodeCleaner\NamespacePass;
 use Psy\CodeCleaner\StaticConstructorPass;
@@ -76,6 +77,7 @@ private function getDefaultPasses()
             new CalledClassPass(),
             new InstanceOfPass(),
             new LeavePsyshAlonePass(),
+            new LegacyEmptyPass(),
             new ImplicitReturnPass(),
             new UseStatementPass(),      // must run before namespace and validation passes
             new NamespacePass($this),    // must run after the implicit return pass

src/Psy/CodeCleaner/LegacyEmptyPass.php

@@ -0,0 +1,64 @@
+<?php
+
+/*
+ * This file is part of Psy Shell
+ *
+ * (c) 2012-2014 Justin Hileman
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Psy\CodeCleaner;
+
+use PhpParser\Node;
+use PhpParser\Node\Expr\Empty_ as ExprEmpty;
+use PhpParser\Node\Expr\Variable;
+use Psy\Exception\ParseErrorException;
+
+/**
+ * Validate that the user did not call the language construct `empty()` on a
+ * statement in PHP < 5.5.
+ */
+class LegacyEmptyPass extends CodeCleanerPass
+{
+    /**
+     * Validate use of empty in PHP < 5.5.
+     *
+     * @throws ParseErrorException if the user used empty with anything but a variable.
+     *
+     * @param Node $node
+     */
+    public function enterNode(Node $node)
+    {
+        if (version_compare(PHP_VERSION, '5.5', '>=')) {
+            return;
+        }
+
+        if (!$node instanceof ExprEmpty) {
+            return;
+        }
+
+        if (!$node->expr instanceof Variable) {
+            $msg = sprintf('syntax error, unexpected %s', $this->getUnexpectedThing($node->expr));
+
+            throw new ParseErrorException($msg, $node->expr->getLine());
+        }
+    }
+
+    private function getUnexpectedThing(Node $node)
+    {
+        switch ($node->getType()) {
+            case 'Scalar_String':
+            case 'Scalar_LNumber':
+            case 'Scalar_DNumber':
+                return json_encode($node->value);
+
+            case 'Expr_ConstFetch':
+                return (string) $node->name;
+
+            default:
+                return $node->getType();
+        }
+    }
+}

src/Psy/CodeCleaner/UseStatementPass.php

@@ -47,7 +47,7 @@ public function enterNode(Node $node)
         if ($node instanceof NamespaceStmt) {
             // If this is the same namespace as last namespace, let's do ourselves
             // a favor and reload all the aliases...
-            if (strtolower($node->name) == strtolower($this->lastNamespace)) {
+            if (strtolower($node->name) === strtolower($this->lastNamespace)) {
                 $this->aliases = $this->lastAliases;
             }
         }

src/Psy/CodeCleaner/ValidClassNamePass.php

@@ -195,7 +195,7 @@ protected function getScopeType(Stmt $stmt)
      */
     protected function classExists($name)
     {
-        return class_exists($name) || $this->findInScope($name) == self::CLASS_TYPE;
+        return class_exists($name) || $this->findInScope($name) === self::CLASS_TYPE;
     }
 
     /**
@@ -207,7 +207,7 @@ protected function classExists($name)
      */
     protected function interfaceExists($name)
     {
-        return interface_exists($name) || $this->findInScope($name) == self::INTERFACE_TYPE;
+        return interface_exists($name) || $this->findInScope($name) === self::INTERFACE_TYPE;
     }
 
     /**
@@ -219,7 +219,7 @@ protected function interfaceExists($name)
      */
     protected function traitExists($name)
     {
-        return $this->checkTraits && (trait_exists($name) || $this->findInScope($name) == self::TRAIT_TYPE);
+        return $this->checkTraits && (trait_exists($name) || $this->findInScope($name) === self::TRAIT_TYPE);
     }
 
     /**

src/Psy/Command/BufferCommand.php

@@ -35,7 +35,8 @@ protected function configure()
                 new InputOption('clear', '', InputOption::VALUE_NONE, 'Clear the current buffer.'),
             ))
             ->setDescription('Show (or clear) the contents of the code input buffer.')
-            ->setHelp(<<<HELP
+            ->setHelp(
+                <<<HELP
 Show the contents of the code buffer for the current multi-line expression.
 
 Optionally, clear the buffer by passing the <info>--clear</info> option.

src/Psy/Command/ClearCommand.php

@@ -30,7 +30,8 @@ protected function configure()
             ->setName('clear')
             ->setDefinition(array())
             ->setDescription('Clear the Psy Shell screen.')
-            ->setHelp(<<<HELP
+            ->setHelp(
+                <<<HELP
 Clear the Psy Shell screen.
 
 Pro Tip: If your PHP has readline support, you should be able to use ctrl+l too!

src/Psy/Command/Command.php

@@ -177,7 +177,8 @@ private function optionsAsText()
                 $description = str_replace("\n", "\n" . str_pad('', $max + 2, ' '), $option->getDescription());
 
                 $optionMax = $max - strlen($option->getName()) - 2;
-                $messages[] = sprintf(" <info>%s</info> %-${optionMax}s%s%s%s",
+                $messages[] = sprintf(
+                    " <info>%s</info> %-${optionMax}s%s%s%s",
                     '--' . $option->getName(),
                     $option->getShortcut() ? sprintf('(-%s) ', $option->getShortcut()) : '',
                     $description,

src/Psy/Command/DocCommand.php

@@ -34,7 +34,8 @@ protected function configure()
                 new InputArgument('value', InputArgument::REQUIRED, 'Function, class, instance, constant, method or property to document.'),
             ))
             ->setDescription('Read the documentation for an object, class, constant, method or property.')
-            ->setHelp(<<<HELP
+            ->setHelp(
+                <<<HELP
 Read the documentation for an object, class, constant, method or property.
 
 It's awesome for well-documented code, not quite as awesome for poorly documented code.

src/Psy/Command/DumpCommand.php

@@ -52,7 +52,8 @@ protected function configure()
                 new InputOption('all', 'a', InputOption::VALUE_NONE, 'Include private and protected methods and properties.'),
             ))
             ->setDescription('Dump an object or primitive.')
-            ->setHelp(<<<HELP
+            ->setHelp(
+                <<<HELP
 Dump an object or primitive.
 
 This is like var_dump but <strong>way</strong> awesomer.

src/Psy/Command/ExitCommand.php

@@ -32,7 +32,8 @@ protected function configure()
             ->setAliases(array('quit', 'q'))
             ->setDefinition(array())
             ->setDescription('End the current session and return to caller.')
-            ->setHelp(<<<HELP
+            ->setHelp(
+                <<<HELP
 End the current session and return to caller.
 
 e.g.

src/Psy/Command/HistoryCommand.php

@@ -59,7 +59,8 @@ protected function configure()
                 new InputOption('clear',       '',  InputOption::VALUE_NONE,     'Clear the history.'),
             ))
             ->setDescription('Show the Psy Shell history.')
-            ->setHelp(<<<HELP
+            ->setHelp(
+                <<<HELP
 Show, search, save or replay the Psy Shell history.
 
 e.g.
@@ -130,7 +131,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             }
 
             $count = count($history);
-            $output->writeln(sprintf('Replaying %d line%s of history', $count, ($count != 1) ? 's' : ''));
+            $output->writeln(sprintf('Replaying %d line%s of history', $count, ($count !== 1) ? 's' : ''));
             $this->getApplication()->addInput($history);
         } elseif ($input->getOption('clear')) {
             $this->clearHistory();

src/Psy/Command/ListCommand.php

@@ -83,7 +83,8 @@ protected function configure()
                 new InputOption('long',        'l', InputOption::VALUE_NONE,     'List in long format: includes class names and method signatures.'),
             ))
             ->setDescription('List local, instance or class variables, methods and constants.')
-            ->setHelp(<<<HELP
+            ->setHelp(
+                <<<HELP
 List variables, constants, classes, interfaces, traits, functions, methods,
 and properties.
 

src/Psy/Command/ListCommand/VariableEnumerator.php

@@ -76,13 +76,13 @@ protected function getVariables($showAll)
     {
         $scopeVars = $this->context->getAll();
         uksort($scopeVars, function ($a, $b) {
-            if ($a == '_e') {
+            if ($a === '_e') {
                 return 1;
-            } elseif ($b == '_e') {
+            } elseif ($b === '_e') {
                 return -1;
-            } elseif ($a == '_') {
+            } elseif ($a === '_') {
                 return 1;
-            } elseif ($b == '_') {
+            } elseif ($b === '_') {
                 return -1;
             } else {
                 // TODO: this should be natcasesort

src/Psy/Command/ParseCommand.php

@@ -57,7 +57,8 @@ protected function configure()
                 new InputOption('depth', '', InputOption::VALUE_REQUIRED, 'Depth to parse', 10),
             ))
             ->setDescription('Parse PHP code and show the abstract syntax tree.')
-            ->setHelp(<<<HELP
+            ->setHelp(
+                <<<HELP
 Parse PHP code and show the abstract syntax tree.
 
 This command is used in the development of PsySH. Given a string of PHP code,

src/Psy/Command/ReflectingCommand.php

@@ -73,7 +73,7 @@ protected function getTarget($valueName, $classOnly = false)
                 return array($this->resolveName($matches[1]), $matches[2], Mirror::STATIC_PROPERTY | Mirror::PROPERTY);
 
             case (!$classOnly && preg_match(self::INSTANCE_MEMBER, $valueName, $matches)):
-                if ($matches[2] == '->') {
+                if ($matches[2] === '->') {
                     $kind = Mirror::METHOD | Mirror::PROPERTY;
                 } else {
                     $kind = Mirror::CONSTANT | Mirror::METHOD;
@@ -124,7 +124,7 @@ protected function resolveName($name, $includeFunctions = false)
      */
     protected function getTargetAndReflector($valueName, $classOnly = false)
     {
-        list ($value, $member, $kind) = $this->getTarget($valueName, $classOnly);
+        list($value, $member, $kind) = $this->getTarget($valueName, $classOnly);
 
         return array($value, Mirror::get($value, $member, $kind));
     }

src/Psy/Command/ShowCommand.php

@@ -34,7 +34,8 @@ protected function configure()
                 new InputArgument('value', InputArgument::REQUIRED, 'Function, class, instance, constant, method or property to show.'),
             ))
             ->setDescription('Show the code for an object, class, constant, method or property.')
-            ->setHelp(<<<HELP
+            ->setHelp(
+                <<<HELP
 Show the code for an object, class, constant, method or property.
 
 e.g.