Changing SchemaCache to accept only a connection object

src/Database/SchemaCache.php

@@ -93,21 +93,11 @@ public function clear($name = null)
     /**
      * Helper method to get the schema collection.
      *
-     * @param string|\Cake\Datasource\ConnectionInterface $connection Connection name to get the schema for or a connection instance
+     * @param \Cake\Datasource\ConnectionInterface $connection Connection object
      * @return \Cake\Database\Schema\Collection|\Cake\Database\Schema\CachedCollection
      */
-    public function getSchema($connection)
+    public function getSchema(ConnectionInterface $connection)
     {
-        if (is_string($connection)) {
-            $connection = ConnectionManager::get($connection);
-        } elseif (!$connection instanceof ConnectionInterface) {
-            throw new InvalidArgumentException(sprintf(
-                'SchemaCache::getSchema() expects `%s`, `%s` given.',
-                ConnectionInterface::class,
-                is_object($connection) ? get_class($connection) : gettype($connection)
-            ));
-        }
-
         if (!method_exists($connection, 'schemaCollection')) {
             throw new RuntimeException(sprintf(
                 'The "%s" connection is not compatible with schema caching, ' .

src/Shell/SchemaCacheShell.php

@@ -16,6 +16,7 @@
 
 use Cake\Console\Shell;
 use Cake\Database\SchemaCache;
+use Cake\Datasource\ConnectionManager;
 use RuntimeException;
 
 /**
@@ -30,13 +31,6 @@
 class SchemaCacheShell extends Shell
 {
 
-    /**
-     * Schema Cache
-     *
-     * @var \Cake\Database\SchemaCache
-     */
-    protected $_schemaCache;
-
     /**
      * Build metadata.
      *
@@ -85,7 +79,8 @@ public function clear($name = null)
     protected function _getSchemaCache()
     {
         try {
-            return new SchemaCache($this->params['connection']);
+            $connection = ConnectionManager::get($this->params['connection']);
+            return new SchemaCache($connection);
         } catch (RuntimeException $e) {
             $this->abort($e->getMessage());
         }

tests/TestCase/Database/SchemaCacheTest.php

@@ -84,7 +84,7 @@ public function testClearEnablesMetadataCache()
         $ds = ConnectionManager::get('test');
         $ds->cacheMetadata(false);
 
-        $ormCache = new SchemaCache('test');
+        $ormCache = new SchemaCache($ds);
         $ormCache->clear();
 
         $this->assertInstanceOf('Cake\Database\Schema\CachedCollection', $ds->schemaCollection());
@@ -100,7 +100,7 @@ public function testBuildEnablesMetadataCache()
         $ds = ConnectionManager::get('test');
         $ds->cacheMetadata(false);
 
-        $ormCache = new SchemaCache('test');
+        $ormCache = new SchemaCache($ds);
         $ormCache->build();
 
         $this->assertInstanceOf('Cake\Database\Schema\CachedCollection', $ds->schemaCollection());
@@ -113,11 +113,12 @@ public function testBuildEnablesMetadataCache()
      */
     public function testBuildNoArgs()
     {
+        $ds = ConnectionManager::get('test');
         $this->cache->expects($this->at(3))
             ->method('write')
             ->with('test_articles');
 
-        $ormCache = new SchemaCache('test');
+        $ormCache = new SchemaCache($ds);
         $ormCache->build();
     }
 
@@ -128,13 +129,15 @@ public function testBuildNoArgs()
      */
     public function testBuildNamedModel()
     {
+        $ds = ConnectionManager::get('test');
+
         $this->cache->expects($this->once())
             ->method('write')
             ->with('test_articles');
         $this->cache->expects($this->never())
             ->method('delete');
 
-        $ormCache = new SchemaCache('test');
+        $ormCache = new SchemaCache($ds);
         $ormCache->build('articles');
     }
 
@@ -145,6 +148,8 @@ public function testBuildNamedModel()
      */
     public function testBuildOverwritesExistingData()
     {
+        $ds = ConnectionManager::get('test');
+
         $this->cache->expects($this->once())
             ->method('write')
             ->with('test_articles');
@@ -153,33 +158,24 @@ public function testBuildOverwritesExistingData()
         $this->cache->expects($this->never())
             ->method('delete');
 
-        $ormCache = new SchemaCache('test');
+        $ormCache = new SchemaCache($ds);
         $ormCache->build('articles');
     }
 
-    /**
-     * Test getting an instance with an invalid connection name.
-     *
-     * @expectedException \Cake\Datasource\Exception\MissingDatasourceConfigException
-     * @return void
-     */
-    public function testInvalidConnection()
-    {
-        new SchemaCache('invalid-connection');
-    }
-
     /**
      * Test clear() with no args.
      *
      * @return void
      */
     public function testClearNoArgs()
     {
+        $ds = ConnectionManager::get('test');
+
         $this->cache->expects($this->at(3))
             ->method('delete')
             ->with('test_articles');
 
-        $ormCache = new SchemaCache('test');
+        $ormCache = new SchemaCache($ds);
         $ormCache->clear();
     }
 
@@ -190,13 +186,15 @@ public function testClearNoArgs()
      */
     public function testClearNamedModel()
     {
+        $ds = ConnectionManager::get('test');
+
         $this->cache->expects($this->never())
             ->method('write');
         $this->cache->expects($this->once())
             ->method('delete')
             ->with('test_articles');
 
-        $ormCache = new SchemaCache('test');
+        $ormCache = new SchemaCache($ds);
         $ormCache->clear('articles');
     }
 
@@ -218,8 +216,8 @@ public function testGetSchemaWithConnectionInstance()
     /**
      * Test passing invalid object
      *
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage SchemaCache::getSchema() expects `Cake\Datasource\ConnectionInterface`, `stdClass` given.
+     * @expectedException \TypeError
+     * @expectedExceptionMessage Cake\Database\SchemaCache::getSchema() must implement interface Cake\Datasource\ConnectionInterface
      * @return void
      */
     public function testPassingInvalidObject()