From b0e5c633494f1975573c436b89f39e011515c077 Mon Sep 17 00:00:00 2001
From: Kevin Bond <kevinbond@gmail.com>
Date: Thu, 25 Feb 2016 07:47:17 -0500
Subject: [PATCH 1/3] fix cs

---
 src/StringExtension.php                  | 2 +-
 tests/StringExtensionIntegrationTest.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/StringExtension.php b/src/StringExtension.php
index bbc7354..4c2e8c6 100644
--- a/src/StringExtension.php
+++ b/src/StringExtension.php
@@ -15,7 +15,7 @@ public function getFilters()
         return array(
             new \Twig_SimpleFilter('remove_whitespace', '\zenstruck\string\remove_whitespace'),
             new \Twig_SimpleFilter('null_trim', '\zenstruck\string\null_trim'),
-            new \Twig_SimpleFilter('truncate_word', '\zenstruck\string\truncate_word')
+            new \Twig_SimpleFilter('truncate_word', '\zenstruck\string\truncate_word'),
         );
     }
 
diff --git a/tests/StringExtensionIntegrationTest.php b/tests/StringExtensionIntegrationTest.php
index 83b2620..acfdf0e 100644
--- a/tests/StringExtensionIntegrationTest.php
+++ b/tests/StringExtensionIntegrationTest.php
@@ -12,7 +12,7 @@ class StringExtensionIntegrationTest extends \Twig_Test_IntegrationTestCase
     protected function getExtensions()
     {
         return array(
-            new StringExtension()
+            new StringExtension(),
         );
     }
 

From ede755dbc78c3daa1f6d8749c6f6376af7dc8a59 Mon Sep 17 00:00:00 2001
From: Kevin Bond <kevinbond@gmail.com>
Date: Thu, 25 Feb 2016 07:48:05 -0500
Subject: [PATCH 2/3] update to zenstruck/string 1.0

---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index a02a32e..e0308da 100644
--- a/composer.json
+++ b/composer.json
@@ -12,8 +12,8 @@
         }
     ],
     "require": {
-        "zenstruck/string": "~0.1",
-        "twig/twig": "~1.12"
+        "zenstruck/string": "^1.0",
+        "twig/twig": "^1.12"
     },
     "autoload": {
         "psr-4": { "Zenstruck\\String\\Bridge\\Twig\\": "src/" }

From 4080ca9418ef038b60a4d1b65beb513440f47014 Mon Sep 17 00:00:00 2001
From: Kevin Bond <kevinbond@gmail.com>
Date: Thu, 25 Feb 2016 07:48:24 -0500
Subject: [PATCH 3/3] add/update ci config

---
 .gitattributes   | 8 ++++++++
 .php_cs          | 5 +++++
 .scrutinizer.yml | 6 ++++++
 .styleci.yml     | 3 +++
 .travis.yml      | 1 +
 5 files changed, 23 insertions(+)
 create mode 100644 .gitattributes
 create mode 100644 .php_cs
 create mode 100644 .scrutinizer.yml
 create mode 100644 .styleci.yml

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..fe5a604
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,8 @@
+/.gitattributes export-ignore
+/.gitignore     export-ignore
+/.scrutinizer   export-ignore
+/.styleci.yml   export-ignore
+/.travis.yml    export-ignore
+/.php_cs        export-ignore
+/phpunit.xml    export-ignore
+/tests          export-ignore
diff --git a/.php_cs b/.php_cs
new file mode 100644
index 0000000..bdf2fc2
--- /dev/null
+++ b/.php_cs
@@ -0,0 +1,5 @@
+<?php
+
+use SLLH\StyleCIBridge\ConfigBridge;
+
+return ConfigBridge::create();
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
new file mode 100644
index 0000000..b98a4f1
--- /dev/null
+++ b/.scrutinizer.yml
@@ -0,0 +1,6 @@
+filter:
+  paths: [src/*]
+checks:
+  php: true
+tools:
+  external_code_coverage: true
diff --git a/.styleci.yml b/.styleci.yml
new file mode 100644
index 0000000..c3d2e6a
--- /dev/null
+++ b/.styleci.yml
@@ -0,0 +1,3 @@
+preset: symfony
+disabled:
+  - empty_return
diff --git a/.travis.yml b/.travis.yml
index a89eee4..8b1d7ce 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ php:
   - 5.4
   - 5.5
   - 5.6
+  - 7.0
   - hhvm
 
 before_install: