diff --git a/fixtures/with_amqp/composer.json b/fixtures/with_amqp/composer.json index c992e4062..8fccd037b 100644 --- a/fixtures/with_amqp/composer.json +++ b/fixtures/with_amqp/composer.json @@ -1,6 +1,5 @@ { "require": { - "ext-amqp": "*", - "cloudfoundry-community/cf-helper-php": "1.6.*" + "ext-amqp": "*" } } diff --git a/fixtures/with_phpredis/composer.json b/fixtures/with_phpredis/composer.json index 772db2a8a..4c31b1781 100644 --- a/fixtures/with_phpredis/composer.json +++ b/fixtures/with_phpredis/composer.json @@ -1,7 +1,6 @@ { "require": { "ext-redis": "*", - "ext-igbinary": "*", - "cloudfoundry-community/cf-helper-php": "1.6.*" + "ext-igbinary": "*" } } diff --git a/fixtures/with_phpredis/index.php b/fixtures/with_phpredis/index.php index 7a9fd290a..36495b42e 100644 --- a/fixtures/with_phpredis/index.php +++ b/fixtures/with_phpredis/index.php @@ -5,33 +5,13 @@

This page initiates a Redis connection and displays Redis info via the phpredis client.

getServiceManager(); - $redisService = $serviceManager->getService('.*redis.*'); - - $defaultUrl = "localhost"; - $defaulPort = 6379; - $defaulPassword = "password"; - - # Prevent PHP Errors if no service is bound - if (is_null($redisService)){ - $redisUrl = $defaultUrl; - $redisPort = $defaulPort; - $redisPassword = $defaulPassword; - } - else { - $redisUrl = $redisService->getValue('hostname'); - $redisPort = $redisService->getValue('port'); - $redisPassword = $redisService->getValue('password'); - } + $redisUrl = "localhost"; + $redisPort = 6379; + $redisPassword = "password"; print "

RedisUrl: $redisUrl

"; print "

RedisPort: $redisPort

"; - print "

RedisUrl: redacted

"; + print "

RedisPassword: redacted

"; # Establish Redis connection and authenticate $redis = new Redis();