Backport subdomain validation

VERSION

@@ -1 +1 @@
-1.2.1
+1.2.2

src/Zendesk/API/Client.php

@@ -2,6 +2,8 @@
 
 namespace Zendesk\API;
 
+use InvalidArgumentException;
+
     /*
      * Dead simple autoloader:
      * spl_autoload_register(function($c){@include 'src/'.preg_replace('#\\\|_(?!.+\\\)#','/',$c).'.php';});
@@ -263,6 +265,9 @@ public function __construct($subdomain, $username, $scheme = "https", $hostname
         if (empty($subdomain)) {
             $this->apiUrl = "$scheme://$hostname:$port/api/{$this->apiVer}/";
         } else {
+            if (! preg_match('/^[A-Za-z0-9](?:[A-Za-z0-9\-]{0,61}[A-Za-z0-9])?$/', $subdomain)) {
+                throw new InvalidArgumentException('Invalid Zendesk subdomain.');
+            }
             $this->apiUrl = "$scheme://$subdomain.$hostname:$port/api/{$this->apiVer}/";
         }
 

tests/Zendesk/API/UnitTests/GroupMembershipsTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Zendesk\API\LiveTests;
+namespace Zendesk\API\UnitTests;
 
 use Zendesk\API\Client;
 

tests/Zendesk/API/UnitTests/InvalidSubdomainTest.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Zendesk\API\UnitTests;
+
+use Zendesk\API\Client;
+use InvalidArgumentException;
+
+/**
+ * InvalidSubdomain test class
+ */
+class InvalidSubdomainTest extends BasicTest
+{
+    public function testInvalidSubdomainThrows()
+    {
+        $this->setExpectedException('InvalidArgumentException');
+
+        new Client('...', '');
+    }
+
+    public function testValidSubdomain()
+    {
+        new Client('zendesk.example.com', 'example');
+        $this->assertTrue(true);
+    }
+}

tests/Zendesk/API/UnitTests/OrganizationsTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Zendesk\API\LiveTests;
+namespace Zendesk\API\UnitTests;
 
 use Zendesk\API\Client;