Merge pull request #4074 from MrPetovan/task/update-composer

Update Composer
2017-12-16 04:08:37 +01:00 · 2017-12-16 04:08:37 +01:00 · f415ee64e7
commit f415ee64e7
parent a3ea106662 90f4aa36b6
9 changed files with 131 additions and 82 deletions
--- a/composer.lock
+++ b/composer.lock
@ -161,23 +161,23 @@
        },
        {
            "name": "mobiledetect/mobiledetectlib",
-            "version": "2.8.26",
+            "version": "2.8.28",
            "source": {
                "type": "git",
                "url": "https://github.com/serbanghita/Mobile-Detect.git",
-                "reference": "a0ed86c9d7c04ae27fa6418b55e3beb04dfe3297"
+                "reference": "65cd802dad5e85cb8f0ab1ba54ae5fdca765062b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/a0ed86c9d7c04ae27fa6418b55e3beb04dfe3297",
-                "reference": "a0ed86c9d7c04ae27fa6418b55e3beb04dfe3297",
+                "url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/65cd802dad5e85cb8f0ab1ba54ae5fdca765062b",
+                "reference": "65cd802dad5e85cb8f0ab1ba54ae5fdca765062b",
                "shasum": ""
            },
            "require": {
                "php": ">=5.0.0"
            },
            "require-dev": {
-                "phpunit/phpunit": "*"
+                "phpunit/phpunit": "~4.8|5.7"
            },
            "type": "library",
            "autoload": {
@ -209,7 +209,7 @@
                "mobile detector",
                "php mobile detect"
            ],
-            "time": "2017-08-29T18:23:54+00:00"
+            "time": "2017-12-09T09:59:47+00:00"
        },
        {
            "name": "paragonie/random_compat",
--- a/util/composer.phar
+++ b/util/composer.phar
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@ -10,7 +10,9 @@ return array(
    'Console_Getopt' => $vendorDir . '/pear-pear.php.net/Console_Getopt/Console/Getopt.php',
    'Detection\\MobileDetect' => $vendorDir . '/mobiledetect/mobiledetectlib/namespaced/Detection/MobileDetect.php',
    'Friendica\\App' => $baseDir . '/src/App.php',
+    'Friendica\\BaseModule' => $baseDir . '/src/BaseModule.php',
    'Friendica\\BaseObject' => $baseDir . '/src/BaseObject.php',
+    'Friendica\\Content\\Feature' => $baseDir . '/src/Content/Feature.php',
    'Friendica\\Content\\ForumManager' => $baseDir . '/src/Content/ForumManager.php',
    'Friendica\\Content\\Smilies' => $baseDir . '/src/Content/Smilies.php',
    'Friendica\\Core\\Cache' => $baseDir . '/src/Core/Cache.php',
@ -20,8 +22,16 @@ return array(
    'Friendica\\Core\\System' => $baseDir . '/src/Core/System.php',
    'Friendica\\Core\\Worker' => $baseDir . '/src/Core/Worker.php',
    'Friendica\\Database\\DBM' => $baseDir . '/src/Database/DBM.php',
-    'Friendica\\Model\\GlobalContact' => $baseDir . '/src/Model/GlobalContact.php',
+    'Friendica\\Database\\DBStructure' => $baseDir . '/src/Database/DBStructure.php',
+    'Friendica\\Model\\Contact' => $baseDir . '/src/Model/Contact.php',
+    'Friendica\\Model\\GContact' => $baseDir . '/src/Model/GContact.php',
+    'Friendica\\Model\\Group' => $baseDir . '/src/Model/Group.php',
+    'Friendica\\Model\\Photo' => $baseDir . '/src/Model/Photo.php',
+    'Friendica\\Model\\Profile' => $baseDir . '/src/Model/Profile.php',
    'Friendica\\Model\\User' => $baseDir . '/src/Model/User.php',
+    'Friendica\\Module\\Login' => $baseDir . '/src/Module/Login.php',
+    'Friendica\\Network\\FKOAuth1' => $baseDir . '/src/Network/FKOAuth1.php',
+    'Friendica\\Network\\FKOAuthDataStore' => $baseDir . '/src/Network/FKOAuthDataStore.php',
    'Friendica\\Network\\HTTPException' => $baseDir . '/src/Network/HTTPException.php',
    'Friendica\\Network\\HTTPException\\BadGatewayException' => $baseDir . '/src/Network/HTTPException/BadGatewayException.php',
    'Friendica\\Network\\HTTPException\\BadRequestException' => $baseDir . '/src/Network/HTTPException/BadRequestException.php',
@ -44,19 +54,23 @@ return array(
    'Friendica\\Network\\HTTPException\\UnprocessableEntityException' => $baseDir . '/src/Network/HTTPException/UnprocessableEntityException.php',
    'Friendica\\Network\\HTTPException\\UnsupportedMediaTypeException' => $baseDir . '/src/Network/HTTPException/UnsupportedMediaTypeException.php',
    'Friendica\\Network\\Probe' => $baseDir . '/src/Network/Probe.php',
-    'Friendica\\Object\\Contact' => $baseDir . '/src/Object/Contact.php',
-    'Friendica\\Object\\Conversation' => $baseDir . '/src/Object/Conversation.php',
-    'Friendica\\Object\\Item' => $baseDir . '/src/Object/Item.php',
-    'Friendica\\Object\\Profile' => $baseDir . '/src/Object/Profile.php',
+    'Friendica\\Object\\Image' => $baseDir . '/src/Object/Image.php',
+    'Friendica\\Object\\Post' => $baseDir . '/src/Object/Post.php',
+    'Friendica\\Object\\Thread' => $baseDir . '/src/Object/Thread.php',
    'Friendica\\ParseUrl' => $baseDir . '/src/ParseUrl.php',
    'Friendica\\Protocol\\DFRN' => $baseDir . '/src/Protocol/DFRN.php',
    'Friendica\\Protocol\\Diaspora' => $baseDir . '/src/Protocol/Diaspora.php',
+    'Friendica\\Protocol\\Email' => $baseDir . '/src/Protocol/Email.php',
+    'Friendica\\Protocol\\Feed' => $baseDir . '/src/Protocol/Feed.php',
    'Friendica\\Protocol\\OStatus' => $baseDir . '/src/Protocol/OStatus.php',
    'Friendica\\Protocol\\PortableContact' => $baseDir . '/src/Protocol/PortableContact.php',
+    'Friendica\\Protocol\\Salmon' => $baseDir . '/src/Protocol/Salmon.php',
    'Friendica\\Render\\ITemplateEngine' => $baseDir . '/src/Render/ITemplateEngine.php',
    'Friendica\\Util\\Emailer' => $baseDir . '/src/Util/Emailer.php',
    'Friendica\\Util\\ExAuth' => $baseDir . '/src/Util/ExAuth.php',
    'Friendica\\Util\\Lock' => $baseDir . '/src/Util/Lock.php',
+    'Friendica\\Util\\Map' => $baseDir . '/src/Util/Map.php',
+    'Friendica\\Util\\Pidfile' => $baseDir . '/src/Util/Pidfile.php',
    'Friendica\\Util\\XML' => $baseDir . '/src/Util/XML.php',
    'Friendica\\Worker\\CheckVersion' => $baseDir . '/src/Worker/CheckVersion.php',
    'Friendica\\Worker\\CreateShadowEntry' => $baseDir . '/src/Worker/CreateShadowEntry.php',
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@ -63,7 +63,9 @@ class ComposerStaticInitFriendica
        'Console_Getopt' => __DIR__ . '/..' . '/pear-pear.php.net/Console_Getopt/Console/Getopt.php',
        'Detection\\MobileDetect' => __DIR__ . '/..' . '/mobiledetect/mobiledetectlib/namespaced/Detection/MobileDetect.php',
        'Friendica\\App' => __DIR__ . '/../..' . '/src/App.php',
+        'Friendica\\BaseModule' => __DIR__ . '/../..' . '/src/BaseModule.php',
        'Friendica\\BaseObject' => __DIR__ . '/../..' . '/src/BaseObject.php',
+        'Friendica\\Content\\Feature' => __DIR__ . '/../..' . '/src/Content/Feature.php',
        'Friendica\\Content\\ForumManager' => __DIR__ . '/../..' . '/src/Content/ForumManager.php',
        'Friendica\\Content\\Smilies' => __DIR__ . '/../..' . '/src/Content/Smilies.php',
        'Friendica\\Core\\Cache' => __DIR__ . '/../..' . '/src/Core/Cache.php',
@ -73,8 +75,16 @@ class ComposerStaticInitFriendica
        'Friendica\\Core\\System' => __DIR__ . '/../..' . '/src/Core/System.php',
        'Friendica\\Core\\Worker' => __DIR__ . '/../..' . '/src/Core/Worker.php',
        'Friendica\\Database\\DBM' => __DIR__ . '/../..' . '/src/Database/DBM.php',
-        'Friendica\\Model\\GlobalContact' => __DIR__ . '/../..' . '/src/Model/GlobalContact.php',
+        'Friendica\\Database\\DBStructure' => __DIR__ . '/../..' . '/src/Database/DBStructure.php',
+        'Friendica\\Model\\Contact' => __DIR__ . '/../..' . '/src/Model/Contact.php',
+        'Friendica\\Model\\GContact' => __DIR__ . '/../..' . '/src/Model/GContact.php',
+        'Friendica\\Model\\Group' => __DIR__ . '/../..' . '/src/Model/Group.php',
+        'Friendica\\Model\\Photo' => __DIR__ . '/../..' . '/src/Model/Photo.php',
+        'Friendica\\Model\\Profile' => __DIR__ . '/../..' . '/src/Model/Profile.php',
        'Friendica\\Model\\User' => __DIR__ . '/../..' . '/src/Model/User.php',
+        'Friendica\\Module\\Login' => __DIR__ . '/../..' . '/src/Module/Login.php',
+        'Friendica\\Network\\FKOAuth1' => __DIR__ . '/../..' . '/src/Network/FKOAuth1.php',
+        'Friendica\\Network\\FKOAuthDataStore' => __DIR__ . '/../..' . '/src/Network/FKOAuthDataStore.php',
        'Friendica\\Network\\HTTPException' => __DIR__ . '/../..' . '/src/Network/HTTPException.php',
        'Friendica\\Network\\HTTPException\\BadGatewayException' => __DIR__ . '/../..' . '/src/Network/HTTPException/BadGatewayException.php',
        'Friendica\\Network\\HTTPException\\BadRequestException' => __DIR__ . '/../..' . '/src/Network/HTTPException/BadRequestException.php',
@ -97,19 +107,23 @@ class ComposerStaticInitFriendica
        'Friendica\\Network\\HTTPException\\UnprocessableEntityException' => __DIR__ . '/../..' . '/src/Network/HTTPException/UnprocessableEntityException.php',
        'Friendica\\Network\\HTTPException\\UnsupportedMediaTypeException' => __DIR__ . '/../..' . '/src/Network/HTTPException/UnsupportedMediaTypeException.php',
        'Friendica\\Network\\Probe' => __DIR__ . '/../..' . '/src/Network/Probe.php',
-        'Friendica\\Object\\Contact' => __DIR__ . '/../..' . '/src/Object/Contact.php',
-        'Friendica\\Object\\Conversation' => __DIR__ . '/../..' . '/src/Object/Conversation.php',
-        'Friendica\\Object\\Item' => __DIR__ . '/../..' . '/src/Object/Item.php',
-        'Friendica\\Object\\Profile' => __DIR__ . '/../..' . '/src/Object/Profile.php',
+        'Friendica\\Object\\Image' => __DIR__ . '/../..' . '/src/Object/Image.php',
+        'Friendica\\Object\\Post' => __DIR__ . '/../..' . '/src/Object/Post.php',
+        'Friendica\\Object\\Thread' => __DIR__ . '/../..' . '/src/Object/Thread.php',
        'Friendica\\ParseUrl' => __DIR__ . '/../..' . '/src/ParseUrl.php',
        'Friendica\\Protocol\\DFRN' => __DIR__ . '/../..' . '/src/Protocol/DFRN.php',
        'Friendica\\Protocol\\Diaspora' => __DIR__ . '/../..' . '/src/Protocol/Diaspora.php',
+        'Friendica\\Protocol\\Email' => __DIR__ . '/../..' . '/src/Protocol/Email.php',
+        'Friendica\\Protocol\\Feed' => __DIR__ . '/../..' . '/src/Protocol/Feed.php',
        'Friendica\\Protocol\\OStatus' => __DIR__ . '/../..' . '/src/Protocol/OStatus.php',
        'Friendica\\Protocol\\PortableContact' => __DIR__ . '/../..' . '/src/Protocol/PortableContact.php',
+        'Friendica\\Protocol\\Salmon' => __DIR__ . '/../..' . '/src/Protocol/Salmon.php',
        'Friendica\\Render\\ITemplateEngine' => __DIR__ . '/../..' . '/src/Render/ITemplateEngine.php',
        'Friendica\\Util\\Emailer' => __DIR__ . '/../..' . '/src/Util/Emailer.php',
        'Friendica\\Util\\ExAuth' => __DIR__ . '/../..' . '/src/Util/ExAuth.php',
        'Friendica\\Util\\Lock' => __DIR__ . '/../..' . '/src/Util/Lock.php',
+        'Friendica\\Util\\Map' => __DIR__ . '/../..' . '/src/Util/Map.php',
+        'Friendica\\Util\\Pidfile' => __DIR__ . '/../..' . '/src/Util/Pidfile.php',
        'Friendica\\Util\\XML' => __DIR__ . '/../..' . '/src/Util/XML.php',
        'Friendica\\Worker\\CheckVersion' => __DIR__ . '/../..' . '/src/Worker/CheckVersion.php',
        'Friendica\\Worker\\CreateShadowEntry' => __DIR__ . '/../..' . '/src/Worker/CreateShadowEntry.php',
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@ -239,60 +239,6 @@
            "markdown"
        ]
    },
-    {
-        "name": "mobiledetect/mobiledetectlib",
-        "version": "2.8.26",
-        "version_normalized": "2.8.26.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/serbanghita/Mobile-Detect.git",
-            "reference": "a0ed86c9d7c04ae27fa6418b55e3beb04dfe3297"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/a0ed86c9d7c04ae27fa6418b55e3beb04dfe3297",
-            "reference": "a0ed86c9d7c04ae27fa6418b55e3beb04dfe3297",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.0.0"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "*"
-        },
-        "time": "2017-08-29T18:23:54+00:00",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "classmap": [
-                "Mobile_Detect.php"
-            ],
-            "psr-0": {
-                "Detection": "namespaced/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Serban Ghita",
-                "email": "serbanghita@gmail.com",
-                "homepage": "http://mobiledetect.net",
-                "role": "Developer"
-            }
-        ],
-        "description": "Mobile_Detect is a lightweight PHP class for detecting mobile devices. It uses the User-Agent string combined with specific HTTP headers to detect the mobile environment.",
-        "homepage": "https://github.com/serbanghita/Mobile-Detect",
-        "keywords": [
-            "detect mobile devices",
-            "mobile",
-            "mobile detect",
-            "mobile detector",
-            "php mobile detect"
-        ]
-    },
    {
        "name": "pear-pear.php.net/XML_Util",
        "version": "1.4.3",
@ -539,5 +485,59 @@
            "pseudorandom",
            "random"
        ]
