Move APIs into separate package

Signed-off-by: Yoshi2889 <rick.2889@gmail.com>
WildPHP · Jan 4, 2016 · f83ddb6 · f83ddb6
1 parent 49b8a9d
commit f83ddb6
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 249 deletions.
diff --git a/composer.json b/composer.json
@@ -1,15 +1,14 @@
+
 {
     "name": "wildphp/wild-irc-bot",
-    "version": "2.0.2",
+    "version": "2.0.3",
     "description": "A modular IRC bot written in PHP",
     "type": "project",
     "require": {
         "php": ">=5.5.0",
         "myclabs/php-enum": "^1.4",
-        "react/react": "^0.4.2",
-        "guzzlehttp/guzzle": "^6.1",
-        "wildphp/module-channelmanager": "^2.1",
-        "wildphp/module-linksniffer": "^2.0"
+        "react/react": "^0.4",
+        "wildphp/api": "*"
     },
     "require-dev":
     {

diff --git a/lib/WildPHP/API/Remote.php b/lib/WildPHP/API/Remote.php
diff --git a/lib/WildPHP/API/ShortenUri.php b/lib/WildPHP/API/ShortenUri.php
diff --git a/lib/WildPHP/Exceptions/InvalidUriException.php b/lib/WildPHP/Exceptions/InvalidUriException.php
diff --git a/lib/WildPHP/Exceptions/ShortUriCreationFailedException.php b/lib/WildPHP/Exceptions/ShortUriCreationFailedException.php
diff --git a/lib/WildPHP/Validation.php b/lib/WildPHP/Validation.php
@@ -19,35 +19,20 @@
 */
 
 namespace WildPHP;
+use WildPHP\API\Validation as NewValidationClass;
 
 /**
- * Validation class, with shortcuts for validating items.
+ * Wrapper for new validation class.
  */
 class Validation
 {
-	/**
-	 * Checks if a channel name conforms to RFC2812's grammar rules.
-	 *
-	 * @param string $chan The channel name to check.
-	 * @return bool
-	 */
 	public static function isChannel($chan)
 	{
-		$pmatch = preg_match('/^(?:\&|\#|\+|\!)[^,\cG ]+$/', $chan);
-
-		return $pmatch !== 0 && $pmatch !== false;
+		return NewValidationClass::isChannel($chan);
 	}
 
-	/**
-	 * Checks if a nickname conforms to RFC2812's grammar rules.
-	 *
-	 * @param string $nick The nickname to check.
-	 * @return bool
-	 */
 	public static function isNickname($nick)
 	{
-		$pmatch = preg_match("/^[^@\n\r ]+$/", $nick);
-
-		return $pmatch !== 0 && $pmatch !== false;
+		return NewValidationClass::isNickname($nick);
 	}
 }