Made tweaks found by a static anayzer

Author: GrahamCampbell

src/Dotenv.php

@@ -59,7 +59,7 @@ public static function create($paths, $file = null, FactoryInterface $envFactory
      * @param string[] $paths
      * @param string   $file
      *
-     * @return string
+     * @return string[]
      */
     private static function getFilePaths(array $paths, $file)
     {
@@ -73,7 +73,7 @@ private static function getFilePaths(array $paths, $file)
      *
      * @throws \Dotenv\Exception\InvalidPathException|\Dotenv\Exception\InvalidFileException
      *
-     * @return string[]
+     * @return array<string|null>
      */
     public function load()
     {
@@ -85,7 +85,7 @@ public function load()
      *
      * @throws \Dotenv\Exception\InvalidFileException
      *
-     * @return string[]
+     * @return array<string|null>
      */
     public function safeLoad()
     {
@@ -102,7 +102,7 @@ public function safeLoad()
      *
      * @throws \Dotenv\Exception\InvalidPathException|\Dotenv\Exception\InvalidFileException
      *
-     * @return string[]
+     * @return array<string|null>
      */
     public function overload()
     {
@@ -116,7 +116,7 @@ public function overload()
      *
      * @throws \Dotenv\Exception\InvalidPathException|\Dotenv\Exception\InvalidFileException
      *
-     * @return string[]
+     * @return array<string|null>
      */
     protected function loadData($overload = false)
     {
@@ -126,13 +126,13 @@ protected function loadData($overload = false)
     /**
      * Required ensures that the specified variables exist, and returns a new validator object.
      *
-     * @param string|string[] $variable
+     * @param string|string[] $variables
      *
      * @return \Dotenv\Validator
      */
-    public function required($variable)
+    public function required($variables)
     {
-        return new Validator((array) $variable, $this->loader);
+        return new Validator((array) $variables, $this->loader);
     }
 
     /**

src/Environment/AbstractVariables.php

@@ -47,7 +47,7 @@ public function isImmutable()
      */
     public function has($name)
     {
-        return !is_null($this->get($name));
+        return $this->get($name) !== null;
     }
 
     /**

src/Environment/Adapter/ApacheAdapter.php

@@ -46,7 +46,7 @@ public function get($name)
     public function set($name, $value = null)
     {
         if (apache_getenv($name) !== false) {
-            apache_setenv($name, $value);
+            apache_setenv($name, (string) $value);
         }
     }
 

src/Exception/InvalidCallbackException.php

@@ -37,7 +37,7 @@ public static function process(array $lines)
      * @param string   $line
      * @param string[] $buffer
      *
-     * @return string[]
+     * @return array
      */
     private static function multilineProcess($multiline, $line, array $buffer)
     {

src/Lines.php

@@ -82,7 +82,7 @@ public function setImmutable($immutable = false)
      *
      * @throws \Dotenv\Exception\InvalidPathException|\Dotenv\Exception\InvalidFileException
      *
-     * @return string[]
+     * @return array<string|null>
      */
     public function load()
     {
@@ -143,7 +143,7 @@ private static function readFromFile($filePath)
      *
      * @param string[] $entries
      *
-     * @return string[]
+     * @return array<string|null>
      */
     private function processEntries(array $entries)
     {

src/Loader.php

@@ -154,7 +154,7 @@ private static function processQuotedValue($value)
             $quote
         );
 
-        $value = preg_replace($pattern, '$1', $value);
+        $value = (string) preg_replace($pattern, '$1', $value);
 
         return str_replace('\\\\', '\\', str_replace("\\$quote", $quote, $value));
     }

src/Parser.php

@@ -2,7 +2,6 @@
 
 namespace Dotenv;
 
-use Dotenv\Exception\InvalidCallbackException;
 use Dotenv\Exception\ValidationException;
 
 /**
@@ -129,28 +128,24 @@ function ($value) use ($choices) {
      * @param callable $callback
      * @param string   $message
      *
-     * @throws \Dotenv\Exception\InvalidCallbackException|\Dotenv\Exception\ValidationException
+     * @throws \Dotenv\Exception\ValidationException
      *
      * @return \Dotenv\Validator
      */
-    protected function assertCallback($callback, $message = 'failed callback assertion')
+    protected function assertCallback(callable $callback, $message = 'failed callback assertion')
     {
-        if (!is_callable($callback)) {
-            throw new InvalidCallbackException('The provided callback must be callable.');
-        }
+        $failing = [];
 
-        $variablesFailingAssertion = [];
-        foreach ($this->variables as $variableName) {
-            $variableValue = $this->loader->getEnvironmentVariable($variableName);
-            if (call_user_func($callback, $variableValue) === false) {
-                $variablesFailingAssertion[] = $variableName." $message";
+        foreach ($this->variables as $variable) {
+            if ($callback($this->loader->getEnvironmentVariable($variable)) === false) {
+                $failing[] = sprintf('%s %s', $variable, $message);
             }
         }
 
-        if (count($variablesFailingAssertion) > 0) {
+        if (count($failing) > 0) {
             throw new ValidationException(sprintf(
                 'One or more environment variables failed assertions: %s.',
-                implode(', ', $variablesFailingAssertion)
+                implode(', ', $failing)
             ));
         }
 

src/Validator.php

@@ -6,7 +6,7 @@
 class LinesTest extends TestCase
 {
     /**
-     * @var string
+     * @var string|false
      */
     protected $autodetect;
 

tests/Dotenv/LinesTest.php

@@ -12,7 +12,7 @@ class LoaderTest extends TestCase
     protected $folder;
 
     /**
-     * @var string|null
+     * @var string[]|null
      */
     protected $keyVal;