Merge branch 'master' of https://github.com/zendframework/zf2 into zf…

…-3371
zendframework · Jan 30, 2013 · 4043721 · 4043721
commit 4043721
Show file tree

Hide file tree

Showing 4 changed files with 269 additions and 248 deletions.
diff --git a/.php_cs b/.php_cs
@@ -2,6 +2,7 @@
 echo "Loading " . __FILE__ . "\n";
 $finder = Symfony\CS\Finder\DefaultFinder::create()
     ->notName('TestSampleClass10.php')
+    ->exclude('demos')
     ->in(__DIR__);
 return Symfony\CS\Config\Config::create()
     ->finder($finder);
diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,11 @@ php:
   - 5.3.3
   - 5.3
   - 5.4
+  - 5.5
+
+matrix:
+  allow_failures:
+    - php: 5.5
 
 before_install:
  - cp tests/TestConfiguration.php.travis tests/TestConfiguration.php