#2186 - Add types in properties

zephir-lang · Apr 7, 2021 · 6ea0c75 · 6ea0c75
1 parent ef534d9
commit 6ea0c75
Show file tree

Hide file tree

Showing 19 changed files with 56 additions and 53 deletions.
diff --git a/Library/Operators/Arithmetical/AddOperator.php b/Library/Operators/Arithmetical/AddOperator.php
@@ -18,9 +18,9 @@
  */
 class AddOperator extends ArithmeticalBaseOperator
 {
-    protected $operator = '+';
+    protected string $operator = '+';
 
-    protected $bitOperator = '|';
+    protected string $bitOperator = '|';
 
-    protected $zvalOperator = 'zephir_add_function';
+    protected string $zvalOperator = 'zephir_add_function';
 }
diff --git a/Library/Operators/Arithmetical/ArithmeticalBaseOperator.php b/Library/Operators/Arithmetical/ArithmeticalBaseOperator.php
@@ -27,7 +27,7 @@
  */
 class ArithmeticalBaseOperator extends BaseOperator
 {
-    protected $literalOnly = true;
+    protected bool $literalOnly = true;
 
     /**
      * This tries to perform arithmetical operations.

diff --git a/Library/Operators/Arithmetical/DivOperator.php b/Library/Operators/Arithmetical/DivOperator.php
@@ -23,11 +23,11 @@
  */
 class DivOperator extends ArithmeticalBaseOperator
 {
-    protected $operator = '/';
+    protected string $operator = '/';
 
-    protected $bitOperator = '-';
+    protected string $bitOperator = '-';
 
-    protected $zvalOperator = 'div_function';
+    protected string $zvalOperator = 'div_function';
 
     /**
      * Compiles the arithmetical division operation.

diff --git a/Library/Operators/Arithmetical/ModOperator.php b/Library/Operators/Arithmetical/ModOperator.php
@@ -23,11 +23,11 @@
  */
 class ModOperator extends ArithmeticalBaseOperator
 {
-    protected $operator = '%';
+    protected string $operator = '%';
 
-    protected $bitOperator = '-';
+    protected string $bitOperator = '-';
 
-    protected $zvalOperator = 'mod_function';
+    protected string $zvalOperator = 'mod_function';
 
     /**
      * Compiles the arithmetical modulus operation.

diff --git a/Library/Operators/Arithmetical/MulOperator.php b/Library/Operators/Arithmetical/MulOperator.php
@@ -18,9 +18,9 @@
  */
 class MulOperator extends ArithmeticalBaseOperator
 {
-    protected $operator = '*';
+    protected string $operator = '*';
 
-    protected $bitOperator = '+';
+    protected string $bitOperator = '+';
 
-    protected $zvalOperator = 'mul_function';
+    protected string $zvalOperator = 'mul_function';
 }
diff --git a/Library/Operators/Arithmetical/SubOperator.php b/Library/Operators/Arithmetical/SubOperator.php
@@ -18,9 +18,9 @@
  */
 class SubOperator extends ArithmeticalBaseOperator
 {
-    protected $operator = '-';
+    protected string $operator = '-';
 
-    protected $bitOperator = '&';
+    protected string $bitOperator = '&';
 
-    protected $zvalOperator = 'zephir_sub_function';
+    protected string $zvalOperator = 'zephir_sub_function';
 }
diff --git a/Library/Operators/BaseOperator.php b/Library/Operators/BaseOperator.php
@@ -14,27 +14,29 @@
 use Zephir\CompilationContext;
 use Zephir\Variable;
 
+/**
+ * TODO: Make it abstract
+ */
 class BaseOperator
 {
-    protected $operator;
+    protected string $operator;
 
-    protected $expecting = true;
+    protected bool $expecting = true;
 
-    protected $readOnly = false;
+    protected bool $readOnly = false;
 
-    protected $literalOnly = true;
+    protected bool $literalOnly = true;
 
-    /** @var Variable|null */
-    protected $expectingVariable;
+    protected ?Variable $expectingVariable = null;
 
     /**
      * Sets if the variable must be resolved into a direct variable symbol
      * create a temporary value or ignore the return value.
      *
-     * @param bool     $expecting
-     * @param Variable $expectingVariable
+     * @param bool $expecting
+     * @param Variable|null $expectingVariable
      */
-    public function setExpectReturn($expecting, Variable $expectingVariable = null)
+    public function setExpectReturn(bool $expecting, Variable $expectingVariable = null)
     {
         $this->expecting = $expecting;
         $this->expectingVariable = $expectingVariable;
@@ -166,7 +168,7 @@ public function getExpectedComplexLiteral(CompilationContext $compilationContext
      *
      * @return bool
      */
-    public function isExpecting()
+    public function isExpecting(): bool
     {
         return $this->expecting;
     }
@@ -176,7 +178,7 @@ public function isExpecting()
      *
      * @param bool $readOnly
      */
-    public function setReadOnly($readOnly)
+    public function setReadOnly(bool $readOnly): void
     {
         $this->readOnly = $readOnly;
     }
@@ -186,7 +188,7 @@ public function setReadOnly($readOnly)
      *
      * @return bool
      */
-    public function isReadOnly()
+    public function isReadOnly(): bool
     {
         return $this->readOnly;
     }

diff --git a/Library/Operators/Bitwise/BitwiseAndOperator.php b/Library/Operators/Bitwise/BitwiseAndOperator.php
@@ -13,9 +13,9 @@
 
 class BitwiseAndOperator extends BitwiseBaseOperator
 {
-    protected $operator = '&';
+    protected string $operator = '&';
 
-    protected $bitOperator = '&';
+    protected string $bitOperator = '&';
 
-    protected $zvalOperator = 'zephir_bitwise_and_function';
+    protected string $zvalOperator = 'zephir_bitwise_and_function';
 }
diff --git a/Library/Operators/Bitwise/BitwiseBaseOperator.php b/Library/Operators/Bitwise/BitwiseBaseOperator.php
@@ -25,7 +25,7 @@
  */
 class BitwiseBaseOperator extends BaseOperator
 {
-    protected $literalOnly = true;
+    protected bool $literalOnly = true;
 
     /**
      * This tries to perform arithmetical operations

diff --git a/Library/Operators/Bitwise/BitwiseOrOperator.php b/Library/Operators/Bitwise/BitwiseOrOperator.php
@@ -13,9 +13,9 @@
 
 class BitwiseOrOperator extends BitwiseBaseOperator
 {
-    protected $operator = '|';
+    protected string $operator = '|';
 
-    protected $bitOperator = '|';
+    protected string $bitOperator = '|';
 
-    protected $zvalOperator = 'zephir_bitwise_or_function';
+    protected string $zvalOperator = 'zephir_bitwise_or_function';
 }
diff --git a/Library/Operators/Bitwise/BitwiseXorOperator.php b/Library/Operators/Bitwise/BitwiseXorOperator.php
@@ -13,9 +13,9 @@
 
 class BitwiseXorOperator extends BitwiseBaseOperator
 {
-    protected $operator = '^';
+    protected string $operator = '^';
 
-    protected $bitOperator = '^';
+    protected string $bitOperator = '^';
 
-    protected $zvalOperator = 'zephir_bitwise_xor_function';
+    protected string $zvalOperator = 'zephir_bitwise_xor_function';
 }
diff --git a/Library/Operators/Bitwise/ShiftLeftOperator.php b/Library/Operators/Bitwise/ShiftLeftOperator.php
@@ -13,9 +13,9 @@
 
 class ShiftLeftOperator extends BitwiseBaseOperator
 {
-    protected $operator = '<<';
+    protected string $operator = '<<';
 
-    protected $bitOperator = '<<';
+    protected string $bitOperator = '<<';
 
-    protected $zvalOperator = 'zephir_shift_left_function';
+    protected string $zvalOperator = 'zephir_shift_left_function';
 }
diff --git a/Library/Operators/Bitwise/ShiftRightOperator.php b/Library/Operators/Bitwise/ShiftRightOperator.php
@@ -13,9 +13,9 @@
 
 class ShiftRightOperator extends BitwiseBaseOperator
 {
-    protected $operator = '>>';
+    protected string $operator = '>>';
 
-    protected $bitOperator = '>>';
+    protected string $bitOperator = '>>';
 
-    protected $zvalOperator = 'zephir_shift_right_function';
+    protected string $zvalOperator = 'zephir_shift_right_function';
 }
diff --git a/Library/Operators/Logical/AndOperator.php b/Library/Operators/Logical/AndOperator.php
@@ -19,9 +19,9 @@
 
 class AndOperator extends LogicalBaseOperator
 {
-    protected $operator = '&&';
+    protected string $operator = '&&';
 
-    protected $bitOperator = '&&';
+    protected string $bitOperator = '&&';
 
     public function compile($expression, CompilationContext $compilationContext)
     {

diff --git a/Library/Operators/Logical/OrOperator.php b/Library/Operators/Logical/OrOperator.php
@@ -19,9 +19,9 @@
 
 class OrOperator extends LogicalBaseOperator
 {
-    protected $operator = '||';
+    protected string $operator = '||';
 
-    protected $bitOperator = '||';
+    protected string $bitOperator = '||';
 
     public function compile($expression, CompilationContext $compilationContext)
     {

diff --git a/Library/Operators/Other/NewInstanceOperator.php b/Library/Operators/Other/NewInstanceOperator.php
@@ -13,20 +13,21 @@
 
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
-use function Zephir\escape_class;
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
 use Zephir\MethodCall;
 use Zephir\Operators\BaseOperator;
 
+use function Zephir\escape_class;
+
 /**
  * NewInstance.
  *
  * Creates a new instance of a class
  */
 class NewInstanceOperator extends BaseOperator
 {
-    protected $literalOnly = false;
+    protected bool $literalOnly = false;
 
     /**
      * Creates a new instance.

diff --git a/Library/Operators/Other/NewInstanceTypeOperator.php b/Library/Operators/Other/NewInstanceTypeOperator.php
@@ -27,7 +27,7 @@
  */
 class NewInstanceTypeOperator extends BaseOperator
 {
-    protected $literalOnly = false;
+    protected bool $literalOnly = false;
 
     /**
      * Executes the operator.

diff --git a/Library/Operators/Other/TypeHintOperator.php b/Library/Operators/Other/TypeHintOperator.php
@@ -22,7 +22,7 @@
  */
 class TypeHintOperator extends BaseOperator
 {
-    private $strict = false;
+    private bool $strict = false;
 
     /**
      * Sets if the type hint is strict or not.

diff --git a/Library/Operators/Other/UnlikelyOperator.php b/Library/Operators/Other/UnlikelyOperator.php
@@ -24,7 +24,7 @@
  */
 class UnlikelyOperator extends BaseOperator
 {
-    /***
+    /**
      * Compile unlikely operator
      *
      * @param $expression
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,7 +24,7 @@ @@
      */
     class UnlikelyOperator extends BaseOperator
     {
-        /***
+        /**
          * Compile unlikely operator
          *
          * @param $expression
@@ Expand Down @@