platine-php / expression

src/Operator.php

Braces +1 added lines, -2 removed lines

@@ -54,8 +54,7 @@
  * @class Operator
  * @package Platine\Expression
  */
-class Operator
-{
+class Operator {
     /**
      * The operator like =, >=, ...
      * @var string

src/Token.php

Braces +3 added lines, -6 removed lines

@@ -51,8 +51,7 @@ 
  * @class Token
  * @package Platine\Expression
  */
-class Token
-{
+class Token {
     /**
      * Constants
      */
@@ -96,8 +95,7 @@ 
      * @param mixed $value
      * @param string|null $name
      */
-    public function __construct(string $type, $value, ?string $name = null)
-    {
+    public function __construct(string $type, $value, ?string $name = null) {
         $this->name = $name;
         $this->value = $value;
         $this->type = $type;
@@ -116,8 +114,7 @@ 
      * Return the token value
      * @return mixed
      */
-    public function getValue()
-    {
+    public function getValue() {
         return $this->value;
     }
 

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
     public const OPERATOR = 'operator';
     public const LEFT_PARENTHESIS = 'LP';
     public const RIGHT_PARENTHESIS = 'RP';
-    public const FUNCTION = 'function';
+    public const function = 'function';
     public const PARAM_SEPARATOR = 'PS';
     public const STRING = 'string';
     public const SPACE = 'space';

src/CustomFunction.php

Braces +2 added lines, -4 removed lines

@@ -54,8 +54,7 @@ 
  * @class CustomFunction
  * @package Platine\Expression
  */
-class CustomFunction
-{
+class CustomFunction {
     /**
      * The function name
      * @var string
@@ -79,8 +78,7 @@ 
      * @param string $name
      * @param callable $function
      */
-    public function __construct(string $name, callable $function)
-    {
+    public function __construct(string $name, callable $function) {
         $this->name = $name;
         $this->function = $function;
 

src/Tokenizer.php

Spacing +1 added lines, -1 removed lines

@@ -324,7 +324,7 @@
      */
     public function buildReversePolishNotation(): array
     {
-        $tokens  = [];
+        $tokens = [];
         /** @var SplStack<Token> $stack */
         $stack = new SplStack();
 

Braces +2 added lines, -4 removed lines

@@ -56,8 +56,7 @@ 
  * @class Tokenizer
  * @package Platine\Expression
  */
-class Tokenizer
-{
+class Tokenizer {
     /**
      * List of token
      * @var array<Token>
@@ -111,8 +110,7 @@ 
      * @param string $input
      * @param array<string, Operator> $operators
      */
-    public function __construct(string $input, array $operators)
-    {
+    public function __construct(string $input, array $operators) {
         $this->input = $input;
         $this->operators = $operators;
     }

Upper-Lower-Casing +4 added lines, -4 removed lines

@@ -191,7 +191,7 @@ 
                     continue 2;
 
                 case $ch === '[':
-                    $this->tokens[] = new Token(Token::FUNCTION, 'array');
+                    $this->tokens[] = new Token(Token::function, 'array');
                     $this->allowNegative = true;
                     $this->tokens[] = new Token(Token::LEFT_PARENTHESIS, '');
 
@@ -250,7 +250,7 @@ 
 
                 case $this->isLeftParenthesis($ch):
                     if ($this->stringBuffer != '') {
-                        $this->tokens[] = new Token(Token::FUNCTION, $this->stringBuffer);
+                        $this->tokens[] = new Token(Token::function, $this->stringBuffer);
                         $this->stringBuffer = '';
                     } elseif (strlen($this->numberBuffer) > 0) {
                         $this->emptyNumberBufferAsLiteral();
@@ -344,7 +344,7 @@ 
 
                     break;
 
-                case Token::FUNCTION:
+                case Token::function:
                     if ($paramCounter->count() > 0 && $paramCounter->top() === 0) {
                         $paramCounter->push($paramCounter->pop() + 1);
                     }
@@ -407,7 +407,7 @@ 
                             throw new IncorrectBracketsException('Incorrect brackets');
                         }
                     }
-                    if ($stack->count() > 0 && Token::FUNCTION === $stack->top()->getType()) {
+                    if ($stack->count() > 0 && Token::function === $stack->top()->getType()) {
                         /** @var Token $funcToken */
                         $funcToken = $stack->pop();
                         $funcToken->setParamCount($paramCounter->pop());

src/Executor.php

Indentation +4 added lines, -4 removed lines

@@ -120,8 +120,8 @@ 
         $cacheKey = $expression;
         if (!array_key_exists($cacheKey, $this->caches)) {
             $tokens = (new Tokenizer($expression, $this->operators))
-                       ->tokenize()
-                       ->buildReversePolishNotation();
+                        ->tokenize()
+                        ->buildReversePolishNotation();
 
             if ($cache) {
                 $this->caches[$cacheKey] = $tokens;
@@ -456,8 +456,8 @@ 
     protected function defaultVariables(): array
     {
         return [
-          'pi' => 3.14159265359,
-          'e' => 2.71828182846
+            'pi' => 3.14159265359,
+            'e' => 2.71828182846
         ];
     }
 }

Braces +5 added lines, -10 removed lines

@@ -55,8 +55,7 @@ 
  * @class Executor
  * @package Platine\Expression
  */
-class Executor
-{
+class Executor {
     /**
      * The variable list
      * @var array<string, int|float>
@@ -96,16 +95,14 @@ 
     /**
      * Create new instance
      */
-    public function __construct()
-    {
+    public function __construct() {
         $this->addDefaults();
     }
 
     /**
      * When do clone of this object
      */
-    public function __clone()
-    {
+    public function __clone() {
         $this->addDefaults();
     }
 
@@ -115,8 +112,7 @@ 
      * @param bool $cache
      * @return int|float|string|null
      */
-    public function execute(string $expression, bool $cache = true)
-    {
+    public function execute(string $expression, bool $cache = true) {
         $cacheKey = $expression;
         if (!array_key_exists($cacheKey, $this->caches)) {
             $tokens = (new Tokenizer($expression, $this->operators))
@@ -172,8 +168,7 @@ 
      * @param string $name
      * @return int|float
      */
-    public function getVariable(string $name)
-    {
+    public function getVariable(string $name) {
         if (! array_key_exists($name, $this->variables)) {
             if ($this->variableNotFoundHandler !== null) {
                 return call_user_func($this->variableNotFoundHandler, $name);

Spacing +9 added lines, -9 removed lines

@@ -174,7 +174,7 @@ 
      */
     public function getVariable(string $name)
     {
-        if (! array_key_exists($name, $this->variables)) {
+        if (!array_key_exists($name, $this->variables)) {
             if ($this->variableNotFoundHandler !== null) {
                 return call_user_func($this->variableNotFoundHandler, $name);
             }
@@ -373,7 +373,7 @@ 
             'uNeg' => [static fn($a) => 0 - $a, 200, false],
             '*' => [static fn($a, $b) => $a * $b, 180, false],
             '/' => [
-                static function ($a, $b) {
+                static function($a, $b) {
                     if ($b == 0) {
                         throw new DivisionByZeroException();
                     }
@@ -403,14 +403,14 @@ 
     protected function defaultFunctions(): array
     {
         return [
-            'abs' => static function ($arg) {
+            'abs' => static function($arg) {
                 if ((int) $arg == $arg) {
                     return abs(intval($arg));
                 }
                 return abs(floatval($arg));
             },
             'array' => static fn(...$args) => $args,
-            'avg' => static function ($arg1, ...$args) {
+            'avg' => static function($arg1, ...$args) {
                 if (is_array($arg1)) {
                     if (count($arg1) === 0) {
                         throw new InvalidArgumentException('Array must contains at least one element');
@@ -422,13 +422,13 @@ 
                 $args = [$arg1, ...$args];
                 return array_sum($args) / count($args);
             },
-            'ceil' => static function ($arg) {
+            'ceil' => static function($arg) {
                 if ((int) $arg == $arg) {
                     return ceil(intval($arg));
                 }
                 return ceil(floatval($arg));
             },
-            'floor' => static function ($arg) {
+            'floor' => static function($arg) {
                 if ((int) $arg == $arg) {
                     return floor(intval($arg));
                 }
@@ -444,14 +444,14 @@ 
             'sqrt' => static fn($arg) => sqrt(floatval($arg)),
             'hypot' => static fn($arg1, $arg2) => hypot(floatval($arg1), floatval($arg2)),
             'intdiv' => static fn($arg1, $arg2) => intdiv(intval($arg1), intval($arg2)),
-            'max' => static function ($arg1, ...$args) {
+            'max' => static function($arg1, ...$args) {
                 if (is_array($arg1) && count($arg1) === 0) {
                     throw new InvalidArgumentException('Array must contains at least one element');
                 }
 
                 return max(is_array($arg1) ? $arg1 : [$arg1, ...$args]);
             },
-            'min' => static function ($arg1, ...$args) {
+            'min' => static function($arg1, ...$args) {
                 if (is_array($arg1) && count($arg1) === 0) {
                     throw new InvalidArgumentException('Array must contains at least one element');
                 }
@@ -459,7 +459,7 @@ 
                 return min(is_array($arg1) ? $arg1 : [$arg1, ...$args]);
             },
             'pow' => static fn($arg1, $arg2) => $arg1 ** $arg2,
-            'round' => static function ($arg, int $precision = 0) {
+            'round' => static function($arg, int $precision = 0) {
                 if ((int) $arg == $arg) {
                     return round(intval($arg), intval($precision));
                 }