Merge pull request #6 from herloct/update_to_1.1

Update to 1.1

Author: herloct

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Herloct <herloct@gmail.com>
+Copyright (c) 2017 Herloct <herloct@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,6 +1,6 @@
 # Codeception Slim Module
 
-[![Master Build Status](https://travis-ci.org/herloct/codeception-slim-module.svg?branch=1.0.4)](https://travis-ci.org/herloct/codeception-slim-module)
+[![Master Build Status](https://travis-ci.org/herloct/codeception-slim-module.svg?branch=master)](https://travis-ci.org/herloct/codeception-slim-module)
 [![Packagist Stable Version](https://img.shields.io/packagist/v/herloct/codeception-slim-module.svg)](https://packagist.org/packages/herloct/codeception-slim-module)
 [![Packagist License](https://img.shields.io/packagist/l/herloct/codeception-slim-module.svg)](https://packagist.org/packages/herloct/codeception-slim-module)
 [![Libraries.io for GitHub](https://img.shields.io/librariesio/github/herloct/codeception-slim-module.svg)](https://libraries.io/github/herloct/codeception-slim-module)
@@ -21,26 +21,43 @@ Via `composer.json`:
 ```json
 {
   "require-dev": {
-    "herloct/codeception-slim-module": "^1.0"
+    "herloct/codeception-slim-module": "^1.1"
   }
 }
 ```
 
 ## Config
 
-* container: relative path to file which returns Container.
+Put this on your `codeception.yml`
 
 ```yaml
-\Herloct\Codeception\Module\Slim:
-  container: path/to/container.php
+modules:
+  config:
+    \Herloct\Codeception\Module\Slim:
+      container: path/to/container.php
+    REST:
+      depends: \Herloct\Codeception\Module\Slim
 ```
 
-Minimum `container.php` contents.
+Or on your `tests/functional.suite.yml`
+
+```yaml
+modules:
+  enabled:
+    - \Helper\Functional
+    - \Herloct\Codeception\Module\Slim:
+        container: path/to/container.php
+    - REST:
+        depends: \Herloct\Codeception\Module\Slim
+```
+
+The `container` properties is a relative path to file which returns your App's Container.  
+Here is the minimum `container.php` contents.
 
 ```php
 require __DIR__.'/vendor/autoload.php';
 
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Slim\App;
 use Slim\Container;
 
@@ -61,8 +78,8 @@ You could use this [Sample Project](https://github.com/herloct/codeception-slim-
 
 ## API
 
-* application -  instance of `\Slim\App`
-* container - instance of `\Interop\Container\ContainerInterface`
+* app -  instance of `\Slim\App`
+* container - instance of `\Psr\Container\ContainerInterface`
 * client - [BrowserKit](http://symfony.com/doc/current/components/browser_kit.html) client
 
 ## Todos

composer.json

@@ -13,6 +13,9 @@
     ],
     "minimum-stability": "stable",
     "require": {
+        "php": "^5.6 || ^7.0"
+    },
+    "require-dev": {
         "php": "^5.6 || ^7.0",
         "codeception/codeception": "^2.2",
         "slim/slim": "^3.5"

docker-compose.yml

@@ -1,24 +1,20 @@
-version: '2'
+version: '3'
 services:
   composer:
-    image: herloct/composer:7.0.12
-    environment:
-      LOCAL_USER_ID: ${USER_ID}
+    image: herloct/composer:1.3.2-php5.6
     volumes:
       - .:/project
-      - ./storages/composer:/composer
+
   codecept:
-    build: dockerfiles/codecept
-    environment:
-      LOCAL_USER_ID: ${USER_ID}
+    image: php:5.6.30
+    working_dir: /project
+    entrypoint:
+      - php
+      - vendor/bin/codecept
     volumes:
       - .:/project
+
   phpcbf:
-    image: herloct/phpcbf:2.7.0
-    environment:
-      LOCAL_USER_ID: ${USER_ID}
+    image: herloct/phpcbf:2.8.1
     volumes:
       - .:/project
-volumes:
-  data:
-    driver: local

dockerfiles/codecept/Dockerfile

@@ -6,7 +6,7 @@
 use Codeception\Lib\Framework;
 use Codeception\TestInterface;
 use Herloct\Codeception\Lib\Connector\Slim as Connector;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Slim\App;
 
 final class Slim extends Framework

dockerfiles/codecept/entrypoint.sh

@@ -0,0 +1,2 @@
+*
+!.gitignore