Merge branch '4.x' into develop

Author: daftspunk

composer.json

@@ -19,11 +19,12 @@
         "composer/installers": "^1 || ^2",
         "doctrine/dbal": "^2.13.3|^3.1.4",
         "intervention/image": "^3.10",
+        "jaybizzle/crawler-detect": "^1.3",
         "linkorb/jsmin-php": "~1.0",
         "wikimedia/less.php": "~5.2",
         "scssphp/scssphp": "~1.0",
         "symfony/yaml": "^6.0",
-        "twig/twig": "~3.0",
+        "twig/twig": "^3.21",
         "league/csv": "~9.1",
         "laravel/tinker": "~2.0"
     },

src/Html/UrlServiceProvider.php

@@ -15,9 +15,10 @@ class UrlServiceProvider extends ServiceProvider
      */
     public function register()
     {
+        $this->registerRelativeHelpers();
+        $this->registerRequestHelpers();
+
         $this->registerUrlGeneratorPolicy();
-        $this->registerRelativeHelper();
-        $this->registerPjaxCached();
 
         $this->app['events']->listen('site.changed', function() {
             $this->registerUrlGeneratorPolicy();
@@ -32,7 +33,7 @@ public function register()
      * insecure - detect hostname and force HTTP schema
      * force    - force hostname and schema using app.url config value
      */
-    public function registerUrlGeneratorPolicy()
+    protected function registerUrlGeneratorPolicy()
     {
         $provider = $this->app['url'];
         $policy = $this->app['config']->get('system.link_policy', 'detect');
@@ -62,9 +63,9 @@ public function registerUrlGeneratorPolicy()
     }
 
     /**
-     * registerRelativeHelper
+     * registerRelativeHelpers
      */
-    public function registerRelativeHelper()
+    protected function registerRelativeHelpers()
     {
         $provider = $this->app['url'];
 
@@ -82,14 +83,20 @@ public function registerRelativeHelper()
     }
 
     /**
-     * registerPjaxCached
+     * registerRequestHelpers
      */
-    public function registerPjaxCached()
+    protected function registerRequestHelpers()
     {
         $provider = $this->app['request'];
 
         $provider->macro('pjaxCached', function() use ($provider) {
             return $provider->headers->get('X-PJAX-CACHED') == true;
         });
+
+        $provider->macro('isCrawler', function($userAgent = null) use ($provider) {
+            return (new \Jaybizzle\CrawlerDetect\CrawlerDetect($provider->server()))
+                ->isCrawler($userAgent)
+            ;
+        });
     }
 }