Improve error handling thanks to tests.

Author: Crell

platformsh-flex-env.php

@@ -35,45 +35,43 @@ function mapPlatformShEnvironment() : void
 
 function mapPlatformShDatabase() : void
 {
-
     $dbRelationshipName = 'database';
 
     // Set the DATABASE_URL for Doctrine, if necessary.
     # "mysql://[email protected]:3306/symfony?charset=utf8mb4&serverVersion=5.7";
     if (getenv('PLATFORM_RELATIONSHIPS')) {
-        $relationships = json_decode(base64_decode(getenv('PLATFORM_RELATIONSHIPS'), true));
-        foreach ($relationships[$dbRelationshipName] as $endpoint) {
-            if (empty($endpoint['query']['is_master'])) {
-                continue;
-            }
-
-            $dbUrl = sprintf(
-                '%s://%s:%s@%s:%d/%s',
-                $endpoint['scheme'],
-                $endpoint['username'],
-                $endpoint['password'],
-                $endpoint['host'],
-                $endpoint['port'],
-                $endpoint['path']
-            );
-
-            switch ($endpoint['scheme']) {
-                case 'mysql':
-                    // Defaults to the latest MariaDB version
-                    $dbUrl .= '?serverVersion=10.2&charset=utf8mb4';
-                    break;
-
-                case 'pgsql':
-                    // Postgres 9.6 is the latest supported version on Platform.sh
-                    $dbUrl .= '?serverVersion=9.6';
+        $relationships = json_decode(base64_decode(getenv('PLATFORM_RELATIONSHIPS'), true), true);
+        if (isset($relationships[$dbRelationshipName])) {
+            foreach ($relationships[$dbRelationshipName] as $endpoint) {
+                if (empty($endpoint['query']['is_master'])) {
+                    continue;
+                }
+
+                $dbUrl = sprintf(
+                    '%s://%s:%s@%s:%d/%s',
+                    $endpoint['scheme'],
+                    $endpoint['username'],
+                    $endpoint['password'],
+                    $endpoint['host'],
+                    $endpoint['port'],
+                    $endpoint['path']
+                );
+
+                switch ($endpoint['scheme']) {
+                    case 'mysql':
+                        // Defaults to the latest MariaDB version
+                        $dbUrl .= '?serverVersion=10.2&charset=utf8mb4';
+                        break;
+
+                    case 'pgsql':
+                        // Postgres 9.6 is the latest supported version on Platform.sh
+                        $dbUrl .= '?serverVersion=9.6';
+                }
+
+                $_SERVER['DATABASE_URL'] = $dbUrl;
+                return;
             }
-
-            $_SERVER['DATABASE_URL'] = $dbUrl;
-
-            return;
         }
-
-        return;
     }
 
     // Hack the Doctrine URL to be syntactically valid in a build hook, even
@@ -89,5 +87,4 @@ function mapPlatformShDatabase() : void
     );
 
     $_SERVER['DATABASE_URL'] = $dbUrl;
-
 }

tests/FlexBridgeDatabaseTest.php

@@ -0,0 +1,77 @@
+<?php
+declare(strict_types=1);
+
+namespace Platformsh\FlexBridge\Tests;
+
+use PHPUnit\Framework\TestCase;
+
+class FlexBridgeDatabaseTest extends TestCase
+{
+
+    protected $relationships;
+
+    protected $defaultDbUrl;
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->relationships = [
+            'database' => [
+                'scheme' => 'mysql',
+                'username' => 'user',
+                'password' => '',
+                'host' => 'database.internal',
+                'port' => '3306',
+                'path' => 'main',
+                'query' => ['is_master' => true],
+            ]
+        ];
+
+        $this->defaultDbUrl = sprintf(
+            '%s://%s:%s@%s:%s/%s?charset=utf8mb4&serverVersion=10.2',
+            'mysql',
+            '',
+            '',
+            'localhost',
+            3306,
+            ''
+        );
+    }
+
+    public function testNotOnPlatformshDoesNotSetDatabase()
+    {
+        mapPlatformShEnvironment();
+
+        $this->assertArrayNotHasKey('DATABASE_URL', $_SERVER);
+    }
+
+    public function testNoRelationships()
+    {
+        // We assume no relationships array, but a PLATFORM_APPLICATION env var,
+        // means we're in a build hook.
+
+        putenv('PLATFORM_APPLICATION=test');
+
+        //putenv(sprintf('PLATFORM_RELATIONSHIPS=%s', base64_encode(json_encode($this->relationships))));
+
+        mapPlatformShEnvironment();
+
+        $this->assertEquals($this->defaultDbUrl, $_SERVER['DATABASE_URL']);
+    }
+
+    public function testNoDatabaseRelationship()
+    {
+        putenv('PLATFORM_APPLICATION=test');
+
+        $rels = $this->relationships;
+        unset($rels['database']);
+
+        putenv(sprintf('PLATFORM_RELATIONSHIPS=%s', base64_encode(json_encode($this->relationships))));
+
+        mapPlatformShEnvironment();
+
+        $this->assertEquals($this->defaultDbUrl, $_SERVER['DATABASE_URL']);
+    }
+
+}