Merge pull request #4 from unleashedtech/feature/database-name-var

Adding support for `DATABASE_NAME` variables.

CHANGELOG.md

@@ -4,6 +4,12 @@ Updates should follow the [Keep a CHANGELOG](https://keepachangelog.com/) princi
 
 ## [Unreleased][unreleased]
 
+## [0.3.1] - 2022-05-19
+
+### Changed
+
+- Added support for `DATABASE_NAME` variables.
+
 ## [0.3.0] - 2022-05-17
 
 ### Changed
@@ -149,7 +155,8 @@ Updates should follow the [Keep a CHANGELOG](https://keepachangelog.com/) princi
 
 **Initial release!**
 
-[unreleased]: https://github.com/unleashedtech/dotenv-drupal/compare/0.3.0...main
+[unreleased]: https://github.com/unleashedtech/dotenv-drupal/compare/0.3.1...main
+[0.3.1]: https://github.com/unleashedtech/dotenv-drupal/compare/0.2.1...0.3.1
 [0.3.0]: https://github.com/unleashedtech/dotenv-drupal/compare/0.2.1...0.3.0
 [0.2.1]: https://github.com/unleashedtech/dotenv-drupal/compare/0.2.0...0.2.1
 [0.2.0]: https://github.com/unleashedtech/dotenv-drupal/compare/0.1.17...0.2.0

README.md

@@ -168,6 +168,12 @@ $dotenv->setAppName('earth');
 // ...
 ```
 
+The database name for a site can be overridden via definition of a `{{ app }}__{{ site }}__DATABASE_NAME`
+environment variable:
+```dotenv
+EARTH__ANTARCTICA__DATABASE_NAME=ant
+```
+
 #### FILE_PUBLIC_PATH
 Allows you to override the default `$settings['file_public_path']` value:
 

src/Dotenv.php

@@ -254,14 +254,18 @@ public function getDatabaseName(): string
             return $this->databaseName;
         }
         $result = parse_url($this->get('database_url'), PHP_URL_PATH);
-        if (NULL === $result || trim($result) === '/') {
-            // Multi-site configuration detected. Use the site name.
-            $result = $this->getSiteName();
-            if ($result === 'default' && !$this->isMultiSiteDefaultSiteAllowed()) {
-                if (PHP_SAPI === 'cli') {
-                    throw new \Exception('The "default" site in this multi-site install is not allowed. Please run something like `drush -l {{site}}` instead.');
-                } else {
-                    header("HTTP/1.1 401 Unauthorized");
+        if (NULL === $result || trim($result) === '/' || trim($result) === '') {
+            // Multi-site configuration detected. Try to use the DATABASE_NAME variable.
+            $result = $this->get('database_name');
+            if (! $result) {
+                // Fall back to using the site name.
+                $result = $this->getSiteName();
+                if ($result === 'default' && !$this->isMultiSiteDefaultSiteAllowed()) {
+                    if (PHP_SAPI === 'cli') {
+                        throw new \DomainException('The "default" site in this multi-site install is not allowed. Please run something like `drush -l {{site}}` instead.');
+                    }
+
+                    \header('HTTP/1.1 401 Unauthorized');
                     die('Unauthorized');
                 }
             }