aboutsummaryrefslogtreecommitdiff
path: root/src/NXP/Classes
diff options
context:
space:
mode:
authorBruce Wells <brucekwells@gmail.com>2022-03-21 19:52:25 +0300
committerGitHub <noreply@github.com>2022-03-21 19:52:25 +0300
commita0ff7a79af8c3bc5e9c5decee24cbefb5d80e93b (patch)
tree9432edb4d427293952ed99f48968b8ad32f6633a /src/NXP/Classes
parent6ebe4849ff7448d5903914d2f8980af5c9fd8d34 (diff)
Adding varExists method and support for undefined var handler in getVar (#96)V2.1.112.0.4
* Added varExists method * getVar now respects VarNotFoundHandler setting * Use local version of PHP-CS-Fixer Instead of hard coded version from github actions * Fixing actions * Fixing actions * Dropping testing for 7.3, as it is no longer supported
Diffstat (limited to 'src/NXP/Classes')
-rw-r--r--src/NXP/Classes/CustomFunction.php3
-rw-r--r--src/NXP/Classes/Operator.php3
-rw-r--r--src/NXP/Classes/Token.php1
-rw-r--r--src/NXP/Classes/Tokenizer.php20
4 files changed, 12 insertions, 15 deletions
diff --git a/src/NXP/Classes/CustomFunction.php b/src/NXP/Classes/CustomFunction.php
index 6e4fdc5..225495f 100644
--- a/src/NXP/Classes/CustomFunction.php
+++ b/src/NXP/Classes/CustomFunction.php
@@ -1,6 +1,5 @@
<?php
-
namespace NXP\Classes;
use NXP\Exception\IncorrectNumberOfFunctionParametersException;
@@ -49,7 +48,7 @@ class CustomFunction
*
* @throws IncorrectNumberOfFunctionParametersException
*/
- public function execute(array &$stack) : Token
+ public function execute(array &$stack): Token
{
if (count($stack) < $this->places) {
throw new IncorrectNumberOfFunctionParametersException($this->name);
diff --git a/src/NXP/Classes/Operator.php b/src/NXP/Classes/Operator.php
index d9a70d7..1b1acc4 100644
--- a/src/NXP/Classes/Operator.php
+++ b/src/NXP/Classes/Operator.php
@@ -1,6 +1,5 @@
<?php
-
namespace NXP\Classes;
use NXP\Exception\IncorrectExpressionException;
@@ -55,7 +54,7 @@ class Operator
*
* @throws IncorrectExpressionException
*/
- public function execute(array &$stack) : Token
+ public function execute(array &$stack): Token
{
if (count($stack) < $this->places) {
throw new IncorrectExpressionException();
diff --git a/src/NXP/Classes/Token.php b/src/NXP/Classes/Token.php
index e12315e..924771e 100644
--- a/src/NXP/Classes/Token.php
+++ b/src/NXP/Classes/Token.php
@@ -1,6 +1,5 @@
<?php
-
namespace NXP\Classes;
class Token
diff --git a/src/NXP/Classes/Tokenizer.php b/src/NXP/Classes/Tokenizer.php
index 77014b8..087a78d 100644
--- a/src/NXP/Classes/Tokenizer.php
+++ b/src/NXP/Classes/Tokenizer.php
@@ -66,7 +66,7 @@ class Tokenizer
$this->operators = $operators;
}
- public function tokenize() : self
+ public function tokenize(): self
{
foreach (str_split($this->input, 1) as $ch) {
switch (true) {
@@ -184,17 +184,17 @@ class Tokenizer
return $this;
}
- private function isNumber(string $ch) : bool
+ private function isNumber(string $ch): bool
{
return $ch >= '0' && $ch <= '9';
}
- private function isAlpha(string $ch) : bool
+ private function isAlpha(string $ch): bool
{
return $ch >= 'a' && $ch <= 'z' || $ch >= 'A' && $ch <= 'Z' || $ch == '_';
}
- private function emptyNumberBufferAsLiteral() : void
+ private function emptyNumberBufferAsLiteral(): void
{
if (strlen($this->numberBuffer)) {
$this->tokens[] = new Token(Token::Literal, $this->numberBuffer);
@@ -202,22 +202,22 @@ class Tokenizer
}
}
- private function isDot(string $ch) : bool
+ private function isDot(string $ch): bool
{
return $ch == '.';
}
- private function isLP(string $ch) : bool
+ private function isLP(string $ch): bool
{
return $ch == '(';
}
- private function isRP(string $ch) : bool
+ private function isRP(string $ch): bool
{
return $ch == ')';
}
- private function emptyStrBufferAsVariable() : void
+ private function emptyStrBufferAsVariable(): void
{
if ($this->stringBuffer != '') {
$this->tokens[] = new Token(Token::Variable, $this->stringBuffer);
@@ -225,7 +225,7 @@ class Tokenizer
}
}
- private function isComma(string $ch) : bool
+ private function isComma(string $ch): bool
{
return $ch == ',';
}
@@ -235,7 +235,7 @@ class Tokenizer
* @throws IncorrectBracketsException
* @throws UnknownOperatorException
*/
- public function buildReversePolishNotation() : array
+ public function buildReversePolishNotation(): array
{
$tokens = [];
/** @var SplStack<Token> $stack */