Prefix instanceof statements

specs/exp/cast.php

@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the humbug/php-scoper package.
+ *
+ * Copyright (c) 2017 Théo FIDRY <[email protected]>,
+ *                    Pádraic Brady <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return [
+    'meta' => [
+        'title' => 'Miscellaneous',
+        // Default values. If not specified will be the one used
+        'prefix' => 'Humbug',
+        'whitelist' => [],
+    ],
+
+    'Cast variable' => <<<'PHP'
+<?php
+
+$x = new stdClass();
+
+(bool) $x;
+(int) $x;
+(float) $x;
+(array) $x;
+(object) $x;
+----
+<?php
+
+namespace Humbug;
+
+$x = new \stdClass();
+(bool) $x;
+(int) $x;
+(double) $x;
+(array) $x;
+(object) $x;
+
+PHP
+    ,
+];

specs/catch.php → specs/exp/catch.php

@@ -14,7 +14,7 @@
 
 return [
     'meta' => [
-        'title' => 'Miscellaneous',
+        'title' => 'Catch expressions',
         // Default values. If not specified will be the one used
         'prefix' => 'Humbug',
         'whitelist' => [],
@@ -151,6 +151,28 @@
 } catch (\Humbug\X\FooException|\Throwable $t) {
 }
 
+PHP
+    ,
+
+    'catch with special keywords' => <<<'PHP'
+<?php
+
+namespace Acme;
+
+try {
+    echo "foo";
+} catch (self | parent $t) {
+}
+----
+<?php
+
+namespace Humbug\Acme;
+
+try {
+    echo "foo";
+} catch (self|parent $t) {
+}
+
 PHP
     ,
 ];

specs/exp/instanceof.php

@@ -0,0 +1,137 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the humbug/php-scoper package.
+ *
+ * Copyright (c) 2017 Théo FIDRY <[email protected]>,
+ *                    Pádraic Brady <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return [
+    'meta' => [
+        'title' => 'Instanceof expressions',
+        // Default values. If not specified will be the one used
+        'prefix' => 'Humbug',
+        'whitelist' => [],
+    ],
+
+    'Instance of an internal class' => <<<'PHP'
+<?php
+
+$x = new stdClass();
+$x instanceof stdClass;
+----
+<?php
+
+namespace Humbug;
+
+$x = new \stdClass();
+$x instanceof \stdClass;
+
+PHP
+    ,
+
+    'Instance of an internal class in a namespace' => <<<'PHP'
+<?php
+
+namespace Acme;
+
+use stdClass;
+
+$x = new stdClass();
+$x instanceof stdClass;
+
+----
+<?php
+
+namespace Humbug\Acme;
+
+use stdClass;
+$x = new \stdClass();
+$x instanceof \stdClass;
+
+PHP
+    ,
+
+    'Instance of a custom exception class' => <<<'PHP'
+<?php
+
+$x = new Foo();
+$x instanceof Foo;
+
+----
+<?php
+
+namespace Humbug;
+
+$x = new \Humbug\Foo();
+$x instanceof \Humbug\Foo;
+
+PHP
+    ,
+
+    'Instance of a custom exception class in a namespace' => <<<'PHP'
+<?php
+
+namespace Acme;
+
+$x = new Foo();
+$x instanceof Foo;
+
+----
+<?php
+
+namespace Humbug\Acme;
+
+$x = new \Humbug\Acme\Foo();
+$x instanceof \Humbug\Acme\Foo;
+
+PHP
+    ,
+
+    'Instance of with ternary' => <<<'PHP'
+<?php
+
+namespace Acme;
+
+$file = new \stdClass();
+
+$file instanceof \SplFileInfo ? $file : new \SplFileInfo($file);
+
+----
+<?php
+
+namespace Humbug\Acme;
+
+$file = new \stdClass();
+$file instanceof \SplFileInfo ? $file : new \SplFileInfo($file);
+
+PHP
+    ,
+
+    'Instance of with special keyword' => <<<'PHP'
+<?php
+
+namespace Acme;
+
+$file instanceof static;
+$file instanceof self;
+$file instanceof parent;
+
+----
+<?php
+
+namespace Humbug\Acme;
+
+$file instanceof static;
+$file instanceof self;
+$file instanceof parent;
+
+PHP
+    ,
+];

src/Console/Configuration.php

@@ -18,8 +18,9 @@
 use InvalidArgumentException;
 use Iterator;
 use RuntimeException;
