From 1752c7a55b9c53e1e04513656fde31f3c8b1d002 Mon Sep 17 00:00:00 2001 From: Aaron Scherer Date: Sun, 31 Jan 2016 23:01:45 -0800 Subject: [PATCH 01/19] Adding build scripts --- .gitignore | 3 ++ .travis.yml | 11 +++--- build/5.5.sh | 7 ++++ build/5.6.sh | 7 ++++ build/7.0.sh | 4 +++ build/Readme.md | 1 - build/all.sh | 17 +++++++++ build/hhvm.sh | 3 ++ build/installMongo.sh | 19 ++++++++++ composer.json | 80 ++++++++++++++++++++++--------------------- 10 files changed, 108 insertions(+), 44 deletions(-) create mode 100644 .gitignore create mode 100644 build/5.5.sh create mode 100644 build/5.6.sh create mode 100644 build/7.0.sh delete mode 100644 build/Readme.md create mode 100644 build/all.sh create mode 100644 build/hhvm.sh create mode 100644 build/installMongo.sh diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..81802670 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +/vendor/ +composer.lock + diff --git a/.travis.yml b/.travis.yml index 926f1bf3..bb5f1610 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,11 @@ cache: - "$HOME/.composer/cache" before_install: - - if [[ $TRAVIS_PHP_VERSION != hhvm && SEND_COVERAGE != true ]]; then phpenv config-rm xdebug.ini; fi + - ./build/all.sh + - if [[ $TRAVIS_PHP_VERSION == '5.5' ]]; ./build/5.5.sh; fi + - if [[ $TRAVIS_PHP_VERSION == '5.6' ]]; ./build/5.6.sh; fi + - if [[ $TRAVIS_PHP_VERSION == '7.0' ]]; ./build/7.0.sh; fi + - if [[ $TRAVIS_PHP_VERSION == 'hhvm' ]]; ./build/hhvm.sh; fi - composer self-update install: @@ -27,9 +31,8 @@ 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 + - if [[ "$TRAVIS_BRANCH" = "master" && "$SUBSPLIT" = true ]]; then ''; fi # Send subtree update sudo: true diff --git a/build/5.5.sh b/build/5.5.sh new file mode 100644 index 00000000..42ed71bf --- /dev/null +++ b/build/5.5.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +# Install APC Adapter & APCu Adapter dependencies +yes '' | pecl install apcu-4.0.8 + +# Install MongoDB Adapter dependencies +./installMongo.sh \ No newline at end of file diff --git a/build/5.6.sh b/build/5.6.sh new file mode 100644 index 00000000..42ed71bf --- /dev/null +++ b/build/5.6.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +# Install APC Adapter & APCu Adapter dependencies +yes '' | pecl install apcu-4.0.8 + +# Install MongoDB Adapter dependencies +./installMongo.sh \ No newline at end of file diff --git a/build/7.0.sh b/build/7.0.sh new file mode 100644 index 00000000..2b0e3b4a --- /dev/null +++ b/build/7.0.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +# Install APC Adapter & APCu Adapter dependencies +yes '' | pecl install apcu-5.1.0 \ No newline at end of file diff --git a/build/Readme.md b/build/Readme.md deleted file mode 100644 index 9940948e..00000000 --- a/build/Readme.md +++ /dev/null @@ -1 +0,0 @@ -This directory has scripts to install dependencies on travis. \ No newline at end of file diff --git a/build/all.sh b/build/all.sh new file mode 100644 index 00000000..8dccdf35 --- /dev/null +++ b/build/all.sh @@ -0,0 +1,17 @@ +#!/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 Mongo +./installMongo.sh + +# 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 \ No newline at end of file diff --git a/build/hhvm.sh b/build/hhvm.sh new file mode 100644 index 00000000..b8f08a68 --- /dev/null +++ b/build/hhvm.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +# Don't need anything yet \ No newline at end of file diff --git a/build/installMongo.sh b/build/installMongo.sh new file mode 100644 index 00000000..8dbba409 --- /dev/null +++ b/build/installMongo.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env bash + +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 +if [[ $TRAVIS_PHP_VERSION != 'hhvm' ]]; then pecl install -f mongodb-1.1.2; fi; +mongo --eval 'tojson(db.runCommand({buildInfo:1}))' +if [[ $TRAVIS_PHP_VERSION != 'hhvm' ]]; then php --ri mongodb; fi; \ No newline at end of file diff --git a/composer.json b/composer.json index 65e434ff..9220a449 100644 --- a/composer.json +++ b/composer.json @@ -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": [ @@ -17,9 +20,8 @@ "homepage": "https://github.com/nyholm" } ], - "require": - { - "php": "^5.5|^7.0", + "require": { + "php": "^5.5|^7.0", "psr/cache": "^1.0" }, "require-dev": { @@ -27,45 +29,45 @@ }, "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/" } } } From 0bdf9d2915280bb2bdbb283efd3d2c217a88345d Mon Sep 17 00:00:00 2001 From: Aaron Scherer Date: Sun, 31 Jan 2016 23:06:54 -0800 Subject: [PATCH 02/19] Refactoring into less --- .travis.yml | 7 +++---- build/5.6.sh | 7 ------- build/{5.5.sh => 5.x.sh} | 0 build/{7.0.sh => 7.x.sh} | 0 4 files changed, 3 insertions(+), 11 deletions(-) delete mode 100644 build/5.6.sh rename build/{5.5.sh => 5.x.sh} (100%) rename build/{7.0.sh => 7.x.sh} (100%) diff --git a/.travis.yml b/.travis.yml index bb5f1610..58246323 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,10 +18,9 @@ cache: before_install: - ./build/all.sh - - if [[ $TRAVIS_PHP_VERSION == '5.5' ]]; ./build/5.5.sh; fi - - if [[ $TRAVIS_PHP_VERSION == '5.6' ]]; ./build/5.6.sh; fi - - if [[ $TRAVIS_PHP_VERSION == '7.0' ]]; ./build/7.0.sh; fi - - if [[ $TRAVIS_PHP_VERSION == 'hhvm' ]]; ./build/hhvm.sh; fi + - if [[ "$TRAVIS_PHP_VERSION" == '5.5' || "$TRAVIS_PHP_VERSION" == '5.6' ]]; ./build/5.x.sh; fi + - if [[ "$TRAVIS_PHP_VERSION" == '7.0' ]]; ./build/7.x.sh; fi + - if [[ "$TRAVIS_PHP_VERSION" == 'hhvm' ]]; ./build/hhvm.sh; fi - composer self-update install: diff --git a/build/5.6.sh b/build/5.6.sh deleted file mode 100644 index 42ed71bf..00000000 --- a/build/5.6.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -# Install APC Adapter & APCu Adapter dependencies -yes '' | pecl install apcu-4.0.8 - -# Install MongoDB Adapter dependencies -./installMongo.sh \ No newline at end of file diff --git a/build/5.5.sh b/build/5.x.sh similarity index 100% rename from build/5.5.sh rename to build/5.x.sh diff --git a/build/7.0.sh b/build/7.x.sh similarity index 100% rename from build/7.0.sh rename to build/7.x.sh From 8d27588742add8280476dbd8ad0e0bdcf2033b5c Mon Sep 17 00:00:00 2001 From: Aaron Scherer Date: Sun, 31 Jan 2016 23:11:12 -0800 Subject: [PATCH 03/19] Adding retry to self-update --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 58246323..69916f2f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ before_install: - if [[ "$TRAVIS_PHP_VERSION" == '5.5' || "$TRAVIS_PHP_VERSION" == '5.6' ]]; ./build/5.x.sh; fi - if [[ "$TRAVIS_PHP_VERSION" == '7.0' ]]; ./build/7.x.sh; fi - if [[ "$TRAVIS_PHP_VERSION" == 'hhvm' ]]; ./build/hhvm.sh; fi - - composer self-update + - travis_retry composer self-update install: - travis_retry composer install --no-interaction --prefer-source From 1d2ae9fdd1ddfb293f12ad121b4981e2d0fd187f Mon Sep 17 00:00:00 2001 From: Aaron Scherer Date: Sun, 31 Jan 2016 23:13:54 -0800 Subject: [PATCH 04/19] Updating perms --- build/5.x.sh | 0 build/7.x.sh | 0 build/all.sh | 0 build/hhvm.sh | 0 build/installMongo.sh | 0 5 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 build/5.x.sh mode change 100644 => 100755 build/7.x.sh mode change 100644 => 100755 build/all.sh mode change 100644 => 100755 build/hhvm.sh mode change 100644 => 100755 build/installMongo.sh diff --git a/build/5.x.sh b/build/5.x.sh old mode 100644 new mode 100755 diff --git a/build/7.x.sh b/build/7.x.sh old mode 100644 new mode 100755 diff --git a/build/all.sh b/build/all.sh old mode 100644 new mode 100755 diff --git a/build/hhvm.sh b/build/hhvm.sh old mode 100644 new mode 100755 diff --git a/build/installMongo.sh b/build/installMongo.sh old mode 100644 new mode 100755 From 2102bd30cf6a6f7516c36dc077e24644277f927a Mon Sep 17 00:00:00 2001 From: Aaron Scherer Date: Sun, 31 Jan 2016 23:20:56 -0800 Subject: [PATCH 05/19] FIxing script --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 69916f2f..76e94549 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,9 +18,9 @@ cache: before_install: - ./build/all.sh - - if [[ "$TRAVIS_PHP_VERSION" == '5.5' || "$TRAVIS_PHP_VERSION" == '5.6' ]]; ./build/5.x.sh; fi - - if [[ "$TRAVIS_PHP_VERSION" == '7.0' ]]; ./build/7.x.sh; fi - - if [[ "$TRAVIS_PHP_VERSION" == 'hhvm' ]]; ./build/hhvm.sh; fi + - 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: From 5d11d28eb92f01fe07969e116c39790f69b6f2f7 Mon Sep 17 00:00:00 2001 From: Aaron Scherer Date: Sun, 31 Jan 2016 23:23:09 -0800 Subject: [PATCH 06/19] Fixing script again --- build/all.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/all.sh b/build/all.sh index 8dccdf35..be6e370e 100755 --- a/build/all.sh +++ b/build/all.sh @@ -10,7 +10,7 @@ if [ $TRAVIS_PHP_VERSION != 'hhvm' ]; then phpenv config-add ./tests/travis/php. pip install --user codecov # Install Mongo -./installMongo.sh +./build/installMongo.sh # Install Redis extension mkdir -p ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d From 7353da1aa9dfb557d887531882e87d6680c85bf2 Mon Sep 17 00:00:00 2001 From: Aaron Scherer Date: Sun, 31 Jan 2016 23:26:11 -0800 Subject: [PATCH 07/19] Grr. Fixing --- build/5.x.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/build/5.x.sh b/build/5.x.sh index 42ed71bf..a235dc30 100755 --- a/build/5.x.sh +++ b/build/5.x.sh @@ -1,7 +1,4 @@ #!/usr/bin/env bash # Install APC Adapter & APCu Adapter dependencies -yes '' | pecl install apcu-4.0.8 - -# Install MongoDB Adapter dependencies -./installMongo.sh \ No newline at end of file +yes '' | pecl install apcu-4.0.8 \ No newline at end of file From 0676a946c169d2a3e6d7a062f73ba2b7e1474e11 Mon Sep 17 00:00:00 2001 From: Aaron Scherer Date: Sun, 31 Jan 2016 23:58:58 -0800 Subject: [PATCH 08/19] Updating composer files --- composer.json | 36 +++++++++++++++++++++++++--- src/Adapter/Apc/composer.json | 27 ++++++++------------- src/Adapter/Apcu/composer.json | 31 ++++++++++-------------- src/Adapter/Chain/composer.json | 29 +++++++++------------- src/Adapter/Common/composer.json | 24 +++++++------------ src/Adapter/Doctrine/composer.json | 31 ++++++++++-------------- src/Adapter/Filesystem/composer.json | 27 ++++++++------------- src/Adapter/Memcache/composer.json | 29 +++++++++------------- src/Adapter/Memcached/composer.json | 35 +++++++++++---------------- src/Adapter/MongoDB/composer.json | 29 +++++++++------------- src/Adapter/PHPArray/composer.json | 27 ++++++++------------- src/Adapter/Predis/composer.json | 29 +++++++++------------- src/Adapter/Redis/composer.json | 35 +++++++++++---------------- src/Adapter/Void/composer.json | 27 ++++++++------------- src/Bridge/composer.json | 8 +++---- src/Hierarchy/composer.json | 26 ++++++++------------ src/IntegrationTests/composer.json | 6 ++--- src/SessionHandler/composer.json | 22 ++++++++--------- src/Taggable/composer.json | 16 ++++++++----- 19 files changed, 216 insertions(+), 278 deletions(-) diff --git a/composer.json b/composer.json index 9220a449..8401edc5 100644 --- a/composer.json +++ b/composer.json @@ -21,11 +21,41 @@ } ], "require": { - "php": "^5.5|^7.0", - "psr/cache": "^1.0" + "php": "^5.5|^7.0", + "psr/cache": "^1.0", + "mongodb/mongodb": "^1.0", + "predis/predis": "^1.0" }, "require-dev": { - "phpunit/phpunit": "^4.0|^5.1" + "phpunit/phpunit": "^4.0|^5.1", + "cache/integration-tests": "^0.7" + }, + "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": { diff --git a/src/Adapter/Apc/composer.json b/src/Adapter/Apc/composer.json index f3b2525f..d8ac2616 100644 --- a/src/Adapter/Apc/composer.json +++ b/src/Adapter/Apc/composer.json @@ -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", @@ -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": - { + "provide": { "psr/cache-implementation": "1.0.0" }, - "autoload": - { + "autoload": { "psr-4": { "Cache\\Adapter\\Apc\\": "src/" } }, - "autoload-dev": - { + "autoload-dev": { "psr-4": { "Cache\\Adapter\\Apc\\Tests\\": "tests/" } diff --git a/src/Adapter/Apcu/composer.json b/src/Adapter/Apcu/composer.json index 63b46636..2aa77e31 100644 --- a/src/Adapter/Apcu/composer.json +++ b/src/Adapter/Apcu/composer.json @@ -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", @@ -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": - { + "provide": { "psr/cache-implementation": "1.0.0" }, - "autoload": - { + "autoload": { "psr-4": { "Cache\\Adapter\\Apcu\\": "src/" } }, - "autoload-dev": - { + "autoload-dev": { "psr-4": { "Cache\\Adapter\\Apcu\\Tests\\": "tests/" } diff --git a/src/Adapter/Chain/composer.json b/src/Adapter/Chain/composer.json index 49dd8ef5..6a019713 100644 --- a/src/Adapter/Chain/composer.json +++ b/src/Adapter/Chain/composer.json @@ -4,16 +4,14 @@ "type": "library", "license": "MIT", "minimum-stability": "stable", - "keywords": - [ + "keywords": [ "cache", "psr-6", "chain", "tag" ], - "homepage": "https://github.com/php-cache/chain-adapter", - "authors": - [ + "homepage": "https://github.com/php-cache/chain-adapter", + "authors": [ { "name": "Aaron Scherer", "email": "aequasi@gmail.com", @@ -25,32 +23,27 @@ "homepage": "https://github.com/nyholm" } ], - "require": - { + "require": { "php": "^5.5|^7.0", - "psr/cache": "1.0.0", + "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", "cache/predis-adapter": "@stable", "cache/array-adapter": "@stable" }, - "provide": - { + "provide": { "psr/cache-implementation": "1.0.0" }, - "autoload": - { + "autoload": { "psr-4": { "Cache\\Adapter\\Chain\\": "src/" } }, - "autoload-dev": - { + "autoload-dev": { "psr-4": { "Cache\\Adapter\\Chain\\Tests\\": "tests/" } diff --git a/src/Adapter/Common/composer.json b/src/Adapter/Common/composer.json index cc48e3a8..9b597a20 100644 --- a/src/Adapter/Common/composer.json +++ b/src/Adapter/Common/composer.json @@ -4,15 +4,13 @@ "type": "library", "license": "MIT", "minimum-stability": "stable", - "keywords": - [ + "keywords": [ "cache", "psr-6", "tag" ], "homepage": "https://github.com/php-cache/adapter-common", - "authors": - [ + "authors": [ { "name": "Aaron Scherer", "email": "aequasi@gmail.com", @@ -24,29 +22,25 @@ "homepage": "https://github.com/nyholm" } ], - "require": - { + "require": { "php": "^5.5|^7.0", - "psr/cache": "1.0.0", + "psr/cache": "^1.0", "cache/taggable-cache": "^0.2|^0.3" }, - "require-dev": - { - "phpunit/phpunit": "^5.1|^4.0" + "require-dev": { + "phpunit/phpunit": "^4.0|^5.1" }, - "autoload": - { + "autoload": { "psr-4": { "Cache\\Adapter\\Common\\": "src/" } }, - "autoload-dev": - { + "autoload-dev": { "psr-4": { "Cache\\Adapter\\Common\\Tests\\": "tests/" } }, - "extra": { + "extra": { "branch-alias": { "dev-master": "0.2.x-dev" } diff --git a/src/Adapter/Doctrine/composer.json b/src/Adapter/Doctrine/composer.json index 7b402acc..5a633201 100644 --- a/src/Adapter/Doctrine/composer.json +++ b/src/Adapter/Doctrine/composer.json @@ -4,16 +4,14 @@ "type": "library", "license": "MIT", "minimum-stability": "stable", - "keywords": - [ + "keywords": [ "cache", "psr-6", "doctrine", "tag" ], "homepage": "https://github.com/php-cache/doctrine-adapter", - "authors": - [ + "authors": [ { "name": "Aaron Scherer", "email": "aequasi@gmail.com", @@ -25,37 +23,32 @@ "homepage": "https://github.com/nyholm" } ], - "require": - { - "psr/cache": "1.0", + "require": { + "psr/cache": "^1.0", "cache/adapter-common": "^0.2", "cache/taggable-cache": "^0.3", "doctrine/cache": "^1.3" }, - "require-dev": - { - "phpunit/phpunit": "^5.1|^4.0", - "mockery/mockery": "^0.9.4", - "cache/integration-tests": "^0.7" + "require-dev": { + "phpunit/phpunit": "^4.0|^5.1", + "cache/integration-tests": "^0.7", + "mockery/mockery": "^0.9.4" }, - "provide": - { + "provide": { "psr/cache-implementation": "1.0.0" }, - "suggest": { + "suggest": { "ext-apc": "Allows for caching with Apc", "ext-memcache": "Allows for caching with Memcache", "ext-memcached": "Allows for caching with Memcached", "ext-redis": "Allows for caching with Redis" }, - "autoload": - { + "autoload": { "psr-4": { "Cache\\Adapter\\Doctrine\\": "src/" } }, - "autoload-dev": - { + "autoload-dev": { "psr-4": { "Cache\\Adapter\\Doctrine\\Tests\\": "tests/" } diff --git a/src/Adapter/Filesystem/composer.json b/src/Adapter/Filesystem/composer.json index 51996c87..b6993d2b 100644 --- a/src/Adapter/Filesystem/composer.json +++ b/src/Adapter/Filesystem/composer.json @@ -4,16 +4,14 @@ "type": "library", "license": "MIT", "minimum-stability": "stable", - "keywords": - [ + "keywords": [ "cache", "psr-6", "filesystem", "tag" ], - "homepage": "https://github.com/php-cache/filesystem-adapter", - "authors": - [ + "homepage": "https://github.com/php-cache/filesystem-adapter", + "authors": [ { "name": "Aaron Scherer", "email": "aequasi@gmail.com", @@ -25,31 +23,26 @@ "homepage": "https://github.com/nyholm" } ], - "require": - { + "require": { "php": "^5.5|^7.0", - "psr/cache": "~1.0", + "psr/cache": "^1.0", "cache/adapter-common": "^0.2", "cache/taggable-cache": "^0.3", "league/flysystem": "^1.0" }, - "require-dev": - { - "phpunit/phpunit": "^5.1|^4.0", + "require-dev": { + "phpunit/phpunit": "^4.0|^5.1", "cache/integration-tests": "^0.7" }, - "provide": - { + "provide": { "psr/cache-implementation": "~1.0" }, - "autoload": - { + "autoload": { "psr-4": { "Cache\\Adapter\\Filesystem\\": "src/" } }, - "autoload-dev": - { + "autoload-dev": { "psr-4": { "Cache\\Adapter\\Filesystem\\Tests\\": "tests/" } diff --git a/src/Adapter/Memcache/composer.json b/src/Adapter/Memcache/composer.json index b269f491..c364c538 100644 --- a/src/Adapter/Memcache/composer.json +++ b/src/Adapter/Memcache/composer.json @@ -4,16 +4,14 @@ "type": "library", "license": "MIT", "minimum-stability": "stable", - "keywords": - [ + "keywords": [ "cache", "psr-6", "memcache", "tag" ], - "homepage": "https://github.com/php-cache/memcache-adapter", - "authors": - [ + "homepage": "https://github.com/php-cache/memcache-adapter", + "authors": [ { "name": "Aaron Scherer", "email": "aequasi@gmail.com", @@ -25,31 +23,26 @@ "homepage": "https://github.com/nyholm" } ], - "require": - { + "require": { "php": "^5.5", "ext-memcache": "*", - "psr/cache": "1.0.0", + "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": - { + "provide": { "psr/cache-implementation": "1.0.0" }, - "autoload": - { + "autoload": { "psr-4": { "Cache\\Adapter\\Memcache\\": "src/" } }, - "autoload-dev": - { + "autoload-dev": { "psr-4": { "Cache\\Adapter\\Memcache\\Tests\\": "tests/" } diff --git a/src/Adapter/Memcached/composer.json b/src/Adapter/Memcached/composer.json index be8a1db5..0987194f 100644 --- a/src/Adapter/Memcached/composer.json +++ b/src/Adapter/Memcached/composer.json @@ -4,16 +4,14 @@ "type": "library", "license": "MIT", "minimum-stability": "stable", - "keywords": - [ + "keywords": [ "cache", "psr-6", "memcached", "tag" ], "homepage": "https://github.com/php-cache/doctrine-adapter", - "authors": - [ + "authors": [ { "name": "Aaron Scherer", "email": "aequasi@gmail.com", @@ -25,32 +23,27 @@ "homepage": "https://github.com/nyholm" } ], - "require": - { - "php": "^5.5|^7.0", - "ext-memcached": "*", - "psr/cache": "1.0.0", - "cache/adapter-common": "^0.2", - "cache/taggable-cache": "^0.3", + "require": { + "php": "^5.5|^7.0", + "ext-memcached": "*", + "psr/cache": "^1.0", + "cache/adapter-common": "^0.2", + "cache/taggable-cache": "^0.3", "cache/hierarchical-cache": "^0.2" }, - "require-dev": - { - "phpunit/phpunit": "^5.1|^4.0", - "cache/integration-tests": "^0.6" + "require-dev": { + "phpunit/phpunit": "^4.0|^5.1", + "cache/integration-tests": "^0.7" }, - "provide": - { + "provide": { "psr/cache-implementation": "1.0.0" }, - "autoload": - { + "autoload": { "psr-4": { "Cache\\Adapter\\Memcached\\": "src/" } }, - "autoload-dev": - { + "autoload-dev": { "psr-4": { "Cache\\Adapter\\Memcached\\Tests\\": "tests/" } diff --git a/src/Adapter/MongoDB/composer.json b/src/Adapter/MongoDB/composer.json index c86d31fb..b049dfd9 100644 --- a/src/Adapter/MongoDB/composer.json +++ b/src/Adapter/MongoDB/composer.json @@ -4,16 +4,14 @@ "type": "library", "license": "MIT", "minimum-stability": "beta", - "keywords": - [ + "keywords": [ "cache", "psr-6", "mongodb", "tag" ], - "homepage": "https://github.com/php-cache/mongodb-adapter", - "authors": - [ + "homepage": "https://github.com/php-cache/mongodb-adapter", + "authors": [ { "name": "Aaron Scherer", "email": "aequasi@gmail.com", @@ -25,31 +23,26 @@ "homepage": "https://github.com/nyholm" } ], - "require": - { + "require": { "php": "^5.5|^7.0", - "psr/cache": "1.0.0", + "psr/cache": "^1.0", "cache/adapter-common": "^0.1", "cache/taggable-cache": "^0.2", "mongodb/mongodb": "^1.0" }, - "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": - { + "provide": { "psr/cache-implementation": "1.0.0" }, - "autoload": - { + "autoload": { "psr-4": { "Cache\\Adapter\\MongoDB\\": "src/" } }, - "autoload-dev": - { + "autoload-dev": { "psr-4": { "Cache\\Adapter\\MongoDB\\Tests\\": "tests/" } diff --git a/src/Adapter/PHPArray/composer.json b/src/Adapter/PHPArray/composer.json index e6649e14..6e7ba22c 100644 --- a/src/Adapter/PHPArray/composer.json +++ b/src/Adapter/PHPArray/composer.json @@ -4,16 +4,14 @@ "type": "library", "license": "MIT", "minimum-stability": "stable", - "keywords": - [ + "keywords": [ "cache", "psr-6", "array", "tag" ], - "homepage": "https://github.com/php-cache/array-adapter", - "authors": - [ + "homepage": "https://github.com/php-cache/array-adapter", + "authors": [ { "name": "Aaron Scherer", "email": "aequasi@gmail.com", @@ -25,31 +23,26 @@ "homepage": "https://github.com/nyholm" } ], - "require": - { + "require": { "php": "^5.5|^7.0", - "psr/cache": "~1.0", + "psr/cache": "^1.0", "cache/adapter-common": "^0.2", "cache/hierarchical-cache": "^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": - { + "provide": { "psr/cache-implementation": "~1.0" }, - "autoload": - { + "autoload": { "psr-4": { "Cache\\Adapter\\PHPArray\\": "src/" } }, - "autoload-dev": - { + "autoload-dev": { "psr-4": { "Cache\\Adapter\\PHPArray\\Tests\\": "tests/" } diff --git a/src/Adapter/Predis/composer.json b/src/Adapter/Predis/composer.json index 5d6cf708..c58ed8db 100644 --- a/src/Adapter/Predis/composer.json +++ b/src/Adapter/Predis/composer.json @@ -4,17 +4,15 @@ "type": "library", "license": "MIT", "minimum-stability": "stable", - "keywords": - [ + "keywords": [ "cache", "psr-6", "redis", "predis", "tag" ], - "homepage": "https://github.com/php-cache/predis-adapter", - "authors": - [ + "homepage": "https://github.com/php-cache/predis-adapter", + "authors": [ { "name": "Aaron Scherer", "email": "aequasi@gmail.com", @@ -26,32 +24,27 @@ "homepage": "https://github.com/nyholm" } ], - "require": - { + "require": { "php": "^5.5|^7.0", - "psr/cache": "1.0.0", + "psr/cache": "^1.0", "cache/adapter-common": "^0.1.2", "cache/taggable-cache": "^0.3", "cache/hierarchical-cache": "^0.1", "predis/predis": "^1.0" }, - "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": - { + "provide": { "psr/cache-implementation": "1.0.0" }, - "autoload": - { + "autoload": { "psr-4": { "Cache\\Adapter\\Predis\\": "src/" } }, - "autoload-dev": - { + "autoload-dev": { "psr-4": { "Cache\\Adapter\\Predis\\Tests\\": "tests/" } diff --git a/src/Adapter/Redis/composer.json b/src/Adapter/Redis/composer.json index b71b786b..e1a682ec 100644 --- a/src/Adapter/Redis/composer.json +++ b/src/Adapter/Redis/composer.json @@ -4,17 +4,15 @@ "type": "library", "license": "MIT", "minimum-stability": "stable", - "keywords": - [ + "keywords": [ "cache", "psr-6", "phpredis", "redis", "tag" ], - "homepage": "http://www.php-cache.com", - "authors": - [ + "homepage": "http://www.php-cache.com", + "authors": [ { "name": "Aaron Scherer", "email": "aequasi@gmail.com", @@ -26,32 +24,27 @@ "homepage": "https://github.com/nyholm" } ], - "require": - { - "php": "^5.5|^7.0", - "ext-redis": "*", - "psr/cache": "1.0.0", - "cache/adapter-common": "^0.2", - "cache/taggable-cache": "^0.3", + "require": { + "php": "^5.5|^7.0", + "ext-redis": "*", + "psr/cache": "^1.0", + "cache/adapter-common": "^0.2", + "cache/taggable-cache": "^0.3", "cache/hierarchical-cache": "^0.2" }, - "require-dev": - { - "phpunit/phpunit": "^5.1|^4.0", + "require-dev": { + "phpunit/phpunit": "^4.0|^5.1", "cache/integration-tests": "^0.7" }, - "provide": - { + "provide": { "psr/cache-implementation": "1.0.0" }, - "autoload": - { + "autoload": { "psr-4": { "Cache\\Adapter\\Redis\\": "src/" } }, - "autoload-dev": - { + "autoload-dev": { "psr-4": { "Cache\\Adapter\\Redis\\Tests\\": "tests/" } diff --git a/src/Adapter/Void/composer.json b/src/Adapter/Void/composer.json index 5375a2c0..e655c674 100644 --- a/src/Adapter/Void/composer.json +++ b/src/Adapter/Void/composer.json @@ -4,16 +4,14 @@ "type": "library", "license": "MIT", "minimum-stability": "stable", - "keywords": - [ + "keywords": [ "cache", "psr-6", "void", "tag" ], - "homepage": "http://www.php-cache.com", - "authors": - [ + "homepage": "http://www.php-cache.com", + "authors": [ { "name": "Aaron Scherer", "email": "aequasi@gmail.com", @@ -25,30 +23,25 @@ "homepage": "https://github.com/nyholm" } ], - "require": - { + "require": { "php": "^5.5|^7.0", - "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": - { + "provide": { "psr/cache-implementation": "1.0.0" }, - "autoload": - { + "autoload": { "psr-4": { "Cache\\Adapter\\Void\\": "src/" } }, - "autoload-dev": - { + "autoload-dev": { "psr-4": { "Cache\\Adapter\\Void\\Tests\\": "tests/" } diff --git a/src/Bridge/composer.json b/src/Bridge/composer.json index d0dc4bb2..afe08bff 100644 --- a/src/Bridge/composer.json +++ b/src/Bridge/composer.json @@ -19,12 +19,12 @@ "require": { "php": "^5.5|^7.0", "doctrine/cache": "^1.3", - "psr/cache-implementation": "~1.0" + "psr/cache-implementation": "^1.0" }, "require-dev": { - "phpunit/phpunit": "^5.1|^4.0", - "mockery/mockery": "^0.9.4", - "cache/doctrine-adapter": "@stable" + "phpunit/phpunit": "^4.0|^5.1", + "mockery/mockery": "^0.9", + "cache/doctrine-adapter": "@stable" }, "autoload": { "psr-4": { diff --git a/src/Hierarchy/composer.json b/src/Hierarchy/composer.json index 52bc523a..1a216122 100644 --- a/src/Hierarchy/composer.json +++ b/src/Hierarchy/composer.json @@ -4,16 +4,14 @@ "type": "library", "license": "MIT", "minimum-stability": "stable", - "keywords": - [ + "keywords": [ "cache", "psr-6", "hierarchical", "tag" ], - "homepage": "https://github.com/php-cache/hierarchical-cache", - "authors": - [ + "homepage": "https://github.com/php-cache/hierarchical-cache", + "authors": [ { "name": "Aaron Scherer", "email": "aequasi@gmail.com", @@ -25,26 +23,22 @@ "homepage": "https://github.com/nyholm" } ], - "require": - { + "require": { "php": "^5.5|^7.0", - "psr/cache": "1.0.0", + "psr/cache": "^1.0", "cache/taggable-cache": "^0.3" }, - "require-dev": - { - "phpunit/phpunit": "^5.1|^4.0", + "require-dev": { + "phpunit/phpunit": "^4.0|^5.1", "cache/array-adapter": "@stable", - "cache/integration-tests": "dev-master" + "cache/integration-tests": "^0.7" }, - "autoload": - { + "autoload": { "psr-4": { "Cache\\Hierarchy\\": "src/" } }, - "autoload-dev": - { + "autoload-dev": { "psr-4": { "Cache\\Hierarchy\\Tests\\": "tests/" } diff --git a/src/IntegrationTests/composer.json b/src/IntegrationTests/composer.json index 32d1a907..f0e1b9bb 100755 --- a/src/IntegrationTests/composer.json +++ b/src/IntegrationTests/composer.json @@ -22,11 +22,11 @@ } ], "require": { - "php": "^5.4|^7", - "psr/cache": "~1.0" + "php": "^5.4|^7.0", + "psr/cache": "^1.0" }, "require-dev": { - "phpunit/phpunit": "^4.0|^5.0" + "phpunit/phpunit": "^4.0|^5.1" }, "autoload": { "psr-4": { diff --git a/src/SessionHandler/composer.json b/src/SessionHandler/composer.json index 4dc98096..9a0cac56 100644 --- a/src/SessionHandler/composer.json +++ b/src/SessionHandler/composer.json @@ -2,14 +2,14 @@ "name": "cache/session-handler", "type": "library", "description": "An implementation of PHP's SessionHandlerInterface that allows PSR-6", - "keywords": [ + "keywords": [ "cache", "psr-6", "session handler" ], - "homepage": "https://github.com/php-cache/session-handler", - "license": "MIT", - "authors": [ + "homepage": "https://github.com/php-cache/session-handler", + "license": "MIT", + "authors": [ { "name": "Aaron Scherer", "email": "aequasi@gmail.com", @@ -21,16 +21,16 @@ "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" }, - "require-dev": { - "phpunit/phpunit": "^5.1|^4.0", - "mockery/mockery": "^0.9.4", + "require-dev": { + "phpunit/phpunit": "^4.0|^5.1", + "mockery/mockery": "^0.9.4", "cache/array-adapter": "@stable" }, - "autoload": { + "autoload": { "psr-4": { "Cache\\SessionHandler\\": "src/" } diff --git a/src/Taggable/composer.json b/src/Taggable/composer.json index 66810e4a..d35413eb 100644 --- a/src/Taggable/composer.json +++ b/src/Taggable/composer.json @@ -2,7 +2,12 @@ "name": "cache/taggable-cache", "type": "library", "description": "Add tag support to your PSR-6 cache implementation", - "keywords": ["cache", "psr6", "tag", "taggable"], + "keywords": [ + "cache", + "psr6", + "tag", + "taggable" + ], "homepage": "https://github.com/php-cache/taggable-cache", "license": "MIT", "authors": [ @@ -17,13 +22,12 @@ "homepage": "https://github.com/nyholm" } ], - "require": - { - "php": "^5.4|^7", - "psr/cache": "1.0.0" + "require": { + "php": "^5.4|^7.0", + "psr/cache": "^1.0" }, "require-dev": { - "phpunit/phpunit": "^5.1|^4.0" + "phpunit/phpunit": "^4.0|^5.1" }, "autoload": { "psr-4": { From 8080c2b78bcad82e4681f3bf3c29f8e015dd6f73 Mon Sep 17 00:00:00 2001 From: Aaron Scherer Date: Sun, 31 Jan 2016 23:59:41 -0800 Subject: [PATCH 09/19] Removing subsplit stuff --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 76e94549..d32f9ae1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ php: matrix: include: - php: 7.0 - env: SEND_COVERAGE=true SUBSPLIT=true + env: SEND_COVERAGE=true fast_finish: true cache: @@ -31,7 +31,6 @@ script: after_success: - if [[ "$SEND_COVERAGE" = true ]]; codecov; fi - - if [[ "$TRAVIS_BRANCH" = "master" && "$SUBSPLIT" = true ]]; then ''; fi # Send subtree update sudo: true From 497fb3b7054af37d2b9c33bb058554c215a27f6e Mon Sep 17 00:00:00 2001 From: Aaron Scherer Date: Mon, 1 Feb 2016 00:02:23 -0800 Subject: [PATCH 10/19] Adding bad line --- composer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 8401edc5..ecff0f06 100644 --- a/composer.json +++ b/composer.json @@ -27,8 +27,7 @@ "predis/predis": "^1.0" }, "require-dev": { - "phpunit/phpunit": "^4.0|^5.1", - "cache/integration-tests": "^0.7" + "phpunit/phpunit": "^4.0|^5.1" }, "suggest": { "ext-apc": "APC extension is required to use the APC Adapter", From 5089742f686dac098572ff86f4e448cbc35ef7bb Mon Sep 17 00:00:00 2001 From: Aaron Scherer Date: Mon, 1 Feb 2016 00:09:33 -0800 Subject: [PATCH 11/19] Requiring mockery --- composer.json | 3 ++- src/SessionHandler/composer.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index ecff0f06..1e572558 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,8 @@ "predis/predis": "^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", diff --git a/src/SessionHandler/composer.json b/src/SessionHandler/composer.json index 9a0cac56..734e3ff0 100644 --- a/src/SessionHandler/composer.json +++ b/src/SessionHandler/composer.json @@ -27,7 +27,7 @@ }, "require-dev": { "phpunit/phpunit": "^4.0|^5.1", - "mockery/mockery": "^0.9.4", + "mockery/mockery": "^0.9", "cache/array-adapter": "@stable" }, "autoload": { From fe98402873fd02187e94781c0e30f6a1fc6a1c7f Mon Sep 17 00:00:00 2001 From: Aaron Scherer Date: Mon, 1 Feb 2016 00:13:20 -0800 Subject: [PATCH 12/19] Requiring doctrine/cache --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 1e572558..9cfba6c5 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,8 @@ "php": "^5.5|^7.0", "psr/cache": "^1.0", "mongodb/mongodb": "^1.0", - "predis/predis": "^1.0" + "predis/predis": "^1.0", + "doctrine/cache": "^1.3" }, "require-dev": { "phpunit/phpunit": "^4.0|^5.1", From 16e668b5f73fd94d345d9bdd1729720994d1871a Mon Sep 17 00:00:00 2001 From: Aaron Scherer Date: Mon, 1 Feb 2016 00:18:47 -0800 Subject: [PATCH 13/19] Updating verion req for doctrine, and adding flysystem to base --- composer.json | 11 ++++++----- src/Adapter/Doctrine/composer.json | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 9cfba6c5..a558c564 100644 --- a/composer.json +++ b/composer.json @@ -21,11 +21,12 @@ } ], "require": { - "php": "^5.5|^7.0", - "psr/cache": "^1.0", - "mongodb/mongodb": "^1.0", - "predis/predis": "^1.0", - "doctrine/cache": "^1.3" + "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", diff --git a/src/Adapter/Doctrine/composer.json b/src/Adapter/Doctrine/composer.json index 5a633201..465adeb2 100644 --- a/src/Adapter/Doctrine/composer.json +++ b/src/Adapter/Doctrine/composer.json @@ -32,7 +32,7 @@ "require-dev": { "phpunit/phpunit": "^4.0|^5.1", "cache/integration-tests": "^0.7", - "mockery/mockery": "^0.9.4" + "mockery/mockery": "^0.9" }, "provide": { "psr/cache-implementation": "1.0.0" From cdbc2f52ace7958f9f0a4c3146ac53d3640932f1 Mon Sep 17 00:00:00 2001 From: Aaron Scherer Date: Mon, 1 Feb 2016 00:19:38 -0800 Subject: [PATCH 14/19] Updating version req for predis --- src/Adapter/Predis/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Adapter/Predis/composer.json b/src/Adapter/Predis/composer.json index c58ed8db..294efecd 100644 --- a/src/Adapter/Predis/composer.json +++ b/src/Adapter/Predis/composer.json @@ -27,7 +27,7 @@ "require": { "php": "^5.5|^7.0", "psr/cache": "^1.0", - "cache/adapter-common": "^0.1.2", + "cache/adapter-common": "^0.1", "cache/taggable-cache": "^0.3", "cache/hierarchical-cache": "^0.1", "predis/predis": "^1.0" From 346fd94525acafee47a63cf901411a6074fe3142 Mon Sep 17 00:00:00 2001 From: Aaron Scherer Date: Mon, 1 Feb 2016 00:19:54 -0800 Subject: [PATCH 15/19] Updating version req for predis --- src/Adapter/Predis/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Adapter/Predis/composer.json b/src/Adapter/Predis/composer.json index 294efecd..72cc4a97 100644 --- a/src/Adapter/Predis/composer.json +++ b/src/Adapter/Predis/composer.json @@ -27,7 +27,7 @@ "require": { "php": "^5.5|^7.0", "psr/cache": "^1.0", - "cache/adapter-common": "^0.1", + "cache/adapter-common": "^0.2", "cache/taggable-cache": "^0.3", "cache/hierarchical-cache": "^0.1", "predis/predis": "^1.0" From 7b4e75643c944cd1d9535e08270a4839a0ca8971 Mon Sep 17 00:00:00 2001 From: Aaron Scherer Date: Mon, 1 Feb 2016 00:31:50 -0800 Subject: [PATCH 16/19] Updating version reqs --- .travis.yml | 3 ++- .travis/Readme.md | 1 - src/Adapter/Apc/composer.json | 2 +- src/Adapter/Apcu/composer.json | 2 +- src/Adapter/Chain/composer.json | 2 +- src/Adapter/Doctrine/composer.json | 2 +- src/Adapter/Filesystem/composer.json | 2 +- src/Adapter/Memcache/composer.json | 2 +- src/Adapter/Memcached/composer.json | 2 +- src/Adapter/MongoDB/composer.json | 2 +- src/Adapter/PHPArray/composer.json | 2 +- src/Adapter/Predis/composer.json | 2 +- src/Adapter/Redis/composer.json | 2 +- src/Adapter/Void/composer.json | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 .travis/Readme.md diff --git a/.travis.yml b/.travis.yml index d32f9ae1..c575baeb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,7 +32,8 @@ script: after_success: - if [[ "$SEND_COVERAGE" = true ]]; codecov; fi -sudo: true +sudo: required +dist: precise notifications: email: false diff --git a/.travis/Readme.md b/.travis/Readme.md deleted file mode 100644 index 07f601ed..00000000 --- a/.travis/Readme.md +++ /dev/null @@ -1 +0,0 @@ -This directory has has confiuration files for travis and also the subtree slit \ No newline at end of file diff --git a/src/Adapter/Apc/composer.json b/src/Adapter/Apc/composer.json index d8ac2616..41a432d8 100644 --- a/src/Adapter/Apc/composer.json +++ b/src/Adapter/Apc/composer.json @@ -35,7 +35,7 @@ "cache/integration-tests": "^0.7" }, "provide": { - "psr/cache-implementation": "1.0.0" + "psr/cache-implementation": "^1.0" }, "autoload": { "psr-4": { diff --git a/src/Adapter/Apcu/composer.json b/src/Adapter/Apcu/composer.json index 2aa77e31..faaac5fe 100644 --- a/src/Adapter/Apcu/composer.json +++ b/src/Adapter/Apcu/composer.json @@ -35,7 +35,7 @@ "cache/integration-tests": "^0.7" }, "provide": { - "psr/cache-implementation": "1.0.0" + "psr/cache-implementation": "^1.0" }, "autoload": { "psr-4": { diff --git a/src/Adapter/Chain/composer.json b/src/Adapter/Chain/composer.json index 6a019713..0e5e030f 100644 --- a/src/Adapter/Chain/composer.json +++ b/src/Adapter/Chain/composer.json @@ -36,7 +36,7 @@ "cache/array-adapter": "@stable" }, "provide": { - "psr/cache-implementation": "1.0.0" + "psr/cache-implementation": "^1.0" }, "autoload": { "psr-4": { diff --git a/src/Adapter/Doctrine/composer.json b/src/Adapter/Doctrine/composer.json index 465adeb2..920ec108 100644 --- a/src/Adapter/Doctrine/composer.json +++ b/src/Adapter/Doctrine/composer.json @@ -35,7 +35,7 @@ "mockery/mockery": "^0.9" }, "provide": { - "psr/cache-implementation": "1.0.0" + "psr/cache-implementation": "^1.0" }, "suggest": { "ext-apc": "Allows for caching with Apc", diff --git a/src/Adapter/Filesystem/composer.json b/src/Adapter/Filesystem/composer.json index b6993d2b..bab11f7a 100644 --- a/src/Adapter/Filesystem/composer.json +++ b/src/Adapter/Filesystem/composer.json @@ -35,7 +35,7 @@ "cache/integration-tests": "^0.7" }, "provide": { - "psr/cache-implementation": "~1.0" + "psr/cache-implementation": "^1.0" }, "autoload": { "psr-4": { diff --git a/src/Adapter/Memcache/composer.json b/src/Adapter/Memcache/composer.json index c364c538..0cd94702 100644 --- a/src/Adapter/Memcache/composer.json +++ b/src/Adapter/Memcache/composer.json @@ -35,7 +35,7 @@ "cache/integration-tests": "^0.7" }, "provide": { - "psr/cache-implementation": "1.0.0" + "psr/cache-implementation": "^1.0" }, "autoload": { "psr-4": { diff --git a/src/Adapter/Memcached/composer.json b/src/Adapter/Memcached/composer.json index 0987194f..bf6e320c 100644 --- a/src/Adapter/Memcached/composer.json +++ b/src/Adapter/Memcached/composer.json @@ -36,7 +36,7 @@ "cache/integration-tests": "^0.7" }, "provide": { - "psr/cache-implementation": "1.0.0" + "psr/cache-implementation": "^1.0" }, "autoload": { "psr-4": { diff --git a/src/Adapter/MongoDB/composer.json b/src/Adapter/MongoDB/composer.json index b049dfd9..d4e03a43 100644 --- a/src/Adapter/MongoDB/composer.json +++ b/src/Adapter/MongoDB/composer.json @@ -35,7 +35,7 @@ "cache/integration-tests": "^0.7" }, "provide": { - "psr/cache-implementation": "1.0.0" + "psr/cache-implementation": "^1.0" }, "autoload": { "psr-4": { diff --git a/src/Adapter/PHPArray/composer.json b/src/Adapter/PHPArray/composer.json index 6e7ba22c..14c3c590 100644 --- a/src/Adapter/PHPArray/composer.json +++ b/src/Adapter/PHPArray/composer.json @@ -35,7 +35,7 @@ "cache/integration-tests": "^0.7" }, "provide": { - "psr/cache-implementation": "~1.0" + "psr/cache-implementation": "^1.0" }, "autoload": { "psr-4": { diff --git a/src/Adapter/Predis/composer.json b/src/Adapter/Predis/composer.json index 72cc4a97..b6e06d64 100644 --- a/src/Adapter/Predis/composer.json +++ b/src/Adapter/Predis/composer.json @@ -37,7 +37,7 @@ "cache/integration-tests": "^0.7" }, "provide": { - "psr/cache-implementation": "1.0.0" + "psr/cache-implementation": "^1.0" }, "autoload": { "psr-4": { diff --git a/src/Adapter/Redis/composer.json b/src/Adapter/Redis/composer.json index e1a682ec..1600a61b 100644 --- a/src/Adapter/Redis/composer.json +++ b/src/Adapter/Redis/composer.json @@ -37,7 +37,7 @@ "cache/integration-tests": "^0.7" }, "provide": { - "psr/cache-implementation": "1.0.0" + "psr/cache-implementation": "^1.0" }, "autoload": { "psr-4": { diff --git a/src/Adapter/Void/composer.json b/src/Adapter/Void/composer.json index e655c674..f938e6f0 100644 --- a/src/Adapter/Void/composer.json +++ b/src/Adapter/Void/composer.json @@ -34,7 +34,7 @@ "cache/integration-tests": "^0.7" }, "provide": { - "psr/cache-implementation": "1.0.0" + "psr/cache-implementation": "^1.0" }, "autoload": { "psr-4": { From 9e54b012624d67b5d9120a0d1c98c10eb6e003aa Mon Sep 17 00:00:00 2001 From: Aaron Scherer Date: Mon, 1 Feb 2016 00:38:27 -0800 Subject: [PATCH 17/19] Adding memcached extension --- build/all.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build/all.sh b/build/all.sh index be6e370e..53017ce6 100755 --- a/build/all.sh +++ b/build/all.sh @@ -12,6 +12,10 @@ pip install --user codecov # Install Mongo ./build/installMongo.sh +# Install Memcached extension +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 \ No newline at end of file From f3cd318b90946acde122176e876064e112eef832 Mon Sep 17 00:00:00 2001 From: Aaron Scherer Date: Mon, 1 Feb 2016 00:50:14 -0800 Subject: [PATCH 18/19] gs --- build/5.x.sh | 5 ++++- build/7.x.sh | 22 +++++++++++++++++++++- build/all.sh | 9 +++------ build/installMongo.sh | 19 ------------------- 4 files changed, 28 insertions(+), 27 deletions(-) delete mode 100755 build/installMongo.sh diff --git a/build/5.x.sh b/build/5.x.sh index a235dc30..85d2d4a0 100755 --- a/build/5.x.sh +++ b/build/5.x.sh @@ -1,4 +1,7 @@ #!/usr/bin/env bash # Install APC Adapter & APCu Adapter dependencies -yes '' | pecl install apcu-4.0.8 \ No newline at end of file +yes '' | pecl install apcu-4.0.8 + +# Install Mongo +echo "extension = mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; diff --git a/build/7.x.sh b/build/7.x.sh index 2b0e3b4a..e514d75e 100755 --- a/build/7.x.sh +++ b/build/7.x.sh @@ -1,4 +1,24 @@ #!/usr/bin/env bash # Install APC Adapter & APCu Adapter dependencies -yes '' | pecl install apcu-5.1.0 \ No newline at end of file +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 \ No newline at end of file diff --git a/build/all.sh b/build/all.sh index 53017ce6..047c5038 100755 --- a/build/all.sh +++ b/build/all.sh @@ -1,7 +1,7 @@ #!/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 +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 @@ -9,12 +9,9 @@ if [ $TRAVIS_PHP_VERSION != 'hhvm' ]; then phpenv config-add ./tests/travis/php. # Install codecov pip install --user codecov -# Install Mongo -./build/installMongo.sh - # Install Memcached extension -if [[ $TRAVIS_PHP_VERSION != 'hhvm' ]]; then echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi; - +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 diff --git a/build/installMongo.sh b/build/installMongo.sh deleted file mode 100755 index 8dbba409..00000000 --- a/build/installMongo.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -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 -if [[ $TRAVIS_PHP_VERSION != 'hhvm' ]]; then pecl install -f mongodb-1.1.2; fi; -mongo --eval 'tojson(db.runCommand({buildInfo:1}))' -if [[ $TRAVIS_PHP_VERSION != 'hhvm' ]]; then php --ri mongodb; fi; \ No newline at end of file From 94e109f0a3f46fb394fae64b6e7d884a6c687f24 Mon Sep 17 00:00:00 2001 From: Aaron Scherer Date: Mon, 1 Feb 2016 00:53:04 -0800 Subject: [PATCH 19/19] Fixing req for mongo --- build/5.x.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/build/5.x.sh b/build/5.x.sh index 85d2d4a0..1e95fbbc 100755 --- a/build/5.x.sh +++ b/build/5.x.sh @@ -5,3 +5,4 @@ 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;