Merge pull request #41 from dhrrgn/upgrade-psalm

simensen · web-flow · commit b2444050c080 · 2021-10-06T11:53:15.000-05:00
Upgrade to Psalm 4 to fix issues since 3.0.1
diff --git a/composer.json b/composer.json
@@ -35,7 +35,7 @@
         "phpunit/phpunit": "^7.5 || ^8.5 || ^9.3",
         "scrutinizer/ocular": "1.6.0",
         "squizlabs/php_codesniffer": "^3.5",
-        "vimeo/psalm": "^3.14"
+        "vimeo/psalm": "^4.0.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/src/Data.php b/src/Data.php
@@ -145,7 +145,7 @@ public function get(string $key, $default = null)
      */
     public function has(string $key): bool
     {
-        $currentValue = &$this->data;
+        $currentValue = $this->data;
 
         foreach (self::keyToPathArray($key) as $currentKey) {
             if (
@@ -154,7 +154,7 @@ public function has(string $key): bool
             ) {
                 return false;
             }
-            $currentValue = &$currentValue[$currentKey];
+            $currentValue = $currentValue[$currentKey];
         }
 
         return true;
@@ -223,6 +223,7 @@ public function offsetGet($key)
      * {@inheritdoc}
      *
      * @param string $key
+     * @param mixed $value
      */
     #[\ReturnTypeWillChange]
     public function offsetSet($key, $value)

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ public function get(string $key, $default = null)`
`145`	`145`	`*/`
`146`	`146`	`public function has(string $key): bool`
`147`	`147`	`{`
`148`		`- $currentValue = &$this->data;`
	`148`	`+ $currentValue = $this->data;`
`149`	`149`
`150`	`150`	`foreach (self::keyToPathArray($key) as $currentKey) {`
`151`	`151`	`if (`
`@@ -154,7 +154,7 @@ public function has(string $key): bool`
`154`	`154`	`) {`
`155`	`155`	`return false;`
`156`	`156`	`}`
`157`		`- $currentValue = &$currentValue[$currentKey];`
	`157`	`+ $currentValue = $currentValue[$currentKey];`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`return true;`
`@@ -223,6 +223,7 @@ public function offsetGet($key)`
`223`	`223`	`* {@inheritdoc}`
`224`	`224`	`*`
`225`	`225`	`* @param string $key`
	`226`	`+ * @param mixed $value`
`226`	`227`	`*/`
`227`	`228`	`#[\ReturnTypeWillChange]`
`228`	`229`	`public function offsetSet($key, $value)`