-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
15 changed files
with
877 additions
and
583 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
47 changes: 47 additions & 0 deletions
47
lib/PhpParser/Lexer/TokenEmulator/NullsafeTokenEmulator.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
<?php declare(strict_types=1); | ||
|
||
namespace PhpParser\Lexer\TokenEmulator; | ||
|
||
use PhpParser\Lexer\Emulative; | ||
|
||
final class NullsafeTokenEmulator implements TokenEmulatorInterface | ||
{ | ||
public function getPhpVersion(): string | ||
{ | ||
return Emulative::PHP_8_0; | ||
} | ||
|
||
public function isEmulationNeeded(string $code): bool | ||
{ | ||
return strpos($code, '?->') !== false; | ||
} | ||
|
||
public function emulate(string $code, array $tokens): array | ||
{ | ||
// We need to manually iterate and manage a count because we'll change | ||
// the tokens array on the way | ||
$line = 1; | ||
for ($i = 0, $c = count($tokens); $i < $c; ++$i) { | ||
if (isset($tokens[$i + 1])) { | ||
if ($tokens[$i] === '?' && $tokens[$i + 1][0] === \T_OBJECT_OPERATOR) { | ||
array_splice($tokens, $i, 2, [ | ||
[\T_NULLSAFE_OBJECT_OPERATOR, '?->', $line] | ||
]); | ||
$c--; | ||
continue; | ||
} | ||
} | ||
if (\is_array($tokens[$i])) { | ||
$line += substr_count($tokens[$i][1], "\n"); | ||
} | ||
} | ||
|
||
return $tokens; | ||
} | ||
|
||
public function reverseEmulate(string $code, array $tokens): array | ||
{ | ||
// ?-> was not valid code previously, don't bother. | ||
return $tokens; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
<?php declare(strict_types=1); | ||
|
||
namespace PhpParser\Node\Expr; | ||
|
||
use PhpParser\Node\Arg; | ||
use PhpParser\Node\Expr; | ||
use PhpParser\Node\Identifier; | ||
|
||
class NullsafeMethodCall extends Expr | ||
{ | ||
/** @var Expr Variable holding object */ | ||
public $var; | ||
/** @var Identifier|Expr Method name */ | ||
public $name; | ||
/** @var Arg[] Arguments */ | ||
public $args; | ||
|
||
/** | ||
* Constructs a nullsafe method call node. | ||
* | ||
* @param Expr $var Variable holding object | ||
* @param string|Identifier|Expr $name Method name | ||
* @param Arg[] $args Arguments | ||
* @param array $attributes Additional attributes | ||
*/ | ||
public function __construct(Expr $var, $name, array $args = [], array $attributes = []) { | ||
$this->attributes = $attributes; | ||
$this->var = $var; | ||
$this->name = \is_string($name) ? new Identifier($name) : $name; | ||
$this->args = $args; | ||
} | ||
|
||
public function getSubNodeNames() : array { | ||
return ['var', 'name', 'args']; | ||
} | ||
|
||
public function getType() : string { | ||
return 'Expr_NullsafeMethodCall'; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
<?php declare(strict_types=1); | ||
|
||
namespace PhpParser\Node\Expr; | ||
|
||
use PhpParser\Node\Expr; | ||
use PhpParser\Node\Identifier; | ||
|
||
class NullsafePropertyFetch extends Expr | ||
{ | ||
/** @var Expr Variable holding object */ | ||
public $var; | ||
/** @var Identifier|Expr Property name */ | ||
public $name; | ||
|
||
/** | ||
* Constructs a nullsafe property fetch node. | ||
* | ||
* @param Expr $var Variable holding object | ||
* @param string|Identifier|Expr $name Property name | ||
* @param array $attributes Additional attributes | ||
*/ | ||
public function __construct(Expr $var, $name, array $attributes = []) { | ||
$this->attributes = $attributes; | ||
$this->var = $var; | ||
$this->name = \is_string($name) ? new Identifier($name) : $name; | ||
} | ||
|
||
public function getSubNodeNames() : array { | ||
return ['var', 'name']; | ||
} | ||
|
||
public function getType() : string { | ||
return 'Expr_NullsafePropertyFetch'; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.