Merge branch 'release/1.5.7'

Author: rhukster

Blueprints/src/BlueprintSchema.php

@@ -566,7 +566,7 @@ protected function parseFormField($key, array $field, array $params, $prefix = '
     protected function getFieldKey($key, $prefix, $parent)
     {
         // Set name from the array key.
-        if (strpos($key[0], '.') === 0) {
+        if (is_string($key) && strpos($key[0], '.') === 0) {
             return ($parent ?: rtrim($prefix, '.')) . $key;
         }
 

CHANGELOG.md

@@ -1,3 +1,11 @@
+# v1.5.7
+## 02/17/2021
+
+1. [](#new)
+   * Pass new phpstan level 8 tests
+1. [](#bugfix)
+   * Fixed `Trying to access array offset on value of type int` in `BlueprintSchema::getFieldKey()`
+
 # v1.5.6
 ## 12/03/2020
 

File/src/MoFile.php

@@ -144,6 +144,9 @@ protected function readInt()
         }
 
         $read = unpack($this->endian, $read);
+        if ($read === false) {
+            return false;
+        }
 
         return array_shift($read);
     }

Session/src/Session.php

@@ -99,7 +99,7 @@ public function start()
      */
     public function getId()
     {
-        return session_id();
+        return session_id() ?: null;
     }
 
     /**
@@ -123,7 +123,7 @@ public function setId($id)
      */
     public function getName()
     {
-        return session_name();
+        return session_name() ?: null;
     }
 
     /**
@@ -146,11 +146,14 @@ public function setName($name)
      */
     public function invalidate()
     {
-        $params = session_get_cookie_params();
-        setcookie(session_name(), '', time() - 42000,
-            $params['path'], $params['domain'],
-            $params['secure'], $params['httponly']
-        );
+        $name = $this->getName();
+        if (null !== $name) {
+            $params = session_get_cookie_params();
+            setcookie($name, '', time() - 42000,
+                $params['path'], $params['domain'],
+                $params['secure'], $params['httponly']
+            );
+        }
 
         session_unset();
         session_destroy();

tests/phpstan/phpstan.neon

@@ -2,7 +2,8 @@ includes:
     #- '../../vendor/phpstan/phpstan-strict-rules/rules.neon'
     - '../../vendor/phpstan/phpstan-deprecation-rules/rules.neon'
 parameters:
-    bootstrap: phpstan-bootstrap.php
+    bootstrapFiles:
+        - phpstan-bootstrap.php
     inferPrivatePropertyTypeFromConstructor: true
     reportUnmatchedIgnoredErrors: false