From 3773a2da0a1e0903cc746d28f9a9c1dc99b318fc Mon Sep 17 00:00:00 2001
From: Sara Itani <sitani@microsoft.com>
Date: Wed, 1 Mar 2017 18:06:11 -0800
Subject: [PATCH 1/3] Fix formatting breakage PHP_CodeSniffer 3.0 RC4
 introduces a breaking change that removes PHPCS from the composer autoloader.
 This fix adds a bootstrapping step so that we can invoke the autoloader
 automatically.

---
 composer.json     | 3 ++-
 phpunit.xml.dist  | 2 +-
 src/bootstrap.php | 5 +++++
 3 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 src/bootstrap.php

diff --git a/composer.json b/composer.json
index 268a989..2d22278 100644
--- a/composer.json
+++ b/composer.json
@@ -47,7 +47,8 @@
             "LanguageServer\\": "src/"
         },
         "files" : [
-            "src/utils.php"
+            "src/utils.php",
+            "src/boostrap.php"
         ]
     },
     "autoload-dev": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 4e3f6be..ef1befe 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="vendor/autoload.php">
+<phpunit bootstrap="src/bootstrap.php">
     <testsuites>
         <testsuite name="PHP Language Server Test Suite">
             <directory>./tests</directory>
diff --git a/src/bootstrap.php b/src/bootstrap.php
new file mode 100644
index 0000000..eee6162
--- /dev/null
+++ b/src/bootstrap.php
@@ -0,0 +1,5 @@
+<?php
+
+// PHP_CodeSniffer does not define an autoloader in its composer.json,
+// so we must invoke it ourselves.
+require __DIR__ . "/../vendor/squizlabs/php_codesniffer/autoload.php";
\ No newline at end of file

From eff02d18e6329680da6e10779b56a538d1f0ec10 Mon Sep 17 00:00:00 2001
From: Sara Itani <sitani@microsoft.com>
Date: Wed, 1 Mar 2017 18:28:49 -0800
Subject: [PATCH 2/3] s/boostrap/bootstrap

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 2d22278..c71a9c5 100644
--- a/composer.json
+++ b/composer.json
@@ -48,7 +48,7 @@
         },
         "files" : [
             "src/utils.php",
-            "src/boostrap.php"
+            "src/bootstrap.php"
         ]
     },
     "autoload-dev": {

From 5fe4272a76635d45ca8f943c76cf27fb20390033 Mon Sep 17 00:00:00 2001
From: Sara Itani <sitani@microsoft.com>
Date: Wed, 1 Mar 2017 18:50:29 -0800
Subject: [PATCH 3/3] add newline

---
 src/bootstrap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bootstrap.php b/src/bootstrap.php
index eee6162..455f7dc 100644
--- a/src/bootstrap.php
+++ b/src/bootstrap.php
@@ -2,4 +2,4 @@
 
 // PHP_CodeSniffer does not define an autoloader in its composer.json,
 // so we must invoke it ourselves.
-require __DIR__ . "/../vendor/squizlabs/php_codesniffer/autoload.php";
\ No newline at end of file
+require __DIR__ . "/../vendor/squizlabs/php_codesniffer/autoload.php";