Commit 1d0ae146 authored by Franco Fichtner's avatar Franco Fichtner

php: scrub dependencies for #915

parent 20cd1ce9
...@@ -129,8 +129,6 @@ CORE_DEPENDS?= apinger \ ...@@ -129,8 +129,6 @@ CORE_DEPENDS?= apinger \
php56-ldap \ php56-ldap \
php56-mcrypt \ php56-mcrypt \
php56-openssl \ php56-openssl \
php56-pdo \
php56-pdo_sqlite \
php56-session \ php56-session \
php56-simplexml \ php56-simplexml \
php56-sockets \ php56-sockets \
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
# POSSIBILITY OF SUCH DAMAGE. # POSSIBILITY OF SUCH DAMAGE.
if [ -d /usr/local/lib/php/20151012 ]; then if [ -d /usr/local/lib/php/20151012 ]; then
# PHP 7 # PHP 7.0
EXTENSIONSDIR="/usr/local/lib/php/20151012/" EXTENSIONSDIR="/usr/local/lib/php/20151012/"
elif [ -d /usr/local/lib/php/20131226 ]; then elif [ -d /usr/local/lib/php/20131226 ]; then
# PHP 5.6 # PHP 5.6
...@@ -56,9 +56,7 @@ PHPMODULES="$PHPMODULES suhosin" ...@@ -56,9 +56,7 @@ PHPMODULES="$PHPMODULES suhosin"
PHPMODULES="$PHPMODULES ctype" PHPMODULES="$PHPMODULES ctype"
# Page compression # Page compression
PHPMODULES="$PHPMODULES zlib" PHPMODULES="$PHPMODULES zlib"
# SQLlite & Database # Databases
PHPMODULES="$PHPMODULES pdo"
PHPMODULES="$PHPMODULES pdo_sqlite"
PHPMODULES="$PHPMODULES sqlite3" PHPMODULES="$PHPMODULES sqlite3"
# RADIUS # RADIUS
PHPMODULES="$PHPMODULES radius" PHPMODULES="$PHPMODULES radius"
......
<?php <?php
return new \Phalcon\Config(array( return new \Phalcon\Config(array(
'database' => array(
'adapter' => 'Mysql',
'host' => 'localhost',
'username' => 'root',
'password' => '',
'dbname' => 'test',
),
'application' => array( 'application' => array(
'controllersDir' => __DIR__ . '/../../app/controllers/', 'controllersDir' => __DIR__ . '/../../app/controllers/',
'modelsDir' => __DIR__ . '/../../app/models/', 'modelsDir' => __DIR__ . '/../../app/models/',
......
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
use Phalcon\DI\FactoryDefault; use Phalcon\DI\FactoryDefault;
use Phalcon\Mvc\View; use Phalcon\Mvc\View;
use Phalcon\Mvc\Url as UrlResolver; 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\View\Engine\Volt as VoltEngine;
use Phalcon\Mvc\Model\Metadata\Memory as MetaDataAdapter; use Phalcon\Mvc\Model\Metadata\Memory as MetaDataAdapter;
use Phalcon\Session\Adapter\Files as SessionAdapter; use Phalcon\Session\Adapter\Files as SessionAdapter;
...@@ -51,18 +50,6 @@ $di->set('view', function () use ($config) { ...@@ -51,18 +50,6 @@ $di->set('view', function () use ($config) {
return $view; return $view;
}, true); }, 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 * If the configuration specify the use of metadata adapter use it or use memory otherwise
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment