Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/vendor/
composer.lock

16 changes: 9 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,19 @@ php:
matrix:
include:
- php: 7.0
env: SEND_COVERAGE=true SUBSPLIT=true
env: SEND_COVERAGE=true
fast_finish: true

cache:
directories:
- "$HOME/.composer/cache"

before_install:
- if [[ $TRAVIS_PHP_VERSION != hhvm && SEND_COVERAGE != true ]]; then phpenv config-rm xdebug.ini; fi
- composer self-update
- ./build/all.sh
- if [[ "$TRAVIS_PHP_VERSION" == '5.5' || "$TRAVIS_PHP_VERSION" == '5.6' ]]; then ./build/5.x.sh; fi
- if [[ "$TRAVIS_PHP_VERSION" == '7.0' ]]; then ./build/7.x.sh; fi
- if [[ "$TRAVIS_PHP_VERSION" == 'hhvm' ]]; then ./build/hhvm.sh; fi
- travis_retry composer self-update

install:
- travis_retry composer install --no-interaction --prefer-source
Expand All @@ -27,11 +30,10 @@ script:
- vendor/bin/phpunit -c phpunit.xml.dist

after_success:
- codecov # If coverage
- if [ "$TRAVIS_BRANCH" = "master" && "$SUBSPLIT" = true ]; then ''; fi
- if [[ "$TRAVIS_BRANCH" = "master" && "$SUBSPLIT" = true ]]; then ''; fi;
- if [[ "$SEND_COVERAGE" = true ]]; codecov; fi

sudo: true
sudo: required
dist: precise

notifications:
email: false
1 change: 0 additions & 1 deletion .travis/Readme.md

This file was deleted.

8 changes: 8 additions & 0 deletions build/5.x.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/usr/bin/env bash

# Install APC Adapter & APCu Adapter dependencies
yes '' | pecl install apcu-4.0.8

# Install Mongo
echo "extension = mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini;
echo "extension = mongodb.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini;
24 changes: 24 additions & 0 deletions build/7.x.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#!/usr/bin/env bash

# Install APC Adapter & APCu Adapter dependencies
yes '' | pecl install apcu-5.1.0

# Install Mongo

export KEY_SERVER="hkp://keyserver.ubuntu.com:80"
export MONGO_REPO_URI="http://repo.mongodb.com/apt/ubuntu"
export MONGO_REPO_TYPE="precise/mongodb-enterprise/"

sudo apt-key adv --keyserver ${KEY_SERVER} --recv 7F0CEB10
sudo apt-key adv --keyserver ${KEY_SERVER} --recv EA312927
echo "deb ${MONGO_REPO_URI} ${MONGO_REPO_TYPE}${SERVER_VERSION} multiverse" | sudo tee /etc/apt/sources.list.d/mongodb.list
sudo apt-get update -qq
sudo apt-get install mongodb-enterprise
sudo apt-get -y install gdb


if ! nc -z localhost 27017; then sudo service mongod start; fi
mongod --version
pecl install -f mongodb-1.1.2
mongo --eval 'tojson(db.runCommand({buildInfo:1}))'
php --ri mongodb
1 change: 0 additions & 1 deletion build/Readme.md

This file was deleted.

18 changes: 18 additions & 0 deletions build/all.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#!/usr/bin/env bash

# Disable xdebug when hhvm or when SEND_COVERAGE is false
if [ $TRAVIS_PHP_VERSION != hhvm && $SEND_COVERAGE != true ]; then phpenv config-rm xdebug.ini; fi

# Doing something with phpenv
if [ $TRAVIS_PHP_VERSION != 'hhvm' ]; then phpenv config-add ./tests/travis/php.ini; fi

# Install codecov
pip install --user codecov

# Install Memcached extension
if [ $TRAVIS_PHP_VERSION != 'hhvm' ]; then echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;
if [ $TRAVIS_PHP_VERSION != 'hhvm' ]; then echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;

# Install Redis extension
mkdir -p ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d
echo "extension=redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
3 changes: 3 additions & 0 deletions build/hhvm.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/usr/bin/env bash

# Don't need anything yet
116 changes: 75 additions & 41 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
{
"name": "cache/cache",
"type": "library",
"description": "",
"keywords": ["cache", "psr6"],
"description": "Library of all the php-cache adapters",
"keywords": [
"cache",
"psr6"
],
"homepage": "http://www.php-cache.com",
"license": "MIT",
"authors": [
Expand All @@ -17,55 +20,86 @@
"homepage": "https://github.com/nyholm"
}
],
"require":
{
"php": "^5.5|^7.0",
"psr/cache": "^1.0"
"require": {
"php": "^5.5|^7.0",
"psr/cache": "^1.0",
"mongodb/mongodb": "^1.0",
"predis/predis": "^1.0",
"doctrine/cache": "^1.3",
"league/flysystem": "^1.0"
},
"require-dev": {
"phpunit/phpunit": "^4.0|^5.1"
"phpunit/phpunit": "^4.0|^5.1",
"mockery/mockery": "^0.9"
},
"suggest": {
"ext-apc": "APC extension is required to use the APC Adapter",
"ext-apcu": "APCu extension is required to use the APCu Adapter",
"ext-memcache": "Memcache extension is required to use the Memcache Adapter",
"ext-memcached": "Memcached extension is required to use the Memcached Adapter",
"ext-redis": "Redis extension is required to use the Redis adapter"
},
"replace": {
"cache/apc-adapter": "self.version",
"cache/apcu-adapter": "self.version",
"cache/chain-adapter": "self.version",
"cache/adapter-common": "self.version",
"cache/doctrine-adapter": "self.version",
"cache/filesystem-adapter": "self.version",
"cache/memcache-adapter": "self.version",
"cache/memcached-adapter": "self.version",
"cache/mongodb-adapter": "self.version",
"cache/array-adapter": "self.version",
"cache/predis-adapter": "self.version",
"cache/redis-adapter": "self.version",
"cache/void-adapter": "self.version",
"cache/psr-6-doctrine-bridge": "self.version",
"cache/hierarchical-cache": "self.version",
"cache/integration-tests": "self.version",
"cache/session-handler": "self.version",
"cache/taggable-cache": "self.version"
},
"autoload": {
"psr-4": {
"Cache\\Adapter\\Apc\\": "src/Adapter/Apc/src/",
"Cache\\Adapter\\Apcu\\": "src/Adapter/Apcu/src/",
"Cache\\Adapter\\Chain\\": "src/Adapter/Chain/src/",
"Cache\\Adapter\\Common\\": "src/Adapter/Common/src/",
"Cache\\Adapter\\Doctrine\\": "src/Adapter/Doctrine/src/",
"Cache\\Adapter\\Apc\\": "src/Adapter/Apc/src/",
"Cache\\Adapter\\Apcu\\": "src/Adapter/Apcu/src/",
"Cache\\Adapter\\Chain\\": "src/Adapter/Chain/src/",
"Cache\\Adapter\\Common\\": "src/Adapter/Common/src/",
"Cache\\Adapter\\Doctrine\\": "src/Adapter/Doctrine/src/",
"Cache\\Adapter\\Filesystem\\": "src/Adapter/Filesystem/src/",
"Cache\\Adapter\\Memcache\\": "src/Adapter/Memcache/src/",
"Cache\\Adapter\\Memcached\\": "src/Adapter/Memcached/src/",
"Cache\\Adapter\\MongoDB\\": "src/Adapter/MongoDB/src/",
"Cache\\Adapter\\PHPArray\\": "src/Adapter/PHPArray/src/",
"Cache\\Adapter\\Predis\\": "src/Adapter/Predis/src/",
"Cache\\Adapter\\Redis\\": "src/Adapter/Redis/src/",
"Cache\\Adapter\\Void\\": "src/Adapter/Void/src/",
"Cache\\Bridge\\": "src/Bridge/src/",
"Cache\\Hierarchy\\": "src/Hierarchy/src/",
"Cache\\IntegrationTests\\": "src/IntegrationTests/src/",
"Cache\\SessionHandler\\": "src/SessionHandler/src/",
"Cache\\Taggable\\": "src/Taggable/src/"
"Cache\\Adapter\\Memcache\\": "src/Adapter/Memcache/src/",
"Cache\\Adapter\\Memcached\\": "src/Adapter/Memcached/src/",
"Cache\\Adapter\\MongoDB\\": "src/Adapter/MongoDB/src/",
"Cache\\Adapter\\PHPArray\\": "src/Adapter/PHPArray/src/",
"Cache\\Adapter\\Predis\\": "src/Adapter/Predis/src/",
"Cache\\Adapter\\Redis\\": "src/Adapter/Redis/src/",
"Cache\\Adapter\\Void\\": "src/Adapter/Void/src/",
"Cache\\Bridge\\": "src/Bridge/src/",
"Cache\\Hierarchy\\": "src/Hierarchy/src/",
"Cache\\IntegrationTests\\": "src/IntegrationTests/src/",
"Cache\\SessionHandler\\": "src/SessionHandler/src/",
"Cache\\Taggable\\": "src/Taggable/src/"
}
},
"autoload-dev": {
"autoload-dev": {
"psr-4": {
"Cache\\Adapter\\Apc\\Tests\\": "src/Adapter/Apc/tests/",
"Cache\\Adapter\\Apcu\\Tests\\": "src/Adapter/Apcu/tests/",
"Cache\\Adapter\\Chain\\Tests\\": "src/Adapter/Chain/tests/",
"Cache\\Adapter\\Common\\Tests\\": "src/Adapter/Common/tests/",
"Cache\\Adapter\\Doctrine\\Tests\\": "src/Adapter/Doctrine/tests/",
"Cache\\Adapter\\Apc\\Tests\\": "src/Adapter/Apc/tests/",
"Cache\\Adapter\\Apcu\\Tests\\": "src/Adapter/Apcu/tests/",
"Cache\\Adapter\\Chain\\Tests\\": "src/Adapter/Chain/tests/",
"Cache\\Adapter\\Common\\Tests\\": "src/Adapter/Common/tests/",
"Cache\\Adapter\\Doctrine\\Tests\\": "src/Adapter/Doctrine/tests/",
"Cache\\Adapter\\Filesystem\\Tests\\": "src/Adapter/Filesystem/tests/",
"Cache\\Adapter\\Memcache\\Tests\\": "src/Adapter/Memcache/tests/",
"Cache\\Adapter\\Memcached\\Tests\\": "src/Adapter/Memcached/tests/",
"Cache\\Adapter\\MongoDB\\Tests\\": "src/Adapter/MongoDB/tests/",
"Cache\\Adapter\\PHPArray\\Tests\\": "src/Adapter/PHPArray/tests/",
"Cache\\Adapter\\Predis\\Tests\\": "src/Adapter/Predis/tests/",
"Cache\\Adapter\\Redis\\Tests\\": "src/Adapter/Redis/tests/",
"Cache\\Adapter\\Void\\Tests\\": "src/Adapter/Void/tests/",
"Cache\\Bridge\\Tests\\": "src/Bridge/tests/",
"Cache\\Hierarchy\\Tests\\": "src/Hierarchy/tests/",
"Cache\\SessionHandler\\Tests\\": "src/SessionHandler/tests/",
"Cache\\Taggable\\Tests\\": "src/Taggable/tests/"
"Cache\\Adapter\\Memcache\\Tests\\": "src/Adapter/Memcache/tests/",
"Cache\\Adapter\\Memcached\\Tests\\": "src/Adapter/Memcached/tests/",
"Cache\\Adapter\\MongoDB\\Tests\\": "src/Adapter/MongoDB/tests/",
"Cache\\Adapter\\PHPArray\\Tests\\": "src/Adapter/PHPArray/tests/",
"Cache\\Adapter\\Predis\\Tests\\": "src/Adapter/Predis/tests/",
"Cache\\Adapter\\Redis\\Tests\\": "src/Adapter/Redis/tests/",
"Cache\\Adapter\\Void\\Tests\\": "src/Adapter/Void/tests/",
"Cache\\Bridge\\Tests\\": "src/Bridge/tests/",
"Cache\\Hierarchy\\Tests\\": "src/Hierarchy/tests/",
"Cache\\SessionHandler\\Tests\\": "src/SessionHandler/tests/",
"Cache\\Taggable\\Tests\\": "src/Taggable/tests/"
}
}
}
29 changes: 11 additions & 18 deletions src/Adapter/Apc/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,14 @@
"type": "library",
"license": "MIT",
"minimum-stability": "stable",
"keywords":
[
"keywords": [
"cache",
"psr-6",
"apc",
"tag"
],
"homepage": "https://github.com/php-cache/apc-adapter",
"authors":
[
"homepage": "https://github.com/php-cache/apc-adapter",
"authors": [
{
"name": "Aaron Scherer",
"email": "aequasi@gmail.com",
Expand All @@ -25,31 +23,26 @@
"homepage": "https://github.com/nyholm"
}
],
"require":
{
"require": {
"php": "^5.5",
"ext-apc": "*",
"psr/cache": "~1.0",
"psr/cache": "^1.0",
"cache/adapter-common": "^0.2",
"cache/taggable-cache": "^0.3"
},
"require-dev":
{
"phpunit/phpunit": "^5.1|^4.0",
"require-dev": {
"phpunit/phpunit": "^4.0|^5.1",
"cache/integration-tests": "^0.7"
},
"provide":
{
"psr/cache-implementation": "1.0.0"
"provide": {
"psr/cache-implementation": "^1.0"
},
"autoload":
{
"autoload": {
"psr-4": {
"Cache\\Adapter\\Apc\\": "src/"
}
},
"autoload-dev":
{
"autoload-dev": {
"psr-4": {
"Cache\\Adapter\\Apc\\Tests\\": "tests/"
}
Expand Down
33 changes: 13 additions & 20 deletions src/Adapter/Apcu/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,14 @@
"type": "library",
"license": "MIT",
"minimum-stability": "stable",
"keywords":
[
"keywords": [
"cache",
"psr-6",
"apcu",
"tag"
],
"homepage": "https://github.com/php-cache/apcu-adapter",
"authors":
[
"homepage": "https://github.com/php-cache/apcu-adapter",
"authors": [
{
"name": "Aaron Scherer",
"email": "aequasi@gmail.com",
Expand All @@ -25,31 +23,26 @@
"homepage": "https://github.com/nyholm"
}
],
"require":
{
"require": {
"php": "^5.5|^7.0",
"ext-apcu": "*",
"psr/cache": "1.0.0",
"ext-apcu": "*",
"psr/cache": "^1.0",
"cache/adapter-common": "^0.1",
"cache/taggable-cache": "^0.2"
},
"require-dev":
{
"phpunit/phpunit": "^5.1|^4.0",
"cache/integration-tests": "dev-master"
"require-dev": {
"phpunit/phpunit": "^4.0|^5.1",
"cache/integration-tests": "^0.7"
},
"provide":
{
"psr/cache-implementation": "1.0.0"
"provide": {
"psr/cache-implementation": "^1.0"
},
"autoload":
{
"autoload": {
"psr-4": {
"Cache\\Adapter\\Apcu\\": "src/"
}
},
"autoload-dev":
{
"autoload-dev": {
"psr-4": {
"Cache\\Adapter\\Apcu\\Tests\\": "tests/"
}
Expand Down
Loading