Updated TLS.php and added new endpoints to new ZoneSettings.php

.gitignore

@@ -0,0 +1 @@
+/vendor/

.php_cs

@@ -0,0 +1,15 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->in(__DIR__ . '/src')
+    ->in(__DIR__ . '/tests')
+;
+
+return PhpCsFixer\Config::create()
+    ->setUsingCache(false)
+    ->setRules([
+        '@PSR2' => true,
+        'array_syntax' => ['syntax' => 'short'],
+    ])
+    ->setFinder($finder)
+;

.travis.yml

@@ -0,0 +1,15 @@
+language: php
+
+php:
+    - 7.0
+    - 7.1
+
+before_install:
+    - composer self-update
+
+install:
+    - travis_retry composer install --no-interaction --prefer-source
+
+script:
+    - make lint
+    - make test

src/Endpoints/TLS.php

@@ -67,6 +67,7 @@ class TLS implements API
 
         return false;
     }
+<<<<<<< HEAD
     public function getHTTPSRedirectStatus($zoneID) {
         $return = $this->adapter->get(
             'zones/' . $zoneID . '/settings/always_use_https'
@@ -121,4 +122,6 @@ class TLS implements API
 
         return false;
     }
+=======
+>>>>>>> 4694904b38fdf5f251559a473cecf77a63cf9202
 }