#2255 - PHP 8.1 support

.github/workflows/main.yml

@@ -63,7 +63,7 @@ jobs:
       fail-fast: false
 
       matrix:
-        php: ['7.4', '8.0']
+        php: ['7.4', '8.0', '8.1']
         build_type: ['ts', 'nts']
         arch: ['x64']
 
@@ -102,6 +102,13 @@ jobs:
           - name: win2016-vc15
             php: '8.0'
 
+          - name: win2016-vc15
+            php: '8.1'
+
+          # Ignore 8.1 until its release date
+          - name: win2019-vs16
+            php: '8.1'
+
     steps:
       - uses: actions/checkout@v2
         with:

.gitignore

@@ -13,6 +13,7 @@ doc
 vendor
 
 # Compilation artifacts.
+*.dep
 *.gch
 *.lo
 *.la

Library/Backends/ZendEngine2/Backend.php

@@ -444,6 +444,7 @@ public function arrayFetch(Variable $var, Variable $src, $index, $flags, $arrayA
 
             /* Types which map to the same */
             case 'variable':
+            case 'mixed':
             case 'string':
                 $type = $index->getType();
                 break;
@@ -454,7 +455,7 @@ public function arrayFetch(Variable $var, Variable $src, $index, $flags, $arrayA
                     $arrayAccess['right']
                 );
         }
