Skip to content

Commit

Permalink
Remove memcache from needed extensions + minor fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
mehlah authored and nateabele committed Feb 20, 2012
1 parent 8961de7 commit 855d8a0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -7,7 +7,7 @@ php:
- 5.3 - 5.3
- 5.4 - 5.4


before_script: php tests/ci_depends.php before_script: php tests/ci_depends.php $OPCODE_CACHE


script: console/li3 test tests/cases script: console/li3 test tests/cases


Expand Down
17 changes: 3 additions & 14 deletions tests/ci_depends.php
Expand Up @@ -3,7 +3,6 @@
<?php <?php


set_time_limit(0); set_time_limit(0);
ini_set('phar.readonly', 0);


$installer = new PhpExtensions(); $installer = new PhpExtensions();


Expand All @@ -13,12 +12,10 @@
$installer->install('xcache'); $installer->install('xcache');
} }


$installer->install('memcache');
$installer->install('memcached'); $installer->install('memcached');
$installer->install('mongo'); $installer->install('mongo');


class PhpExtensions class PhpExtensions {
{
protected $extensions; protected $extensions;
protected $phpVersion; protected $phpVersion;
protected $iniPath; protected $iniPath;
Expand All @@ -27,12 +24,6 @@ public function __construct() {
$this->phpVersion = phpversion(); $this->phpVersion = phpversion();
$this->iniPath = php_ini_loaded_file(); $this->iniPath = php_ini_loaded_file();
$this->extensions = array( $this->extensions = array(
'memcache' => array(
'url' => 'http://pecl.php.net/get/memcache-2.2.6.tgz',
'php_version' => array(),
'cfg' => array('--enable-memcache'),
'ini' => array('extension=memcache.so'),
),
'memcached' => array( 'memcached' => array(
'url' => 'http://pecl.php.net/get/memcached-1.0.2.tgz', 'url' => 'http://pecl.php.net/get/memcached-1.0.2.tgz',
'php_version' => array( 'php_version' => array(
Expand Down Expand Up @@ -66,8 +57,8 @@ public function __construct() {
'extension=xcache.so', 'extension=xcache.so',
'xcache.cacher=false', 'xcache.cacher=false',
'xcache.admin.enable_auth=0', 'xcache.admin.enable_auth=0',
'xcache.var_size=1M', 'xcache.var_size=1M'
), )
), ),
'mongo' => array( 'mongo' => array(
'url' => 'http://pecl.php.net/get/mongo-1.2.7.tgz', 'url' => 'http://pecl.php.net/get/mongo-1.2.7.tgz',
Expand All @@ -83,7 +74,6 @@ public function install($name) {
if (array_key_exists($name, $this->extensions)) { if (array_key_exists($name, $this->extensions)) {
$extension = $this->extensions[$name]; $extension = $this->extensions[$name];



echo "== extension: $name ==\n"; echo "== extension: $name ==\n";


foreach ($extension['php_version'] as $version) { foreach ($extension['php_version'] as $version) {
Expand All @@ -94,7 +84,6 @@ public function install($name) {
$version[1], $version[1],
$this->phpVersion $this->phpVersion
); );

return; return;
} }
} }
Expand Down

0 comments on commit 855d8a0

Please sign in to comment.