7.0.0

.gitignore

@@ -1,3 +1,4 @@
 composer.lock
 phpunit.xml
 vendor
+.idea

CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 7.0.0 (released 2017-xx-xx)
+
+- ...
+
 ## 6.1.2 (released 2016-12-28)
 
 - Added wkhtmltopdf detection

CONTRIBUTING.md

@@ -10,7 +10,6 @@ Contributions are welcome, and are accepted via pull requests. Please review the
 * Send a coherent commit history, making sure each individual commit in your pull request is meaningful. If you had to make multiple intermediate commits while developing, please [squash](http://git-scm.com/book/en/Git-Tools-Rewriting-History) them before submitting.
 * You may also need to [rebase](http://git-scm.com/book/en/Git-Branching-Rebasing) to avoid merge conflicts.
 
-
 ## Running Tests
 
 You will need an install of [Composer](https://getcomposer.org) before continuing.

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013-2017 Chris Schuld <[email protected]>
+Copyright (c) 2013-present Chris Schuld <[email protected]>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

README.md

@@ -51,16 +51,13 @@ The Browser class allows you to detect a user's browser and version.
  * Lynx
  * Safari
  * Chrome
- * Navigator
- * GoogleBot
- * Yahoo! Slurp
- * W3C Validator
+ * Android Navigator
+ * UC Browser
  * BlackBerry
  * IceCat
  * Nokia S60 OSS Browser
  * Nokia Browser
  * MSN Browser
- * MSN Bot
  * Netscape Navigator
  * Galeon
  * NetPositive
@@ -69,14 +66,16 @@ The Browser class allows you to detect a user's browser and version.
  * Yandex Browser
  * Comodo Dragon
  * Samsung Browser
- * wkhtmltopdf
 
 ### Usage
 
 ```php
 use Sinergi\BrowserDetector\Browser;
 
-$browser = new Browser();
+$browser = new Browser();  
+
+//You can also provide a userAgent string if you don't wish to detect the current browser
+//$browser = new Browser("Mozilla/5.0 (Windows NT 10.0; WOW64; rv:40.0) Gecko/20100101 Firefox/40.0");
 
 if ($browser->getName() === Browser::IE && $browser->getVersion() < 11) {
     echo 'Please upgrade your browser.';
@@ -97,6 +96,92 @@ if ($browser->getName() === Browser::IE && $browser->isCompatibilityMode()) {
 }
 ```
 
+## Scripted Agent Detection
+
+The ScriptedAgent class allows you to detect scripted agents (bots, spiders, tools)
+
+### Scripted Agents Detected
+
+Spiders
+
+ * GoogleBot
+ * Baidu
+ * Bing
+ * MSN
+ * Yahoo! Slurp
+ * W3C Spiders
+ * Yandex
+ * Apple
+ * Paper.li
+ * Majestic12
+ * Livelap
+ * Scoop.it
+ * Who.is
+ * Proximic
+
+Web Surveys
+
+ * Ahrefs
+ * MetaURI
+ * Netcraft
+ * Browsershots
+ * MageReport
+ * SocialRank.io
+ * Gluten Free
+ * Ubermetrics
+ * Verisign IPS-Agent
+
+Exploits
+
+ * ShellShock
+
+Web Preview bots
+
+ * ICQ
+ * Google Web
+ * Facebook
+ * Bing
+ * Twitter
+ * Skype
+
+Tools
+
+ * wkHTMLtoPDF
+ * W3C Validator
+ * WebDAV
+ * TLSProbe
+ * Wget
+ * Zgrab
+
+Generic
+
+ * Google Favicon
+ * Curl
+ * Python
+ * GoLang
+ * Perl
+ * Java
+
+Ad bots
+
+ * Google
+ * Microsoft
+ * AdBeat
+
+### Usage
+
+```php
+use Sinergi\BrowserDetector\Browser;
+
+$browser = new Browser();
+
+$scriptedAgent = $browser->detectScriptedAgent();
+if ($scriptedAgent!==false)
+{
+    die("Detected ".$scriptedAgent->getName()." which is a ".$scriptedAgent->getType().". Info: ".$scriptedAgent->getInfoURL());
+}
+```
+
 ## OS Detection
 
 The OS class allows you to detect a user's operating system and version.