Merge pull request #166 from thephpleague/fix-mixed-null

Replace mixed|null with mixed in docblocks

Author: colinodell

src/Block/Element/AbstractBlock.php

@@ -318,10 +318,10 @@ public function setLastLineBlank(Cursor $cursor, $currentLineNumber)
     }
 
     /**
-     * @param string     $key
-     * @param mixed|null $default
+     * @param string $key
+     * @param mixed  $default
      *
-     * @return mixed|null
+     * @return mixed
      */
     public function getData($key, $default = null)
     {

src/ElementRendererInterface.php

@@ -23,10 +23,10 @@
 interface ElementRendererInterface
 {
     /**
-     * @param string     $option
-     * @param mixed|null $default
+     * @param string $option
+     * @param mixed  $default
      *
-     * @return mixed|null
+     * @return mixed
      */
     public function getOption($option, $default = null);
 

src/Environment.php

@@ -109,9 +109,9 @@ public function setConfig(array $config = [])
 
     /**
      * @param string|null $key
-     * @param mixed|null  $default
+     * @param mixed       $default
      *
-     * @return mixed|null
+     * @return mixed
      */
     public function getConfig($key = null, $default = null)
     {

src/HtmlRenderer.php

@@ -36,10 +36,10 @@ public function __construct(Environment $environment)
     }
 
     /**
-     * @param string     $option
-     * @param mixed|null $default
+     * @param string $option
+     * @param mixed  $default
      *
-     * @return mixed|null
+     * @return mixed
      */
     public function getOption($option, $default = null)
     {

src/Inline/Element/AbstractInline.php

@@ -61,10 +61,10 @@ public function setParent($parent)
     }
 
     /**
-     * @param string     $key
-     * @param mixed|null $default
+     * @param string $key
+     * @param mixed  $default
      *
-     * @return mixed|null
+     * @return mixed
      */
     public function getData($key, $default = null)
     {

src/Util/ArrayCollection.php

@@ -83,7 +83,7 @@ public function set($key, $value)
     /**
      * @param mixed $key
      *
-     * @return mixed|null
+     * @return mixed
      */
     public function get($key)
     {
@@ -93,7 +93,7 @@ public function get($key)
     /**
      * @param mixed $key
      *
-     * @return mixed|null
+     * @return mixed
      */
     public function remove($key)
     {
@@ -172,7 +172,7 @@ public function offsetExists($offset)
      *
      * @param mixed $offset The offset to retrieve.
      *
-     * @return mixed|null
+     * @return mixed
      */
     public function offsetGet($offset)
     {

src/Util/Configuration.php

@@ -44,9 +44,9 @@ public function setConfig(array $config = [])
 
     /**
      * @param string|null $key
-     * @param mixed|null  $default
+     * @param mixed       $default
      *
-     * @return mixed|null
+     * @return mixed
      */
     public function getConfig($key = null, $default = null)
     {
@@ -70,7 +70,7 @@ public function getConfig($key = null, $default = null)
      * @param string      $keyPath
      * @param string|null $default
      *
-     * @return mixed|null
+     * @return mixed
      */
     protected function getConfigByPath($keyPath, $default = null)
     {