Merge pull request #2262 from rectorphp/fixes

Fixes
This commit is contained in:
Tomáš Votruba 2019-11-05 23:18:55 +01:00 committed by GitHub
commit c3176bd711
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 33 additions and 4 deletions

View File

@ -20,7 +20,7 @@ final class RemoveDeadStmtRectorTest extends AbstractRectorTestCase
public function provideDataForTest(): Iterator
{
yield from $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
}
protected function getRectorClass(): string

View File

@ -133,7 +133,7 @@ PHP
return $node;
}
$match = Strings::match($node->value, '#(\\$|\\\\)(?<number>\d+)#');
$match = Strings::match($node->value, '#(\\$|\\\\|\\x0)(?<number>\d+)#');
if (! $match) {
return $node;
}

View File

@ -0,0 +1,29 @@
<?php
namespace Rector\Php55\Tests\Rector\FuncCall\PregReplaceEModifierRector\Fixture;
class Slashes
{
public static function camelize($word)
{
return preg_replace('#a#e', "strtoupper('\\0___');", $word);
}
}
?>
-----
<?php
namespace Rector\Php55\Tests\Rector\FuncCall\PregReplaceEModifierRector\Fixture;
class Slashes
{
public static function camelize($word)
{
return preg_replace_callback('#a#', function ($matches) {
return strtoupper($matches[0]);
}, $word);
}
}
?>

View File

@ -10,7 +10,7 @@ use Symfony\Component\Finder\SplFileInfo;
final class StaticFixtureProvider
{
public static function yieldFilesFromDirectory(string $directory, string $suffix = '*.php'): Iterator
public static function yieldFilesFromDirectory(string $directory, string $suffix): Iterator
{
$fileInfos = self::findFilesInDirectory($directory, $suffix);

View File

@ -18,7 +18,7 @@ final class _Name_Test extends AbstractRectorTestCase
public function provideDataForTest(): \Iterator
{
yield [__DIR__ . '/Fixture/fixture.php.inc'];
return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
}
protected function getRectorClass(): string