Merge pull request #10 from Nyholm/dep2

Remove dependency on adapters

Author: Nyholm

.travis.yml

@@ -1,15 +1,11 @@
 language: php
 php:
-  - "hhvm"
-  - "7.0"
-  - "5.6"
-  - "5.5"
+  - hhvm
+  - 7.0
+  - 5.6
+  - 5.5
 
-sudo: required
-
-services:
-  - memcached
-  - redis-server
+sudo: false
 
 env:
   global:
@@ -26,20 +22,15 @@ matrix:
     - php: 5.5
       env: COMPOSER_COMMAND="composer update --prefer-lowest --prefer-stable" && SYMFONY_VERSION=2.7.*
 
-before_script:
-  - mkdir -p ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d
-  - echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
-  - echo "extension=memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
-  - echo "extension=redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
-  - if [[ $TRAVIS_PHP_VERSION != 'hhvm' && `php-config --vernum` -ge 70000 ]]; then pecl config-set preferred_state beta; printf "yes\n" | pecl install apcu; else echo "extension=apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi;
+before_install:
   - composer self-update
   - composer require symfony/symfony:${SYMFONY_VERSION} --no-update
+
+install:
   - travis_retry ${COMPOSER_COMMAND} --no-interaction
-  # must be set after composer to avoid issue with autoloading
-  - echo "apc.enable_cli=On" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
 
 script:
-    - php vendor/bin/phpunit
+  - php vendor/bin/phpunit
 
 after_success:
-    - codecov
+  - codecov

composer.json

@@ -26,14 +26,10 @@
     "require-dev":  {
         "phpunit/phpunit":                                  "5.0.*|^4.0",
         "matthiasnoback/symfony-dependency-injection-test": "0.7.*",
-        "cache/doctrine-adapter": "@stable",
-        "cache/redis-adapter": "@stable",
-        "cache/memcached-adapter": "@stable"
+        "cache/array-adapter":                              "@stable"
     },
     "suggest":      {
-        "cache/doctrine-adapter": "To integrate with doctrine/cache",
-        "cache/redis-adapter": "Redis adapter",
-        "cache/memcached-adapter": "Memcached adapter"
+        "cache/*-adapter": "To integrate with a PSR-6 cache"
     },
     "autoload":     {
         "psr-4": {

tests/DependencyInjection/DoctrineCacheExtensionTest.php

@@ -26,7 +26,7 @@ protected function getContainerExtensions()
 
     public function testThatProvidersExists()
     {
-        $providers = ['foo' => ['factory' => 'cache.factory.redis']];
+        $providers = ['foo' => ['factory' => 'cache.factory.array']];
         $this->load(['providers' => $providers]);
 
         $this->assertContainerBuilderHasService('cache.provider.foo', DummyAdapter::class);