Merge pull request #15 from M6Web/omansour-patch-1

php 7 continuous integration
BedrockStreaming · Sep 14, 2015 · 47effc6 · 47effc6
2 parents 4bdedc9 + 9203796
commit 47effc6
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 245 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
-vendor
+vendor
+composer.lock
diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,7 @@ php:
   - 5.4
   - 5.5
   - 5.6
+  - 7
 
 before_script:
   - wget http://getcomposer.org/composer.phar

diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
         "php": ">=5.4.0"
     },
     "require-dev": {
-        "atoum/atoum": "~1.0",
+        "atoum/atoum": "~2.0",
         "m6web/symfony2-coding-standard": "~1.2",
         "m6web/coke": "~1.2"
     },

diff --git a/composer.lock b/composer.lock
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ php: @@
       - 5.4
       - 5.5
       - 5.6
+      - 7
     before_script:
       - wget http://getcomposer.org/composer.phar
@@ Expand Down @@