Merge branch 'develop'

nojimage · Oct 5, 2013 · f050096 · f050096
2 parents 17c841e + be2a818
commit f050096
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,6 +7,7 @@ php:
 
 before_script:
   - composer install --dev
+  - patch vendor/twitter/twitter-text-conformance/validate.yml < validate.yml.patch
 
 script:
   - phpunit
diff --git a/validate.yml.patch b/validate.yml.patch
@@ -0,0 +1,13 @@
+--- vendor/twitter/twitter-text-conformance/validate.yml	2013-07-04 11:15:55.000000000 +0900
++++ validate.yml.travis	2013-10-05 17:14:25.000000000 +0900
+@@ -227,10 +227,6 @@
+       text: "Test http://test.com test http://test.com test.com test"
+       expected: 83
+
+-    - description: "Count unicode chars outside the basic multilingual plane (double word)"
+-      text: "𐀀􏿿"
+-      expected: 2
+-
+     - description: "Count unicode chars inside the basic multilingual plane"
+       text: "저찀쯿쿿"
+       expected: 4