-        if ($isVariable && \in_array($index->getType(), ['variable', 'string'])) {
+        if ($isVariable && \in_array($index->getType(), ['variable', 'string', 'mixed'])) {
             $output = 'zephir_array_fetch('.$this->getVariableCodePointer($var).', '.$this->getVariableCode($src).', '.$this->getVariableCode($index).', '.$flags.', "'.Compiler::getShortUserPath($arrayAccess['file']).'", '.$arrayAccess['line'].');';
         } else {
             if ($isVariable) {
@@ -487,7 +488,7 @@ public function arrayIsset(Variable $var, $resolvedExpr, $expression, Compilatio
 
         if ('int' == $resolvedExpr->getType() || 'long' == $resolvedExpr->getType()) {
             return new CompiledExpression('bool', 'zephir_array_isset_long('.$this->getVariableCode($var).', '.$this->getVariableCode($resolvedExpr).')', $expression);
-        } elseif ('variable' == $resolvedExpr->getType() || 'string' == $resolvedExpr->getType()) {
+        } elseif ('variable' == $resolvedExpr->getType() || 'string' == $resolvedExpr->getType() || 'mixed' === $resolvedExpr->getType()) {
             return new CompiledExpression('bool', 'zephir_array_isset('.$this->getVariableCode($var).', '.$this->getVariableCode($resolvedExpr).')', $expression);
         }
 
@@ -550,6 +551,7 @@ public function arrayUnset(Variable $variable, $exprIndex, $flags, CompilationCo
 
                     case 'string':
                     case 'variable':
+                    case 'mixed':
                         $context->codePrinter->output('zephir_array_unset('.$variableCode.', '.$indexCode.', '.$flags.');');
                         break;
 

Library/BaseBackend.php

@@ -66,7 +66,7 @@ public function getName()
      *
      * @return string
      */
-    public function getInternalKernelPath()
+    public function getInternalKernelPath(): string
     {
         return "$this->kernelsPath/{$this->name}";
     }
@@ -76,7 +76,7 @@ public function getInternalKernelPath()
      *
      * @return string
      */
-    public function getInternalTemplatePath()
+    public function getInternalTemplatePath(): string
     {
         return "$this->templatesPath/{$this->name}";
     }
@@ -88,16 +88,14 @@ public function getInternalTemplatePath()
      *
      * @return string
      */
-    public function getTemplateFileContents($filename)
+    public function getTemplateFileContents(string $filename): string
     {
-        $templatePath = rtrim($this->config->get('templatepath', 'backend'), '\\/');
+        $templatePath = rtrim((string) $this->config->get('templatepath', 'backend'), '\\/');
         if (empty($templatepath)) {
             $templatePath = $this->templatesPath;
         }
 
-        return file_get_contents(
-            "{$templatePath}/{$this->name}/{$filename}"
-        );
+        return file_get_contents("{$templatePath}/{$this->name}/{$filename}");
     }
 
     /**

Library/Call.php

@@ -454,6 +454,7 @@ public function getResolvedParams(array $parameters, CompilationContext $compila
                             break;
 
                         case 'variable':
+                        case 'mixed':
                             $params[] = $compilationContext->backend->getVariableCode($parameterVariable);
                             $types[] = $parameterVariable->getType();
                             $dynamicTypes = array_merge(
@@ -636,6 +637,7 @@ public function getReadOnlyResolvedParams(array $parameters, CompilationContext
 
                         case 'string':
                         case 'variable':
+                        case 'mixed':
                         case 'array':
                             $params[] = $compilationContext->backend->getVariableCode($parameterVariable);
                             $dynamicTypes[] = $parameterVariable->getType();

Library/ClassMethodParameters.php

@@ -142,46 +142,55 @@ public function count(): int
         return count($this->parameters);
     }
 
+    #[\ReturnTypeWillChange]
     public function rewind()
     {
         $this->position = 0;
     }
 
+    #[\ReturnTypeWillChange]
     public function key()
     {
         return $this->position;
     }
 
+    #[\ReturnTypeWillChange]
     public function valid()
     {
         return isset($this->parameters[$this->position]);
     }
 
+    #[\ReturnTypeWillChange]
     public function current()
     {
         return $this->parameters[$this->position];
     }
 
+    #[\ReturnTypeWillChange]
     public function next()
     {
         ++$this->position;
     }
 
+    #[\ReturnTypeWillChange]
     public function offsetExists($offset)
     {
         return isset($this->parameters[$offset]);
     }
 
+    #[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         return $this->parameters[$offset];
     }
 
+    #[\ReturnTypeWillChange]
     public function offsetSet($offset, $value)
     {
         $this->parameters[$offset] = $value;
     }
 
+    #[\ReturnTypeWillChange]
     public function offsetUnset($offset)
     {
         unset($this->parameters[$offset]);

Library/Config.php

@@ -9,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir;
 
 use ArrayAccess;
@@ -222,25 +224,26 @@ public function offsetExists($key): bool
     /**
      * Gets a $key from the internal container.
      *
-     * @param mixed $key
+     * @param mixed $offset
      *
      * @return mixed|null
      */
-    public function offsetGet($key)
+    #[\ReturnTypeWillChange]
+    public function offsetGet($offset)
     {
-        if (!\is_array($key)) {
-            return $this->offsetExists($key) ? $this->container[$key] : null;
+        if (!\is_array($offset)) {
+            return $this->offsetExists($offset) ? $this->container[$offset] : null;
         }
 
-        $namespace = key($key);
-        $key = current($key);
+        $namespace = key($offset);
+        $offset = current($offset);
 
         if (!$this->offsetExists($namespace) || !\is_array($this->container[$namespace])) {
             return null;
         }
 
-        if (isset($this->container[$namespace][$key]) || \array_key_exists($key, $this->container[$namespace])) {
-            return $this->container[$namespace][$key];
+        if (isset($this->container[$namespace][$offset]) || \array_key_exists($offset, $this->container[$namespace])) {
+            return $this->container[$namespace][$offset];
         }
 
         return null;
@@ -252,6 +255,7 @@ public function offsetGet($key)
      * @param mixed $key
      * @param mixed $value
      */
+    #[\ReturnTypeWillChange]
     public function offsetSet($key, $value)
     {
         if (!\is_array($key)) {
@@ -277,6 +281,7 @@ public function offsetSet($key, $value)
      *
      * @param mixed $key
      */
+    #[\ReturnTypeWillChange]
     public function offsetUnset($key)
     {
         unset($this->container[$key]);