resolving merge conflicts

Author: allmightyspiff

.gitignore

@@ -1,5 +1 @@
-.DS_Store
-*.swp
-Thumbs.db
-.svn
-._*
+/vendor/

.php_cs

@@ -0,0 +1,70 @@
+<?php
+
+$header = <<<'EOF'
+Copyright (c) 2009 - 2010, SoftLayer Technologies, Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+ * Neither SoftLayer Technologies, Inc. nor the names of its contributors may
+   be used to endorse or promote products derived from this software without
+   specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+EOF;
+
+// Use PHP-CS-Fixer 2+ if it is available
+if (\class_exists('PhpCsFixer\Config', false)) {
+    return PhpCsFixer\Config::create()
+        ->setUsingCache(true)
+        ->setRiskyAllowed(true)
+        ->setRules(array(
+            '@Symfony' => true,
+            'array_syntax' => array('syntax' => 'long'),
+            'binary_operator_spaces' => array(
+                'align_double_arrow' => false,
+                'align_equals' => false,
+            ),
+            'blank_line_after_opening_tag' => true,
+            'header_comment' => array('header' => $header),
+            'ordered_imports' => true,
+            'php_unit_construct' => true,
+        ))
+        ->setFinder(
+            PhpCsFixer\Finder::create()->in(__DIR__)
+        )
+    ;
+}
+
+Symfony\CS\Fixer\Contrib\HeaderCommentFixer::setHeader($header);
+
+return Symfony\CS\Config\Config::create()
+    ->setUsingCache(true)
+    ->fixers(array(
+        'newline_after_open_tag',
+        'ordered_use',
+        'php_unit_construct',
+        'long_array_syntax',
+        'unalign_double_arrow',
+        'unalign_equals',
+    ))
+    ->finder(
+        Symfony\CS\Finder\DefaultFinder::create()
+            ->in(__DIR__)
+    )
+;

.travis.yml

@@ -0,0 +1,30 @@
+language: php
+warnings_are_errors: false
+
+env:
+  global:
+    - PATH="$HOME/.composer/vendor/bin:$PATH"
+
+matrix:
+  fast_finish: true
+  include:
+    - php: 5.6
+    - php: 5.6
+      env: COMPOSER_FLAGS="--prefer-lowest"
+    - php: 7.0
+    - php: 7.1
+    - php: 7.2
+
+sudo: false
+
+cache:
+  directories:
+    - $HOME/.composer/cache
+
+before_script:
+  - if [[ $TRAVIS_PHP_VERSION != hhvm && -f xdebug.ini ]]; then phpenv config-rm xdebug.ini; fi
+  - if [ "$GITHUB_OAUTH_TOKEN" != "" ]; then echo -e $GITHUB_OAUTH_TOKEN && composer config -g github-oauth.github.com $GITHUB_OAUTH_TOKEN; fi;
+  - COMPOSER_MEMORY_LIMIT=-1 composer update --prefer-dist --no-interaction $COMPOSER_FLAGS
+
+script:
+  - vendor/bin/phpunit -c phpunit.xml.dist

README.md

@@ -1,5 +1,7 @@
 # A SoftLayer API PHP client.
 
+[![Build Status](https://travis-ci.org/softlayer/softlayer-api-php-client.svg?branch=master)](https://travis-ci.org/softlayer/softlayer-api-php-client)
+
 ## Warning
 
 ```
@@ -24,8 +26,10 @@ Making API calls using the `\SoftLayer\SoapClient` is done in the following step
 
 Once your method is executed you may continue using the same client if you need to connect to the same service or define another client object if you wish to work with multiple services at once.
 
+
 The most up to date version of this library can be found on the SoftLayer github public repositories: [https://github.com/softlayer/softlayer-api-php-client](https://github.com/softlayer/softlayer-api-php-client) . Any issues using this library, please open a [Github Issue](https://github.com/softlayer/softlayer-api-php-client/issues)
 
+
 ## System Requirements
 
 The `\SoftLayer\SoapClient` class requires at least PHP 8.0.0 and the PHP SOAP enxtension installed and enabled (`extension=soap` in the php.ini file). 

composer.json

@@ -19,9 +19,21 @@
             "SoftLayer\\": "src/"
         }
     },
+    "autoload-dev": {
+        "psr-4": {
+            "SoftLayer\\Tests\\": "tests/"
+        }
+    },
     "extra": {
         "branch-alias": {
             "dev-master": "2.0.0"
+        },
+        "config": {
+            "sort-packages": true
         }
+    },
+    "require-dev": {
+        "friendsofphp/php-cs-fixer": ">=3.13.0",
+        "phpunit/phpunit": ">=9.0"
     }
 }