Scrub some deprecated methods. Code formatting.

Author: dustingraham

src/Command.php

@@ -52,17 +52,6 @@ public function bind($key, $value = null)
         return $this;
     }
 
-    /**
-     * @deprecated 
-     * 
-     * @param $params
-     * @return $this
-     */
-    public function bindValues($params)
-    {
-        return $this->bind($params);
-    }
-    
     /**
      * @param Connection $connection
      * @return string
@@ -110,16 +99,4 @@ protected function quoteIntoSql(Connection $connection)
 
         return strtr($quotedSql, $quotedParams);
     }
-    
-    /**
-     * @deprecated 
-     * 
-     * @return \React\Promise\Promise
-     */
-    public function execute()
-    {
-        $thing = $this->db->executeCommand($this);
-        
-        return $thing;
-    }
 }

src/Connection.php

@@ -1,6 +1,5 @@
 <?php namespace DustinGraham\ReactMysql;
 
-use React\EventLoop\LoopInterface;
 use React\EventLoop\Timer\TimerInterface;
 use React\Promise\Deferred;
 
@@ -39,16 +38,6 @@ public function escape($string)
         return $this->real_escape_string($string);
     }
 
-    /**
-     * @deprecated 
-     * 
-     * Close the mysqli connection.
-     */
-    public function close()
-    {
-        $this->mysqli->close();
-    }
-    
     public function execute(Command $command)
     {
         if ($this->currentQuery)

src/ConnectionFactory.php

@@ -1,7 +1,5 @@
 <?php namespace DustinGraham\ReactMysql;
 
-use React\EventLoop\LoopInterface;
-
 class ConnectionFactory
 {
     /**

src/ConnectionPool.php

@@ -41,6 +41,7 @@ public function withConnection($cb)
             $connection = $this->available->dequeue();
 
             $cb($connection);
+            
             return;
         }
 

src/Database.php

@@ -44,7 +44,7 @@ public function createCommand($sql = null, $params = [])
     {
         $command = new Command($this, $sql);
 
-        return $command->bindValues($params);
+        return $command->bind($params);
     }
 
     /**
@@ -86,7 +86,7 @@ public function executeCommand(Command $command)
 
     /**
      * @deprecated Remove from tests.
-     * 
+     *
      * @return ConnectionPool
      */
     public function getPool()
@@ -100,7 +100,7 @@ public function statement($sql, $params = null)
 
         $deferred = new Deferred();
 
-        $this->pool->withConnection(function(Connection $connection) use ($command, $deferred)
+        $this->pool->withConnection(function (Connection $connection) use ($command, $deferred)
         {
             $sql = $command->getPreparedQuery($connection);
 
@@ -144,7 +144,7 @@ public function loopTick(TimerInterface $timer)
         }
 
         $reads = $errors = $rejects = [];
-        foreach($this->conns as $conn)
+        foreach ($this->conns as $conn)
         {
             $reads[] = $conn['mysqli'];
         }
@@ -153,7 +153,7 @@ public function loopTick(TimerInterface $timer)
         if (mysqli_poll($reads, $errors, $rejects, 0) < 1) return;
 
         /** @var Connection $read */
-        foreach($reads as $read)
+        foreach ($reads as $read)
         {
             /** @var Deferred $deferred */
             $deferred = $this->conns[$read->id]['deferred'];
@@ -181,7 +181,7 @@ public function loopTick(TimerInterface $timer)
         // Check error pile.
         // Current understanding is that this would only happen if the connection
         // was closed, or not opened correctly.
-        foreach($errors as $error)
+        foreach ($errors as $error)
         {
             $this->pool->releaseConnection($error);
             unset($this->conns[$error->id]);
@@ -192,7 +192,7 @@ public function loopTick(TimerInterface $timer)
         // Check rejection pile.
         // Current understanding is that this would only happen if we passed a
         // connection that was already reaped. But... maybe not.
-        foreach($rejects as $reject)
+        foreach ($rejects as $reject)
         {
             $this->pool->releaseConnection($reject);
             unset($this->conns[$reject->id]);

tests/DatabaseTest.php

@@ -20,8 +20,6 @@ public function XtestCommandClass()
         $command = $db->createCommand();
 
         $this->assertInstanceOf(Command::class, $command);
-        
-        $command->bindValues([]);
     }
 
     public function disabled_testMysqliConnection()
@@ -78,30 +76,6 @@ public function disabled_testMysqliAsynchronous()
         $this->assertEquals(3, $result->num_rows);
     }
 
-    public function disabled_testCreateCommandGetPromise()
-    {
-        $db = new Database();
-        
-        $cmd = $db->createCommand();
-        
-        $cmd->sql = 'SELECT * FROM simple_table WHERE id = :id';
-        $cmd->bind(':id', 1);
-        
-        $promise = $cmd->execute();
-        $this->assertInstanceOf(Promise::class, $promise);
-        
-        ////
-        
-        $promise = $db->createCommand(
-            'SELECT * FROM simple_table WHERE id = :test',
-            [
-                ':test',
-                1,
-            ]
-        )->execute();
-        $this->assertInstanceOf(Promise::class, $promise);
-    }
-    
     // TODO: This test is still todo.
     public function disabled_testParamCounting()
     {
@@ -128,37 +102,6 @@ public function disabled_testParamCounting()
             $query,
             'SELECT * FROM simple_table WHERE id = :test'
         );
-        
-        $connection->close();
-    }
-    
-    public function disabled_testCommandResolvedResults()
-    {
-        $rowCount = false;
-        $failedReason = false;
-        
-        $db = new Database();
-        
-        $db->createCommand(
-            'SELECT * FROM simple_table WHERE id = :test',
-            [':test' => 1,]
-        )
-            ->execute()
-            ->then(function (\mysqli_result $results) use (&$rowCount)
-            {
-                $rows = $results->fetch_all(MYSQLI_ASSOC);
-                $rowCount = count($rows);
-            })
-            ->otherwise(function ($reason) use (&$failedReason)
-            {
-                $failedReason = $reason;
-            });
-        
-        ConnectionFactory::$loop->run();
-        
-        $this->assertFalse($failedReason);
-        
-        $this->assertEquals(1, $rowCount);
     }
 
     public function disabled_testAssertStrings()
@@ -212,25 +155,6 @@ public function disabled_testComplexCommandParameterBinding()
             "INSERT INTO simple_table ( `id`, `name`, `value`, `created_at` ) VALUES ( NULL, 'John Cash', 7, NOW() );",
             $query
         );
-        
-        $connection->close();
-    }
-    
-    public function disabled_testBadQuery()
-    {
-        $db = new Database();
-        
-        $failedReason = null;
-        $db->createCommand('SELECT * FROM `nonexistant_table`;')
-            ->execute()
-            ->otherwise(function ($reason) use (&$failedReason)
-            {
-                $failedReason = $reason;
-            });
-        
-        ConnectionFactory::$loop->run();
-        
-        $this->assertNotNull($failedReason);
     }
 
     public function disabled_testPool()

tests/RebuildTest.php

@@ -7,6 +7,7 @@
 use React\EventLoop\Factory;
 use React\Promise\Deferred;
 use React\Promise\Promise;
+use React\Promise\UnhandledRejectionException;
 
 class RebuildTest extends TestCaseDatabase
 {
@@ -117,6 +118,45 @@ public function testFreeResult()
         $db->loop->run();
     }
 
+    public function testBadQuery()
+    {
+        $db = $this->getDatabase();
+        
+        $errorTriggered = false;
+        $db->statement('SELECT foo FROM')
+            ->then(function(\mysqli_result $result)
+            {
+                $this->fail();
+            })
+            ->otherwise(function($error) use (&$errorTriggered)
+            {
+                $errorTriggered = !!$error;
+            })
+            ->done();
+        
+        $db->shuttingDown = true;
+        $db->loop->run();
+        
+        $this->assertTrue($errorTriggered, 'Error was sent to otherwise callback.');
+    }
+    
+    public function testUnhandledBadQuery()
+    {
+        $db = $this->getDatabase();
+        
+        $db->statement('SELECT foo FROM')
+            ->then(function(\mysqli_result $result)
+            {
+                $this->fail();
+            })
+            ->done();
+        
+        $this->setExpectedException(UnhandledRejectionException::class);
+        
+        $db->shuttingDown = true;
+        $db->loop->run();
+    }
+    
     /**
      * Works Brilliantly
      */