+use SplFileInfo;
 use Symfony\Component\Finder\Finder;
-use function Humbug\PhpScoper\iterables_to_iterator;
+use function Humbug\PhpScoper\chain;
 
 final class Configuration
 {
@@ -70,7 +71,7 @@ public static function load(string $path = null, array $paths = []): self
 
         $finders = self::retrieveFinders($config);
         $filesFromPaths = self::retrieveFilesFromPaths($paths);
-        $filesWithContents = self::retrieveFilesWithContents(iterables_to_iterator($filesFromPaths, ...$finders));
+        $filesWithContents = self::retrieveFilesWithContents(chain($filesFromPaths, ...$finders));
 
         return new self($path, $filesWithContents, $patchers, $whitelist);
     }
@@ -100,7 +101,7 @@ private function __construct(
     public function withPaths(array $paths): self
     {
         $filesWithContents = self::retrieveFilesWithContents(
-            iterables_to_iterator(
+            chain(
                 self::retrieveFilesFromPaths(
                     array_unique($paths)
                 )
@@ -310,14 +311,14 @@ private static function retrieveFilesWithContents(Iterator $files): array
     {
         return array_reduce(
             iterator_to_array($files),
-            function (array $files, $fileInfo): array {
-                $file = (string) $fileInfo;
+            function (array $files, SplFileInfo $fileInfo): array {
+                $file = $fileInfo->getRealPath();
 
-                if (false === file_exists($file)) {
+                if (false === $file) {
                     throw new RuntimeException(
                         sprintf(
                             'Could not find the file "%s".',
-                            $file
+                            (string) $fileInfo
                         )
                     );
                 }

src/NodeVisitor/NameStmtPrefixer.php

@@ -20,6 +20,7 @@
 use PhpParser\Node\Expr\ClassConstFetch;
 use PhpParser\Node\Expr\ConstFetch;
 use PhpParser\Node\Expr\FuncCall;
+use PhpParser\Node\Expr\Instanceof_;
 use PhpParser\Node\Expr\New_;
 use PhpParser\Node\Expr\StaticCall;
 use PhpParser\Node\Name;
@@ -32,6 +33,7 @@
 use PhpParser\Node\Stmt\Function_;
 use PhpParser\Node\Stmt\Interface_;
 use PhpParser\NodeVisitorAbstract;
+use function in_array;
 
 /**
  * ```
@@ -108,6 +110,7 @@ private function prefixName(Name $name): Node
                 || $parentNode instanceof Class_
                 || $parentNode instanceof Interface_
                 || $parentNode instanceof Catch_
+                || $parentNode instanceof Instanceof_
             )
         ) {
             return $name;
@@ -120,6 +123,8 @@ private function prefixName(Name $name): Node
                 || $parentNode instanceof ClassConstFetch
                 || $parentNode instanceof New_
                 || $parentNode instanceof Param
+                || $parentNode instanceof Catch_
+                || $parentNode instanceof Instanceof_
             )
             && in_array((string) $name, self::PHP_FUNCTION_KEYWORDS, true)
         ) {

src/functions.php

@@ -14,8 +14,6 @@
 
 namespace Humbug\PhpScoper;
 
-use AppendIterator;
-use ArrayIterator;
 use Humbug\PhpScoper\Console\Application;
 use Humbug\PhpScoper\Console\Command\AddPrefixCommand;
 use Humbug\PhpScoper\Console\Command\InitCommand;
@@ -29,7 +27,6 @@
 use Humbug\SelfUpdate\Exception\RuntimeException as SelfUpdateRuntimeException;
 use Humbug\SelfUpdate\Updater;
 use Iterator;
-use IteratorAggregate;
 use PackageVersions\Versions;
 use PhpParser\Node;
 use PhpParser\Parser;
@@ -211,20 +208,11 @@ function deep_clone($node)
     return unserialize(serialize($node));
 }
 
-function iterables_to_iterator(iterable ...$iterables): Iterator
+function chain(iterable ...$iterables): Iterator
 {
-    $iterator = new AppendIterator();
-
     foreach ($iterables as $iterable) {
-        if (is_array($iterable)) {
-            $iterator->append(new ArrayIterator($iterable));
-        } elseif ($iterable instanceof IteratorAggregate) {
-            $iterator->append($iterable->getIterator());
-        } else {
-            /* @var Iterator $iterable */
-            $iterator->append($iterable);
+        foreach ($iterable as $key => $value) {
+            yield $key => $value;
         }
     }
-
-    return $iterator;
 }