From 10672a0a8cd7d3ca924818ff71903c9511fc421e Mon Sep 17 00:00:00 2001
From: Fabien Bourigault <bourigaultfabien@gmail.com>
Date: Wed, 7 Jun 2017 10:06:58 +0200
Subject: [PATCH 1/5] fix composer.json line endings (dos2unix)

---
 composer.json | 70 +++++++++++++++++++++++++--------------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/composer.json b/composer.json
index 3c29600a4..6d2832506 100644
--- a/composer.json
+++ b/composer.json
@@ -1,35 +1,35 @@
-{
-	"name": "m4tthumphrey/php-gitlab-api",
-	"type": "library",
-	"description": "GitLab API client",
-	"homepage": "https://github.com/m4tthumphrey/php-gitlab-api",
-	"keywords": ["gitlab", "api"],
-	"license": "MIT",
-	"authors": [
-		{
-			"name": "Matt Humphrey",
-			"homepage": "http://m4tt.io"
-		},
-		{
-			"name": "KnpLabs Team",
-			"homepage": "http://knplabs.com"
-		},
-		{
-			"name": "Thibault Duplessis",
-			"email": "thibault.duplessis@gmail.com",
-			"homepage": "http://ornicar.github.com"
-		}
-	],
-	"require": {
-		"php":                ">=5.3.2",
-		"ext-curl":           "*",
-		"ext-xml":            "*",
-		"kriswallsmith/buzz": ">=0.7"
-	},
-	"require-dev": {
-		"phpunit/phpunit": "~4.5"
-	},
-	"autoload": {
-		"psr-0": { "Gitlab\\": "lib/" }
-	}
-}
+{
+	"name": "m4tthumphrey/php-gitlab-api",
+	"type": "library",
+	"description": "GitLab API client",
+	"homepage": "https://github.com/m4tthumphrey/php-gitlab-api",
+	"keywords": ["gitlab", "api"],
+	"license": "MIT",
+	"authors": [
+		{
+			"name": "Matt Humphrey",
+			"homepage": "http://m4tt.io"
+		},
+		{
+			"name": "KnpLabs Team",
+			"homepage": "http://knplabs.com"
+		},
+		{
+			"name": "Thibault Duplessis",
+			"email": "thibault.duplessis@gmail.com",
+			"homepage": "http://ornicar.github.com"
+		}
+	],
+	"require": {
+		"php":                ">=5.3.2",
+		"ext-curl":           "*",
+		"ext-xml":            "*",
+		"kriswallsmith/buzz": ">=0.7"
+	},
+	"require-dev": {
+		"phpunit/phpunit": "~4.5"
+	},
+	"autoload": {
+		"psr-0": { "Gitlab\\": "lib/" }
+	}
+}

From 269797b1f80c41f3a5eda81c35f1cd2603df7200 Mon Sep 17 00:00:00 2001
From: Fabien Bourigault <bourigaultfabien@gmail.com>
Date: Wed, 7 Jun 2017 10:03:50 +0200
Subject: [PATCH 2/5] bump minimum PHP version to 5.6

---
 .travis.yml   | 3 ---
 composer.json | 6 +++---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d6b864cc0..f5ac69f8c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,6 @@
 language: php
 
 php:
-  - 5.3
-  - 5.4
-  - 5.5
   - 5.6
   - 7.0
 
diff --git a/composer.json b/composer.json
index 6d2832506..5e9d3e649 100644
--- a/composer.json
+++ b/composer.json
@@ -21,9 +21,9 @@
 		}
 	],
 	"require": {
-		"php":                ">=5.3.2",
-		"ext-curl":           "*",
-		"ext-xml":            "*",
+		"php": "^5.6 || ^7.0",
+		"ext-curl": "*",
+		"ext-xml": "*",
 		"kriswallsmith/buzz": ">=0.7"
 	},
 	"require-dev": {

From 683108a6b4f34e7a8a375711e8c4589fa93c1dfe Mon Sep 17 00:00:00 2001
From: Fabien Bourigault <bourigaultfabien@gmail.com>
Date: Wed, 7 Jun 2017 10:04:16 +0200
Subject: [PATCH 3/5] add PHP 7.1 to travis-ci matrix

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index f5ac69f8c..6343ee738 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ language: php
 php:
   - 5.6
   - 7.0
+  - 7.1
 
 before_script:
   - travis_retry composer self-update

From 32f7a309e4bb0c7bce1fe57bc98b06182f913663 Mon Sep 17 00:00:00 2001
From: Fabien Bourigault <bourigaultfabien@gmail.com>
Date: Wed, 7 Jun 2017 10:30:15 +0200
Subject: [PATCH 4/5] replace psr-0 autoloading by psr-4

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

diff --git a/composer.json b/composer.json
index 5e9d3e649..aaaa1ff98 100644
--- a/composer.json
+++ b/composer.json
@@ -30,6 +30,6 @@
 		"phpunit/phpunit": "~4.5"
 	},
 	"autoload": {
-		"psr-0": { "Gitlab\\": "lib/" }
+		"psr-4": { "Gitlab\\": "lib/Gitlab/" }
 	}
 }

From 07fb0b6667a4cdb221ac565c6f2b4cbd11756cee Mon Sep 17 00:00:00 2001
From: Fabien Bourigault <bourigaultfabien@gmail.com>
Date: Wed, 7 Jun 2017 10:31:01 +0200
Subject: [PATCH 5/5] replace phpunit custom bootstrap by autoload-dev

---
 composer.json      |  8 ++++++++
 phpunit.xml.dist   |  4 ++--
 test/bootstrap.php | 18 ------------------
 3 files changed, 10 insertions(+), 20 deletions(-)
 delete mode 100644 test/bootstrap.php

diff --git a/composer.json b/composer.json
index aaaa1ff98..786bef04f 100644
--- a/composer.json
+++ b/composer.json
@@ -31,5 +31,13 @@
 	},
 	"autoload": {
 		"psr-4": { "Gitlab\\": "lib/Gitlab/" }
+	},
+	"autoload-dev": {
+		"psr-4": { "Gitlab\\Tests\\": "test/Gitlab/Tests/" }
+	},
+	"extra": {
+		"branch-alias": {
+			"dev-master": "9.0.x-dev"
+		}
 	}
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index e01386f15..7351de836 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -9,7 +9,7 @@
 				 processIsolation="false"
 				 stopOnFailure="false"
 				 syntaxCheck="false"
-				 bootstrap="test/bootstrap.php"
+				 bootstrap="vendor/autoload.php"
 	>
 	<testsuites>
 		<testsuite name="php-gitlab-api Test Suite">
@@ -22,4 +22,4 @@
 			<directory suffix=".php">./lib/Gitlab/</directory>
 		</whitelist>
 	</filter>
-</phpunit>
\ No newline at end of file
+</phpunit>
diff --git a/test/bootstrap.php b/test/bootstrap.php
deleted file mode 100644
index 83bc8b088..000000000
--- a/test/bootstrap.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-function includeIfExists($file)
-{
-    if (file_exists($file)) {
-        return include $file;
-    }
-}
-
-if ((!$loader = includeIfExists(__DIR__.'/../vendor/autoload.php')) && (!$loader = includeIfExists(__DIR__.'/../../../.composer/autoload.php'))) {
-    die('You must set up the project dependencies, run the following commands:'.PHP_EOL.
-        'curl -s http://getcomposer.org/installer | php'.PHP_EOL.
-        'php composer.phar install'.PHP_EOL);
-}
-
-$loader->add('Gitlab\Tests', __DIR__);
-
-return $loader;
\ No newline at end of file