Merge pull request #6969 from beporter/enumerate-email-transports

Add `Email::configuredTransport()` to enumerate transport key names.
cakephp · Jul 8, 2015 · 97c3dcc · 97c3dcc
2 parents 2499227 + 9a06252
commit 97c3dcc
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 3 deletions.
diff --git a/src/Network/Email/Email.php b/src/Network/Email/Email.php
@@ -1240,6 +1240,16 @@ public static function configTransport($key, $config = null)
         static::$_transportConfig[$key] = $config;
     }
 
+    /**
+     * Returns an array containing the named transport configurations
+     *
+     * @return array Array of configurations.
+     */
+    public static function configuredTransport()
+    {
+        return array_keys(static::$_transportConfig);
+    }
+
     /**
      * Delete transport configuration.
      *

diff --git a/tests/TestCase/Network/Email/EmailTest.php b/tests/TestCase/Network/Email/EmailTest.php
@@ -100,9 +100,12 @@ public function setUp()
         parent::setUp();
         $this->CakeEmail = new TestEmail();
 
-        Email::configTransport('debug', [
-            'className' => 'Debug'
-        ]);
+        $this->transports = [
+            'debug' => [
+                'className' => 'Debug'
+            ]
+        ];
+        Email::configTransport($this->transports);
     }
 
     /**
@@ -881,6 +884,22 @@ public function testConfigTransportInstance()
         $this->assertEquals(['className' => $instance], Email::configTransport('debug'));
     }
 
+    /**
+     * Test enumerating all transport configurations
+     *
+     * @return void
+     */
+    public function testConfiguredTransport()
+    {
+        $result = Email::configuredTransport();
+        $this->assertInternalType('array', $result, 'Should have config keys');
+        $this->assertEquals(
+            array_keys($this->transports),
+            $result,
+            'Loaded transports should be present in enumeration.'
+        );
+    }
+
     /**
      * Test dropping a transport configuration
      *