Merge branch 'release/0.8.2'

.phan/config.php

@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * This configuration will be read and overlaid on top of the
+ * default configuration. Command line arguments will be applied
+ * after this file is read.
+ */
+return [
+
+    // A list of directories that should be parsed for class and
+    // method information. After excluding the directories
+    // defined in exclude_analysis_directory_list, the remaining
+    // files will be statically analyzed for errors.
+    //
+    // Thus, both first-party and third-party code being used by
+    // your application should be included in this list.
+    'directory_list' => [
+        'src/',
+        'vendor/dnoegel/php-xdg-base-dir/src/',
+        'vendor/doctrine/instantiator/src/',
+        'vendor/hoa/console/',
+        'vendor/jakub-onderka/php-console-color/src/',
+        'vendor/jakub-onderka/php-console-highlighter/src/',
+        'vendor/nikic/php-parser/lib/',
+        'vendor/phpdocumentor/reflection-docblock/',
+        'vendor/symfony/console/',
+        'vendor/symfony/filesystem/',
+        'vendor/symfony/finder/',
+        'vendor/symfony/var-dumper/',
+    ],
+
+    // A directory list that defines files that will be excluded
+    // from static analysis, but whose class and method
+    // information should be included.
+    //
+    // Generally, you'll want to include the directories for
+    // third-party code (such as "vendor/") in this list.
+    //
+    // n.b.: If you'd like to parse but not analyze 3rd
+    //       party code, directories containing that code
+    //       should be added to both the `directory_list`
+    //       and `exclude_analysis_directory_list` arrays.
+    "exclude_analysis_directory_list" => [
+        'vendor/'
+    ],
+];

.php_cs

@@ -7,7 +7,7 @@ use Symfony\CS\Fixer\Contrib\HeaderCommentFixer;
 $header = <<<EOF
 This file is part of Psy Shell.
 
-(c) 2012-2015 Justin Hileman
+(c) 2012-2017 Justin Hileman
 
 For the full copyright and license information, please view the LICENSE
 file that was distributed with this source code.
@@ -30,6 +30,7 @@ $config = Config::create()
         '-pre_increment',
         '-unalign_double_arrow',
         '-unalign_equals',
+        '-no_empty_comment', // stop removing slashes in the middle of multi-line comments
     ))
     ->setUsingLinter(false);
 

.travis.yml

@@ -38,6 +38,7 @@ install:
 
 script:
   - vendor/bin/phpunit
+#  - '[[ "$TRAVIS_PHP_VERSION" != 7.1* ]] || bin/build'
 
 before_deploy:
   - bin/package -v $TRAVIS_TAG
@@ -53,4 +54,4 @@ deploy:
   on:
     tags: true
     repo: bobthecow/psysh
