From 1d0ae14682a1102affbe276eb26e8169bb2e8849 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Wed, 27 Apr 2016 10:42:19 +0200
Subject: [PATCH] php: scrub dependencies for #915

---
 Makefile                                 |  2 --
 src/etc/rc.php_ini_setup                 |  6 ++----
 src/opnsense/mvc/app/config/config.php   |  7 -------
 src/opnsense/mvc/app/config/services.php | 13 -------------
 4 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/Makefile b/Makefile
index cddfe53c3..0c500ea65 100644
--- a/Makefile
+++ b/Makefile
@@ -129,8 +129,6 @@ CORE_DEPENDS?=		apinger \
 			php56-ldap \
 			php56-mcrypt \
 			php56-openssl \
-			php56-pdo \
-			php56-pdo_sqlite \
 			php56-session \
 			php56-simplexml \
 			php56-sockets \
diff --git a/src/etc/rc.php_ini_setup b/src/etc/rc.php_ini_setup
index a1d50bddf..ea4ac5445 100755
--- a/src/etc/rc.php_ini_setup
+++ b/src/etc/rc.php_ini_setup
@@ -26,7 +26,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 if [ -d /usr/local/lib/php/20151012 ]; then
-	# PHP 7
+	# PHP 7.0
 	EXTENSIONSDIR="/usr/local/lib/php/20151012/"
 elif [ -d /usr/local/lib/php/20131226 ]; then
 	# PHP 5.6
@@ -56,9 +56,7 @@ PHPMODULES="$PHPMODULES suhosin"
 PHPMODULES="$PHPMODULES ctype"
 # Page compression
 PHPMODULES="$PHPMODULES zlib"
-# SQLlite & Database
-PHPMODULES="$PHPMODULES pdo"
-PHPMODULES="$PHPMODULES pdo_sqlite"
+# Databases
 PHPMODULES="$PHPMODULES sqlite3"
 # RADIUS
 PHPMODULES="$PHPMODULES radius"
diff --git a/src/opnsense/mvc/app/config/config.php b/src/opnsense/mvc/app/config/config.php
index 7bae63091..3893138b3 100644
--- a/src/opnsense/mvc/app/config/config.php
+++ b/src/opnsense/mvc/app/config/config.php
@@ -1,13 +1,6 @@
 <?php
 
 return new \Phalcon\Config(array(
-    'database' => array(
-        'adapter'     => 'Mysql',
-        'host'        => 'localhost',
-        'username'    => 'root',
-        'password'    => '',
-        'dbname'      => 'test',
-    ),
     'application' => array(
         'controllersDir' => __DIR__ . '/../../app/controllers/',
         'modelsDir'      => __DIR__ . '/../../app/models/',
diff --git a/src/opnsense/mvc/app/config/services.php b/src/opnsense/mvc/app/config/services.php
index 20983c4e4..a40cafa3d 100644
--- a/src/opnsense/mvc/app/config/services.php
+++ b/src/opnsense/mvc/app/config/services.php
@@ -3,7 +3,6 @@
 use Phalcon\DI\FactoryDefault;
 use Phalcon\Mvc\View;
 use Phalcon\Mvc\Url as UrlResolver;
-use Phalcon\Db\Adapter\Pdo\Mysql as DbAdapter;
 use Phalcon\Mvc\View\Engine\Volt as VoltEngine;
 use Phalcon\Mvc\Model\Metadata\Memory as MetaDataAdapter;
 use Phalcon\Session\Adapter\Files as SessionAdapter;
@@ -51,18 +50,6 @@ $di->set('view', function () use ($config) {
     return $view;
 }, true);
 
-/**
- * Database connection is created based in the parameters defined in the configuration file
- */
-$di->set('db', function () use ($config) {
-    return new DbAdapter(array(
-        'host' => $config->database->host,
-        'username' => $config->database->username,
-        'password' => $config->database->password,
-        'dbname' => $config->database->dbname
-    ));
-});
-
 /**
  * If the configuration specify the use of metadata adapter use it or use memory otherwise
  */