+    },
+    {
+        "name": "mobiledetect/mobiledetectlib",
+        "version": "2.8.28",
+        "version_normalized": "2.8.28.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/serbanghita/Mobile-Detect.git",
+            "reference": "65cd802dad5e85cb8f0ab1ba54ae5fdca765062b"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/65cd802dad5e85cb8f0ab1ba54ae5fdca765062b",
+            "reference": "65cd802dad5e85cb8f0ab1ba54ae5fdca765062b",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.0.0"
+        },
+        "require-dev": {
+            "phpunit/phpunit": "~4.8|5.7"
+        },
+        "time": "2017-12-09T09:59:47+00:00",
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "classmap": [
+                "Mobile_Detect.php"
+            ],
+            "psr-0": {
+                "Detection": "namespaced/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Serban Ghita",
+                "email": "serbanghita@gmail.com",
+                "homepage": "http://mobiledetect.net",
+                "role": "Developer"
+            }
+        ],
+        "description": "Mobile_Detect is a lightweight PHP class for detecting mobile devices. It uses the User-Agent string combined with specific HTTP headers to detect the mobile environment.",
+        "homepage": "https://github.com/serbanghita/Mobile-Detect",
+        "keywords": [
+            "detect mobile devices",
+            "mobile",
+            "mobile detect",
+            "mobile detector",
+            "php mobile detect"
+        ]
    }
 ]
