Throw custom exceptions

Author: GrahamCampbell

src/Exception/ExceptionInterface.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace Dotenv\Exception;
+
+/**
+ * This is the exception interface.
+ */
+interface ExceptionInterface
+{
+    //
+}

src/Exception/InvalidCallbackException.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Dotenv\Exception;
+
+use InvalidArgumentException;
+
+/**
+ * This is the invalid callback exception class.
+ */
+class InvalidCallbackException extends InvalidArgumentException implements ExceptionInterface
+{
+    //
+}

src/Exception/InvalidFileException.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Dotenv\Exception;
+
+use InvalidArgumentException;
+
+/**
+ * This is the invalid file exception class.
+ */
+class InvalidFileException extends InvalidArgumentException implements ExceptionInterface
+{
+    //
+}

src/Exception/InvalidPathException.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Dotenv\Exception;
+
+use InvalidArgumentException;
+
+/**
+ * This is the invalid path exception class.
+ */
+class InvalidPathException extends InvalidArgumentException implements ExceptionInterface
+{
+    //
+}

src/Exception/ValidationException.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Dotenv\Exception;
+
+use RuntimeException;
+
+/**
+ * This is the validation exception class.
+ */
+class ValidationException extends RuntimeException implements ExceptionInterface
+{
+    //
+}

src/Loader.php

@@ -2,7 +2,8 @@
 
 namespace Dotenv;
 
-use InvalidArgumentException;
+use Dotenv\Exception\InvalidFileException;
+use Dotenv\Exception\InvalidPathException;
 
 /**
  * Loader.
@@ -67,17 +68,17 @@ public function load()
     /**
      * Ensures the given filePath is readable.
      *
-     * @throws \InvalidArgumentException
+     * @throws \Dotenv\Exception\InvalidPathException
      *
      * @return void
      */
     protected function ensureFileIsReadable()
     {
         $filePath = $this->filePath;
         if (!is_readable($filePath) || !is_file($filePath)) {
-            throw new InvalidArgumentException(sprintf(
+            throw new InvalidPathException(sprintf(
                 'Dotenv: Environment file .env not found or not readable. '.
-                'Create file with your environment settings at %s',
+                'Create file with your environment settings at %s.',
                 $filePath
             ));
         }
@@ -194,7 +195,7 @@ protected function splitCompoundStringIntoParts($name, $value)
      * @param string $name
      * @param string $value
      *
-     * @throws \InvalidArgumentException
+     * @throws \Dotenv\Exception\InvalidFileException
      *
      * @return array
      */
@@ -231,7 +232,7 @@ protected function sanitiseVariableValue($name, $value)
 
             // Unquoted values cannot contain whitespace
             if (preg_match('/\s+/', $value) > 0) {
-                throw new InvalidArgumentException('Dotenv values containing spaces must be surrounded by quotes.');
+                throw new InvalidFileException('Dotenv values containing spaces must be surrounded by quotes.');
             }
         }
 

src/Validator.php

@@ -2,6 +2,9 @@
 
 namespace Dotenv;
 
+use Dotenv\Exception\InvalidCallbackException;
+use Dotenv\Exception\InvalidPathException;
+
 /**
  * Validator.
  *
@@ -82,12 +85,14 @@ function ($value) use ($choices) {
      * @param callable $callback
      * @param string   $message
      *
+     * @throws \Dotenv\Exception\InvalidCallbackException|\Dotenv\Exception\ValidationException
+     *
      * @return \Dotenv\Validator
      */
     protected function assertCallback($callback, $message = 'failed callback assertion')
     {
         if (!is_callable($callback)) {
-            throw new \InvalidArgumentException('Callback must be callable');
+            throw new InvalidCallbackException('The provided callback must be callable.');
         }
 
         $variablesFailingAssertion = array();
@@ -99,8 +104,8 @@ protected function assertCallback($callback, $message = 'failed callback asserti
         }
 
         if (count($variablesFailingAssertion) > 0) {
-            throw new \RuntimeException(sprintf(
-                'One or more environment variables failed assertions: %s',
+            throw new ValidationException(sprintf(
+                'One or more environment variables failed assertions: %s.',
                 implode(', ', $variablesFailingAssertion)
             ));
         }