Fix latest merge

lib/classes/databox.php

@@ -583,20 +583,16 @@ class databox extends base
         $stmt->execute();
         $row = $stmt->fetch(PDO::FETCH_ASSOC);
         $stmt->closeCursor();
-        if ($row)
+        if ($row) {
             $ord = $row['ord'] + 1;
+        }
+
+        $params[':ord'] = $ord;
 
         $sql = 'INSERT INTO sbas (sbas_id, ord, host, port, dbname, sqlengine, user, pwd)
               VALUES (null, :ord, :host, :port, :dbname, "MYSQL", :user, :password)';
         $stmt = $app['phraseanet.appbox']->get_connection()->prepare($sql);
-        $stmt->execute([
-            ':ord'      => $ord
-            , ':host'     => $host
-            , ':port'     => $port
-            , ':dbname'   => $dbname
-            , ':user'     => $user
-            , ':password' => $password
-        ]);
+        $stmt->execute($params);
         $stmt->closeCursor();
         $sbas_id = (int) $app['phraseanet.appbox']->get_connection()->lastInsertId();
 

lib/classes/media/subdef.php

@@ -765,7 +765,6 @@ class media_subdef extends media_abstract implements cache_cacheableInterface
             . "/" . $this->record->get_record_id() . "/"
             . $this->get_name() . "/");
 
-
         return;
     }
 

lib/classes/patch/386alpha3a.php

@@ -45,6 +45,16 @@ class patch_386alpha3a implements patchInterface
         return $this->concern;
     }
 
+    /**
+     * Returns doctrine migrations needed for the patch.
+     *
+     * @return array
+     */
+    public function getDoctrineMigrations()
+    {
+        return array();
+    }
+
     /**
      * {@inheritdoc}
      */