mirror of
https://github.com/lucaspalomodevelop/core.git
synced 2026-03-13 00:07:26 +00:00
php: scrub dependencies for #915
This commit is contained in:
parent
20cd1ce9f6
commit
1d0ae14682
2
Makefile
2
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 \
|
||||
|
||||
@ -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"
|
||||
|
||||
@ -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/',
|
||||
|
||||
@ -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
|
||||
*/
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user