Docker support

Mauro Cassani · Mauro Cassani · commit 6611f6bd0273 · 2017-06-20T11:47:09.000+02:00
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1 @@
+vendor
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,9 @@
 FROM php:7.0-apache
 
+# Copy whole project
+# Copy parameters.docker.yml into parameters.yml
 COPY / /var/www/html/
+COPY config/parameters.docker.yml /var/www/html/config/parameters.yml
 WORKDIR /var/www/html/
 
 # Composer
@@ -18,6 +21,10 @@ RUN apt-get update && apt-get install -y
 RUN docker-php-ext-install opcache
 RUN pecl install apcu-5.1.5
 RUN docker-php-ext-enable apcu
+RUN { \
+		echo 'apc.enabled=1'; \
+		echo 'apc.enable_cli=1'; \
+	} >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini
 
 # Install dependencies
-RUN composer install --no-interaction
+RUN composer install --no-interaction
diff --git a/README.md b/README.md
@@ -482,7 +482,11 @@ $console->add(new \InMemoryList\Command\FlushCommand('redis', [
 
 ## Testing
 
-In order to run all the test, you need to install **all the drivers** on your machine:
+In order to run all the tests, you have two options:
+
+### 1. Install all the drivers on your machine
+
+The first way it to install **all the drivers** on your machine:
 
 * APCU - [(install via PECL)](https://pecl.php.net/package/APCu) 
 * MEMCACHED - [(install via PECL)](https://pecl.php.net/package/memcached) 
@@ -503,6 +507,18 @@ memcached_parameters:
   port: '11211'
 ```
 
+### 2. Run the project with Docker
+
+You can simple run the project with [Docker](https://www.docker.com/):
+
+```
+docker-compose build
+
+docker-compose up -d
+```
+
+Then, enter in the container and run the tests.
+
 ## Built With
 
 * [PRedis](https://github.com/nrk/predis) - Flexible and feature-complete Redis client for PHP and HHVM
diff --git a/app/bootstrap.php b/app/bootstrap.php
@@ -7,13 +7,13 @@
  *  For the full copyright and license information, please view the LICENSE
  *  file that was distributed with this source code.
  */
-require __DIR__.'/../vendor/autoload.php';
+require __DIR__ . '/../vendor/autoload.php';
 
 use Symfony\Component\Yaml\Exception\ParseException;
 use Symfony\Component\Yaml\Yaml;
 
 try {
-    $config = Yaml::parse(file_get_contents(__DIR__.'/../config/parameters.yml'));
+    $config = Yaml::parse(file_get_contents(__DIR__ . '/../config/parameters.yml'));
 
     return $config;
 } catch (ParseException $e) {
diff --git a/bin/console b/bin/console
@@ -5,7 +5,7 @@ set_time_limit(0);
 
 require __DIR__.'/../vendor/autoload.php';
 
-$config = require __DIR__.'/../tests/bootstrap.php';
+$config = require __DIR__ . '/../app/bootstrap.php';
 
 $app = new \Symfony\Component\Console\Application('In Memory List', 'v1.2');
 
diff --git a/config/parameters.dist.yml b/config/parameters.dist.yml
@@ -6,6 +6,5 @@ redis_parameters:
     profile: '3.2'
 
 memcached_parameters:
-  -
-    host: 'localhost'
-    port: '11211'
+  host: 'localhost'
+  port: '11211'
diff --git a/config/parameters.docker.yml b/config/parameters.docker.yml
@@ -0,0 +1,10 @@
+redis_parameters:
+  scheme: 'tcp'
+  host: 'redis'
+  port: '6379'
+  options:
+    profile: '3.2'
+
+memcached_parameters:
+  host: 'memcached'
+  port: '11211'
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -0,0 +1,18 @@
+version: '2'
+
+services:
+  app:
+    build: .
+    links:
+      - redis:redis
+      - memcached:memcached
+    ports:
+      - "5000:80"
+
+  redis:
+    image: redis
+    restart: always
+
+  memcached:
+    image: memcached
+    restart: always
diff --git a/examples/apcu/albums.php b/examples/apcu/albums.php
@@ -9,8 +9,6 @@
  */
 use InMemoryList\Application\Client;
 
-include __DIR__.'/../shared.php';
-
 $start = microtime(true);
 $apiUrl = 'https://jsonplaceholder.typicode.com/albums';
 $apiArray = json_decode(file_get_contents($apiUrl));
diff --git a/examples/apcu/benchmark.php b/examples/apcu/benchmark.php
@@ -9,8 +9,6 @@
  */
 use InMemoryList\Application\Client;
 
-include __DIR__.'/../shared.php';
-
 $start = microtime(true);
 
 $from = (isset($_GET['from'])) ?: 1;
diff --git a/examples/apcu/comments.php b/examples/apcu/comments.php
@@ -9,8 +9,6 @@
  */
 use InMemoryList\Application\Client;
 
-include __DIR__.'/../shared.php';
-
 $start = microtime(true);
 $apiUrl = 'https://jsonplaceholder.typicode.com/comments';
 $apiArray = json_decode(file_get_contents($apiUrl));
diff --git a/examples/apcu/photos.php b/examples/apcu/photos.php
@@ -9,8 +9,6 @@
  */
 use InMemoryList\Application\Client;
 
-include __DIR__.'/../shared.php';
-
 $start = microtime(true);
 $apiUrl = 'https://jsonplaceholder.typicode.com/photos';
 $apiArray = json_decode(file_get_contents($apiUrl));
diff --git a/examples/memcached/albums.php b/examples/memcached/albums.php
@@ -9,7 +9,7 @@
  */
 use InMemoryList\Application\Client;
 
-include __DIR__.'/../../tests/bootstrap.php';
+include __DIR__ . '/../../app/bootstrap.php';
 
 $start = microtime(true);
 $apiUrl = 'https://jsonplaceholder.typicode.com/albums';
diff --git a/examples/memcached/benchmark.php b/examples/memcached/benchmark.php
@@ -9,7 +9,7 @@
  */
 use InMemoryList\Application\Client;
 
-include __DIR__.'/../../tests/bootstrap.php';
+include __DIR__ . '/../../app/bootstrap.php';
 
 $start = microtime(true);
 
diff --git a/examples/memcached/comments.php b/examples/memcached/comments.php
@@ -9,7 +9,7 @@
  */
 use InMemoryList\Application\Client;
 
-include __DIR__.'/../../tests/bootstrap.php';
+include __DIR__ . '/../../app/bootstrap.php';
 
 $start = microtime(true);
 $apiUrl = 'https://jsonplaceholder.typicode.com/comments';
diff --git a/examples/memcached/photos.php b/examples/memcached/photos.php
@@ -9,7 +9,7 @@
  */
 use InMemoryList\Application\Client;
 
-include __DIR__.'/../../tests/bootstrap.php';
+include __DIR__ . '/../../app/bootstrap.php';
 
 $start = microtime(true);
 $apiUrl = 'https://jsonplaceholder.typicode.com/photos';
diff --git a/examples/redis/albums.php b/examples/redis/albums.php
@@ -9,7 +9,7 @@
  */
 use InMemoryList\Application\Client;
 
-include __DIR__.'/../../tests/bootstrap.php';
+include __DIR__ . '/../../app/bootstrap.php';
 
 $start = microtime(true);
 $apiUrl = 'https://jsonplaceholder.typicode.com/albums';
diff --git a/examples/redis/benchmark.php b/examples/redis/benchmark.php
@@ -9,7 +9,7 @@
  */
 use InMemoryList\Application\Client;
 
-include __DIR__.'/../../tests/bootstrap.php';
+include __DIR__ . '/../../app/bootstrap.php';
 
 $start = microtime(true);
 
diff --git a/examples/redis/comments.php b/examples/redis/comments.php
@@ -9,7 +9,7 @@
  */
 use InMemoryList\Application\Client;
 
-include __DIR__.'/../../tests/bootstrap.php';
+include __DIR__ . '/../../app/bootstrap.php';
 
 $start = microtime(true);
 $apiUrl = 'https://jsonplaceholder.typicode.com/comments';
diff --git a/examples/redis/photos.php b/examples/redis/photos.php
@@ -9,7 +9,7 @@
  */
 use InMemoryList\Application\Client;
 
-include __DIR__.'/../../tests/bootstrap.php';
+include __DIR__ . '/../../app/bootstrap.php';
 
 $start = microtime(true);
 $apiUrl = 'https://jsonplaceholder.typicode.com/photos';
diff --git a/examples/simple-array-with-headers.php b/examples/simple-array-with-headers.php
@@ -9,7 +9,7 @@
  */
 use InMemoryList\Application\Client;
 
-include __DIR__.'/../tests/bootstrap.php';
+include __DIR__ . '/../app/bootstrap.php';
 
 $simpleArray = json_encode([
     [
diff --git a/examples/simple-array.php b/examples/simple-array.php
@@ -9,7 +9,7 @@
  */
 use InMemoryList\Application\Client;
 
-include __DIR__.'/../tests/bootstrap.php';
+include __DIR__ . '/../app/bootstrap.php';
 
 $simpleArray = json_encode([
     [
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -9,7 +9,7 @@
   ~  file that was distributed with this source code.
   -->
 
-<phpunit bootstrap="tests/bootstrap.php"
+<phpunit bootstrap="app/bootstrap.php"
          colors="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
diff --git a/tests/BaseTestCase.php b/tests/BaseTestCase.php
@@ -29,7 +29,7 @@ class BaseTestCase extends TestCase
      */
     public function setUp()
     {
-        $config = require __DIR__.'/../tests/bootstrap.php';
+        $config = require __DIR__ . '/../app/bootstrap.php';
         $this->memcached_parameters = $config['memcached_parameters'];
         $this->redis_parameters = $config['redis_parameters'];
     }
diff --git a/tests/Command/FlushCommandTest.php b/tests/Command/FlushCommandTest.php
@@ -71,8 +71,8 @@ public function it_displays_correctly_redis_flush_message()
         $output = $commandTester->getDisplay();
 
         $this->assertEquals('redis', $command->getDriver());
-        $this->assertEquals('127.0.0.1', $command->getParameters()['host']);
-        $this->assertEquals(6379, $command->getParameters()['port']);
+        $this->assertEquals($this->redis_parameters['host'], $command->getParameters()['host']);
+        $this->assertEquals($this->redis_parameters['port'], $command->getParameters()['port']);
         $this->assertContains('[redis] Cache was successful flushed.', $output);
     }
 }
diff --git a/tests/InMemoryList/Infrastructure/Drivers/RedisDriverTest.php b/tests/InMemoryList/Infrastructure/Drivers/RedisDriverTest.php
@@ -20,7 +20,6 @@ public function setUp()
     /**
      * @test
      * @expectedException \Predis\Connection\ConnectionException
-     * @expectedExceptionMessage `AUTH` failed: ERR Client sent AUTH, but no password is set [tcp://127.0.0.1:6379]
      */
     public function it_throws_ConnectionException_if_wrong_config_array_is_provided()
     {

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`*/`
`10`	`10`	`use InMemoryList\Application\Client;`
`11`	`11`
`12`		`-include __DIR__.'/../tests/bootstrap.php';`
	`12`	`+include __DIR__ . '/../app/bootstrap.php';`
`13`	`13`
`14`	`14`	`$simpleArray = json_encode([`
`15`	`15`	`[`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class BaseTestCase extends TestCase`
`29`	`29`	`*/`
`30`	`30`	`public function setUp()`
`31`	`31`	`{`
`32`		`- $config = require __DIR__.'/../tests/bootstrap.php';`
	`32`	`+ $config = require __DIR__ . '/../app/bootstrap.php';`
`33`	`33`	`$this->memcached_parameters = $config['memcached_parameters'];`
`34`	`34`	`$this->redis_parameters = $config['redis_parameters'];`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,8 +71,8 @@ public function it_displays_correctly_redis_flush_message()`
`71`	`71`	`$output = $commandTester->getDisplay();`
`72`	`72`
`73`	`73`	`$this->assertEquals('redis', $command->getDriver());`
`74`		`- $this->assertEquals('127.0.0.1', $command->getParameters()['host']);`
`75`		`- $this->assertEquals(6379, $command->getParameters()['port']);`
	`74`	`+ $this->assertEquals($this->redis_parameters['host'], $command->getParameters()['host']);`
	`75`	`+ $this->assertEquals($this->redis_parameters['port'], $command->getParameters()['port']);`
`76`	`76`	`$this->assertContains('[redis] Cache was successful flushed.', $output);`
`77`	`77`	`}`
`78`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@ public function setUp()`
`20`	`20`	`/**`
`21`	`21`	`* @test`
`22`	`22`	`* @expectedException \Predis\Connection\ConnectionException`
`23`		- * @expectedExceptionMessage `AUTH` failed: ERR Client sent AUTH, but no password is set [tcp://127.0.0.1:6379]
`24`	`23`	`*/`
`25`	`24`	`public function it_throws_ConnectionException_if_wrong_config_array_is_provided()`
`26`	`25`	`{`