-    condition: ($TRAVIS_PHP_VERSION = 5.3* || $TRAVIS_PHP_VERSION = 7.0*) && -z "$COMPOSER_FLAGS"
+    condition: ($TRAVIS_PHP_VERSION = 5.3* || $TRAVIS_PHP_VERSION = 7.1*) && -z "$COMPOSER_FLAGS"

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2012-2015 Justin Hileman
+Copyright (c) 2012-2017 Justin Hileman
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -148,6 +148,11 @@ return array(
     //
     // To disable update checks entirely, set to 'never'.
     'updateCheck' => 'daily',
+
+    // Display an additional startup message. Default is ''.
+    // You can color and style the message thanks to the Symfony Console tags.
+    // See https://symfony.com/doc/current/console/coloring.html for more details.
+    'startupMessage' => sprintf('<info>%s</info>', shell_exec('uptime')),
 );
 ```
 
@@ -178,7 +183,7 @@ The PsySH `doc` command is great for documenting source code, but you'll need a
  * Drupal: [`drush php`](http://drushcommands.com/drush-8x/core/core-cli/), [drush-psysh](https://github.com/grota/drush-psysh)
  * eZ Publish: [`ezsh`](https://github.com/lolautruche/ezsh)
  * Jupyter: [Jupyter-PHP](https://github.com/Litipk/Jupyter-PHP)
- * Laravel: [`artisan tinker`](https://github.com/laravel/framework/blob/5.0/src/Illuminate/Foundation/Console/TinkerCommand.php)
+ * Laravel: [`artisan tinker`](https://github.com/laravel/tinker)
  * Lumen: [`artisan tinker`](https://github.com/vluzrmos/lumen-tinker)
  * Magento: [`magerun console`](https://github.com/netz98/n98-magerun/blob/develop/src/N98/Magento/Command/Developer/ConsoleCommand.php)
  * Pantheon CLI: [`terminus cli console`](https://github.com/pantheon-systems/terminus)

bin/build

@@ -1,11 +1,13 @@
 #!/usr/bin/env bash
 
+set -ev
+
 cd "${BASH_SOURCE%/*}/.."
 
 echo "Building phar"
-./bin/build-vendor || exit 1
-./bin/build-phar || exit 1
+./bin/build-vendor
+./bin/build-phar
 
 echo "Building compat phar"
-./bin/build-vendor-compat || exit 1
+./bin/build-vendor-compat
 ./bin/build-phar --compat

bin/build-manual

@@ -4,7 +4,7 @@
 /*
  * This file is part of Psy Shell.
  *
- * (c) 2012-2015 Justin Hileman
+ * (c) 2012-2017 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

bin/build-phar

@@ -4,7 +4,7 @@
 /*
  * This file is part of Psy Shell.
  *
- * (c) 2012-2015 Justin Hileman
+ * (c) 2012-2017 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

bin/build-vendor

@@ -1,7 +1,9 @@
 #!/usr/bin/env bash
 
+set -ev
+
 cd "${BASH_SOURCE%/*}/.."
 
 rm -rf build-vendor
 
-COMPOSER_VENDOR_DIR=build-vendor composer update --prefer-stable --no-dev --no-progress --classmap-authoritative
+COMPOSER_VENDOR_DIR=build-vendor composer update --prefer-stable --no-dev --no-progress --classmap-authoritative --no-interaction --verbose

bin/build-vendor-compat

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+set -ev
+
 cd "${BASH_SOURCE%/*}/.."
 
 rm -rf build-vendor
@@ -12,8 +14,8 @@ if [[ $(php --version) = PHP\ 5.3* ]]; then
 fi
 
 COMPOSER=composer-compat.json COMPOSER_VENDOR_DIR=build-vendor \
-  composer require symfony/intl hoa/console $HOA_VERSION --no-progress --no-update
+  composer require symfony/intl hoa/console $HOA_VERSION --no-progress --no-update --no-interaction --verbose
 
 COMPOSER=composer-compat.json COMPOSER_VENDOR_DIR=build-vendor \
-  composer update --prefer-stable --no-dev --no-progress --classmap-authoritative
+  composer update --prefer-stable --no-dev --no-progress --classmap-authoritative --no-interaction --verbose
 

bin/package

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+set -ev
+
 cd "${BASH_SOURCE%/*}/.."
 
 USAGE="usage: bin/package [-v PACKAGE_VERSION]"
@@ -34,7 +36,7 @@ echo "Creating tarballs"
 mkdir -p dist || exit 1
 
 if [ -z "$PKG_VERSION" ]; then
-  PKG_VERSION=$(git describe --tag --exact-match) || exit 1
+  PKG_VERSION=$(git describe --tag --exact-match)
   if [[ $(php --version) = PHP\ 5.3* ]]; then
     PKG_VERSION=${PKG_VERSION}-php53
   fi
@@ -46,5 +48,5 @@ if [[ $(tar --version) = bsdtar* ]]; then
   TAR_FLAGS='-s /.*/psysh/'
 fi
 
-tar $TAR_FLAGS -czf dist/psysh-${PKG_VERSION}.tar.gz psysh.phar || exit 1
+tar $TAR_FLAGS -czf dist/psysh-${PKG_VERSION}.tar.gz psysh.phar
 tar $TAR_FLAGS -czf dist/psysh-${PKG_VERSION}-compat.tar.gz psysh-compat.phar

bin/psysh

@@ -4,7 +4,7 @@
 /*
  * This file is part of Psy Shell.
  *
- * (c) 2012-2015 Justin Hileman
+ * (c) 2012-2017 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

src/Psy/Autoloader.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of Psy Shell.
  *
- * (c) 2012-2015 Justin Hileman
+ * (c) 2012-2017 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

src/Psy/CodeCleaner.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of Psy Shell.
  *
- * (c) 2012-2015 Justin Hileman
+ * (c) 2012-2017 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,6 +19,7 @@
 use Psy\CodeCleaner\CalledClassPass;
 use Psy\CodeCleaner\CallTimePassByReferencePass;
 use Psy\CodeCleaner\ExitPass;
+use Psy\CodeCleaner\FinalClassPass;
 use Psy\CodeCleaner\FunctionReturnInWriteContextPass;
 use Psy\CodeCleaner\ImplicitReturnPass;
 use Psy\CodeCleaner\InstanceOfPass;
@@ -83,6 +84,7 @@ private function getDefaultPasses()
             new CallTimePassByReferencePass(),
             new PassableByReferencePass(),
             new CalledClassPass(),
+            new FinalClassPass(),
             new InstanceOfPass(),
             new LeavePsyshAlonePass(),
             new LegacyEmptyPass(),

src/Psy/CodeCleaner/AbstractClassPass.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of Psy Shell.
  *
- * (c) 2012-2015 Justin Hileman
+ * (c) 2012-2017 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

src/Psy/CodeCleaner/AssignThisVariablePass.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of Psy Shell.
  *
- * (c) 2012-2015 Justin Hileman
+ * (c) 2012-2017 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

src/Psy/CodeCleaner/CallTimePassByReferencePass.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of Psy Shell.
  *
- * (c) 2012-2015 Justin Hileman
+ * (c) 2012-2017 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

src/Psy/CodeCleaner/CalledClassPass.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of Psy Shell.
  *
- * (c) 2012-2015 Justin Hileman
+ * (c) 2012-2017 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

src/Psy/CodeCleaner/CodeCleanerPass.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of Psy Shell.
  *
- * (c) 2012-2015 Justin Hileman
+ * (c) 2012-2017 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

src/Psy/CodeCleaner/ExitPass.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of Psy Shell.
  *
- * (c) 2012-2015 Justin Hileman
+ * (c) 2012-2017 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

src/Psy/CodeCleaner/FinalClassPass.php

@@ -0,0 +1,70 @@
+<?php
+
+/*
+ * This file is part of Psy Shell.
+ *
+ * (c) 2012-2017 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\Stmt\Class_ as ClassStmt;
+use Psy\Exception\FatalErrorException;
+
+/**
+ * The final class pass handles final classes.
+ */
+class FinalClassPass extends CodeCleanerPass
+{
+    private $finalClasses;
+
+    /**
+     * @param array $nodes
+     */
+    public function beforeTraverse(array $nodes)
+    {
+        $this->finalClasses = array();
+    }
+
+    /**
+     * @throws RuntimeException if the node is a class that extends a final class
+     *
+     * @param Node $node
+     */
+    public function enterNode(Node $node)
+    {
+        if ($node instanceof ClassStmt) {
+            if ($node->extends) {
+                $extends = (string) $node->extends;
+                if ($this->isFinalClass($extends)) {
+                    $msg = sprintf('Class %s may not inherit from final class (%s)', $node->name, $extends);
+                    throw new FatalErrorException($msg);
+                }
+            }
+
+            if ($node->isFinal()) {
+                $this->finalClasses[strtolower($node->name)] = true;
+            }
+        }
+    }
+
+    /**
+     * @param string $name Class name
+     *
+     * @return bool
+     */
+    private function isFinalClass($name)
+    {
+        if (!class_exists($name)) {
+            return isset($this->finalClasses[strtolower($name)]);
+        }
+
+        $refl = new \ReflectionClass($name);
+
+        return $refl->isFinal();
+    }
+}

src/Psy/CodeCleaner/FunctionReturnInWriteContextPass.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of Psy Shell.
  *
- * (c) 2012-2015 Justin Hileman
+ * (c) 2012-2017 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

src/Psy/CodeCleaner/ImplicitReturnPass.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of Psy Shell.
  *
- * (c) 2012-2015 Justin Hileman
+ * (c) 2012-2017 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

src/Psy/CodeCleaner/InstanceOfPass.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of Psy Shell.
  *
- * (c) 2012-2015 Justin Hileman
+ * (c) 2012-2017 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

src/Psy/CodeCleaner/LeavePsyshAlonePass.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of Psy Shell.
  *
- * (c) 2012-2015 Justin Hileman
+ * (c) 2012-2017 Justin Hileman
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.