--- a/vendor/mobiledetect/mobiledetectlib/Mobile_Detect.json
+++ b/vendor/mobiledetect/mobiledetectlib/Mobile_Detect.json
--- a/vendor/mobiledetect/mobiledetectlib/Mobile_Detect.php
+++ b/vendor/mobiledetect/mobiledetectlib/Mobile_Detect.php
--- a/vendor/mobiledetect/mobiledetectlib/README.md
+++ b/vendor/mobiledetect/mobiledetectlib/README.md
@ -7,6 +7,9 @@
 [![Total Downloads](https://poser.pugx.org/mobiledetect/mobiledetectlib/downloads.svg)](https://packagist.org/packages/mobiledetect/mobiledetectlib) 
 [![Daily Downloads](https://poser.pugx.org/mobiledetect/mobiledetectlib/d/daily.png)](https://packagist.org/packages/mobiledetect/mobiledetectlib) 
 [![License](https://poser.pugx.org/mobiledetect/mobiledetectlib/license.svg)](https://packagist.org/packages/mobiledetect/mobiledetectlib)
+[![Chat on Slack](https://img.shields.io/badge/Slack%20%23general-join-orange.svg)](https://mobiledetect.slack.com)
+
+

 *Mobile_Detect is a lightweight PHP class for detecting mobile devices (including tablets).
 It uses the User-Agent string combined with specific HTTP headers to detect the mobile environment.*
@ -154,6 +157,9 @@ is included in the default package since 1.5.x.
 additional functionality. 
 Made by [Jens Segers](https://github.com/jenssegers).

+* [Laravel Mobile Detect](https://github.com/riverskies/laravel-mobile-detect) is a package that enables you to use device detection right in your Laravel Blade templates. (Utilises the well-known, constantly updated PHP mobile detection library.)
+Made by [Barnabas Kecskes](https://github.com/barnabaskecskes).
+
 * [BrowserDetect](https://github.com/hisorange/browser-detect) is a browser and mobile detection package, collects 
 and wrap together the best user-agent identifiers for Laravel. 
 Created by [Varga Zsolt](https://github.com/hisorange).
@ -281,3 +287,8 @@ Made by [https://github.com/Shaked](Shaked).
 * [ua-lua](https://github.com/robinef/ua-lua) is a small lib written in LUA providing device type detection. 
 ua-lua is detecting mobile or tablet devices based on user-agent inside nginx daemon. 
 Made by [Frédéric Robinet](https://github.com/robinef).
+
+**.Net**
+
+* [mobile-detect](https://github.com/validide/mobile-detect) is a .Net partial port written in C#. 
+Made by [Valentin Dide](https://github.com/validide).
--- a/vendor/mobiledetect/mobiledetectlib/composer.json
+++ b/vendor/mobiledetect/mobiledetectlib/composer.json
@ -17,7 +17,7 @@
        "php": ">=5.0.0"
    },
    "require-dev": {
-        "phpunit/phpunit": "*"
+        "phpunit/phpunit": "~4.8|5.7"
    },
    "autoload": {
        "classmap": ["Mobile_Detect.php"],