Add types to constructors and private/final/internal methods (Batch I)

Author: derrabus

Dotenv.php

@@ -216,7 +216,7 @@ public function parse(string $data, string $path = '.env'): array
         }
     }
 
-    private function lexVarname()
+    private function lexVarname(): string
     {
         // var name + optional export
         if (!preg_match('/(export[ \t]++)?('.self::VARNAME_REGEX.')/A', $this->data, $matches, 0, $this->cursor)) {
@@ -244,7 +244,7 @@ private function lexVarname()
         return $matches[2];
     }
 
-    private function lexValue()
+    private function lexValue(): string
     {
         if (preg_match('/[ \t]*+(?:#.*)?$/Am', $this->data, $matches, 0, $this->cursor)) {
             $this->moveCursor($matches[0]);
@@ -339,7 +339,7 @@ private function lexValue()
         return $v;
     }
 
-    private function lexNestedExpression()
+    private function lexNestedExpression(): string
     {
         ++$this->cursor;
         $value = '';
@@ -372,7 +372,7 @@ private function skipEmptyLines()
         }
     }
 
-    private function resolveCommands(string $value)
+    private function resolveCommands(string $value): string
     {
         if (false === strpos($value, '$')) {
             return $value;
@@ -419,7 +419,7 @@ private function resolveCommands(string $value)
         }, $value);
     }
 
-    private function resolveVariables(string $value)
+    private function resolveVariables(string $value): string
     {
         if (false === strpos($value, '$')) {
             return $value;
@@ -487,7 +487,7 @@ private function moveCursor(string $text)
         $this->lineno += substr_count($text, "\n");
     }
 
-    private function createFormatException(string $message)
+    private function createFormatException(string $message): FormatException
     {
         return new FormatException($message, new FormatExceptionContext($this->data, $this->path, $this->lineno, $this->cursor));
     }

Exception/FormatException.php

@@ -27,7 +27,7 @@ public function __construct(string $message, FormatExceptionContext $context, in
         parent::__construct(sprintf("%s in \"%s\" at line %d.\n%s", $message, $context->getPath(), $context->getLineno(), $context->getDetails()), $code, $previous);
     }
 
-    public function getContext()
+    public function getContext(): FormatExceptionContext
     {
         return $this->context;
     }

Exception/FormatExceptionContext.php

@@ -29,17 +29,17 @@ public function __construct(string $data, string $path, int $lineno, int $cursor
         $this->cursor = $cursor;
     }
 
-    public function getPath()
+    public function getPath(): string
     {
         return $this->path;
     }
 
-    public function getLineno()
+    public function getLineno(): int
     {
         return $this->lineno;
     }
 
-    public function getDetails()
+    public function getDetails(): string
     {
         $before = str_replace("\n", '\n', substr($this->data, max(0, $this->cursor - 20), min(20, $this->cursor)));
         $after = str_replace("\n", '\n', substr($this->data, $this->cursor, 20));