Merge remote-tracking branch 'origin/master' into styler

Conflicts:
	lib/exe/css.php

2 files changed, 53 insertions, 53 deletions

diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php
index 5e1469e83..4e05d3b15 100644
--- a/vendor/composer/ClassLoader.php
+++ b/vendor/composer/ClassLoader.php
@@ -351,7 +351,7 @@ class ClassLoader
             foreach ($this->prefixLengthsPsr4[$first] as $prefix => $length) {
                 if (0 === strpos($class, $prefix)) {
                     foreach ($this->prefixDirsPsr4[$prefix] as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
+                        if (is_file($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
                             return $file;
                         }
                     }
@@ -361,7 +361,7 @@ class ClassLoader
 
         // PSR-4 fallback dirs
         foreach ($this->fallbackDirsPsr4 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+            if (is_file($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
                 return $file;
             }
         }
@@ -380,7 +380,7 @@ class ClassLoader
             foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
                 if (0 === strpos($class, $prefix)) {
                     foreach ($dirs as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                        if (is_file($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
                             return $file;
                         }
                     }
@@ -390,7 +390,7 @@ class ClassLoader
 
         // PSR-0 fallback dirs
         foreach ($this->fallbackDirsPsr0 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+            if (is_file($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
                 return $file;
             }
         }
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index a9eb3f9ee..9b20b8a09 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1,99 +1,99 @@
 [
     {
-        "name": "splitbrain/php-archive",
-        "version": "1.0.0",
-        "version_normalized": "1.0.0.0",
+        "name": "easybook/geshi",
+        "version": "v1.0.8.15",
+        "version_normalized": "1.0.8.15",
         "source": {
             "type": "git",
-            "url": "https://github.com/splitbrain/php-archive.git",
-            "reference": "a0fbfc2f85ed491f3d2af42cff48a9cb783a8549"
+            "url": "https://github.com/easybook/geshi.git",
+            "reference": "54387de80bc7ee50397ffae39234626a48d2d45f"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/splitbrain/php-archive/zipball/a0fbfc2f85ed491f3d2af42cff48a9cb783a8549",
-            "reference": "a0fbfc2f85ed491f3d2af42cff48a9cb783a8549",
+            "url": "https://api.github.com/repos/easybook/geshi/zipball/54387de80bc7ee50397ffae39234626a48d2d45f",
+            "reference": "54387de80bc7ee50397ffae39234626a48d2d45f",
             "shasum": ""
         },
         "require": {
-            "php": ">=5.3.0"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "4.5.*"
+            "php": ">4.3.0"
         },
-        "time": "2015-02-25 20:15:02",
+        "time": "2015-06-18 14:56:28",
         "type": "library",
         "installation-source": "dist",
         "autoload": {
-            "psr-4": {
-                "splitbrain\\PHPArchive\\": "src"
-            }
+            "classmap": [
+                "./"
+            ]
         },
         "notification-url": "https://packagist.org/downloads/",
         "license": [
-            "MIT"
+            "GPL-2.0"
         ],
         "authors": [
             {
-                "name": "Andreas Gohr",
-                "email": "andi@splitbrain.org"
+                "name": "Nigel McNie",
+                "email": "nigel@geshi.org"
+            },
+            {
+                "name": "Benny Baumann",
+                "email": "BenBE@geshi.org"
             }
         ],
-        "description": "Pure-PHP implementation to read and write TAR and ZIP archives",
+        "description": "GeSHi - Generic Syntax Highlighter. This is an unmodified port of GeSHi project code found on SourceForge.",
+        "homepage": "http://qbnz.com/highlighter",
         "keywords": [
-            "archive",
-            "extract",
-            "tar",
-            "unpack",
-            "unzip",
-            "zip"
+            "highlight",
+            "highlighter",
+            "syntax"
         ]
     },
     {
-        "name": "easybook/geshi",
-        "version": "v1.0.8.14",
-        "version_normalized": "1.0.8.14",
+        "name": "splitbrain/php-archive",
+        "version": "1.0.4",
+        "version_normalized": "1.0.4.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/easybook/geshi.git",
-            "reference": "af589a67bf308791bb13e54bddd9aa3544b7dff8"
+            "url": "https://github.com/splitbrain/php-archive.git",
+            "reference": "6572e78ef9d064eeb5c74d4ffe61b473a4996b68"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/easybook/geshi/zipball/af589a67bf308791bb13e54bddd9aa3544b7dff8",
-            "reference": "af589a67bf308791bb13e54bddd9aa3544b7dff8",
+            "url": "https://api.github.com/repos/splitbrain/php-archive/zipball/6572e78ef9d064eeb5c74d4ffe61b473a4996b68",
+            "reference": "6572e78ef9d064eeb5c74d4ffe61b473a4996b68",
             "shasum": ""
         },
         "require": {
-            "php": ">4.3.0"
+            "php": ">=5.3.0"
         },
-        "time": "2015-04-15 13:21:45",
+        "require-dev": {
+            "phpunit/phpunit": "4.5.*"
+        },
+        "time": "2015-07-24 11:36:49",
         "type": "library",
         "installation-source": "dist",
         "autoload": {
-            "classmap": [
-                "./"
-            ]
+            "psr-4": {
+                "splitbrain\\PHPArchive\\": "src"
+            }
         },
         "notification-url": "https://packagist.org/downloads/",
         "license": [
-            "GPL-2.0"
+            "MIT"
         ],
         "authors": [
             {
-                "name": "Nigel McNie",
-                "email": "nigel@geshi.org"
-            },
-            {
-                "name": "Benny Baumann",
-                "email": "BenBE@geshi.org"
+                "name": "Andreas Gohr",
+                "email": "andi@splitbrain.org"
             }
         ],
-        "description": "GeSHi - Generic Syntax Highlighter. This is an unmodified port of GeSHi project code found on SourceForge.",
-        "homepage": "http://qbnz.com/highlighter",
+        "description": "Pure-PHP implementation to read and write TAR and ZIP archives",
         "keywords": [
-            "highlight",
-            "highlighter",
-            "syntax"
+            "archive",
+            "extract",
+            "tar",
+            "unpack",
+            "unzip",
+            "zip"
         ]
     }
 ]