Merge branch 'develop'

burzum · Jul 3, 2015 · 881f662 · 881f662
2 parents 3e8af29 + fd6cbfb
commit 881f662
Show file tree

Hide file tree

Showing 520 changed files with 679 additions and 53,461 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,4 @@
 ._*
 Icon
 
-Vendor/HtmlPurifier/library/HTMLPurifier/DefinitionCache/Serializer/
+Vendor/*
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,30 @@
+language: php
+
+php:
+  - 5.6
+  - 7.0
+
+matrix:
+  allow_failures:
+    - php: 7.0
+
+  fast_finish: true
+
+  include:
+    - php: 5.6
+      env:
+        - COVERALLS=1
+
+before_script:
+  - composer self-update
+  - composer install --prefer-dist --no-interaction
+  - sh -c "if [ '$COVERALLS' = '1' ]; then composer require --dev satooshi/php-coveralls:dev-master; fi"
+  - sh -c "if [ '$COVERALLS' = '1' ]; then mkdir -p build/logs; fi"
+
+script:
+  - phpunit
+  - sh -c "if [ '$COVERALLS' = '1' ]; then phpunit --stderr --coverage-clover build/logs/clover.xml; fi"
+  - sh -c "if [ '$COVERALLS' = '1' ]; then php vendor/bin/coveralls -c .coveralls.yml -v; fi"
+
+notifications:
+  email: false
diff --git a/Config/bootstrap.php b/Config/bootstrap.php
diff --git a/Controller/Component/HtmlPurifierComponent.php b/Controller/Component/HtmlPurifierComponent.php
diff --git a/Controller/HtmlPurifierAppController.php b/Controller/HtmlPurifierAppController.php
diff --git a/Lib/Purifier.php b/Lib/Purifier.php
diff --git a/Model/Behavior/HtmlPurifierBehavior.php b/Model/Behavior/HtmlPurifierBehavior.php
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,4 +3,4 @@ @@
     ._*
     Icon
-    Vendor/HtmlPurifier/library/HTMLPurifier/DefinitionCache/Serializer/
+    Vendor/*