[Scummvm-git-logs] scummvm-web master -> c8fbbe8380def1ff0dcf5eae339994df903e5213

Mataniko mataniko at gmail.com
Thu Jan 23 14:01:11 UTC 2020


This automated email contains information about 2 new commits which have been
pushed to the 'scummvm-web' repo located at https://github.com/scummvm/scummvm-web .

Summary:
123d23c0ae BUILD: Update dependencies
c8fbbe8380 WEB: Fix static call to non-static method error.


Commit: 123d23c0ae62456984875e6c56e289153910192f
    https://github.com/scummvm/scummvm-web/commit/123d23c0ae62456984875e6c56e289153910192f
Author: mataniko (mataniko at gmail.com)
Date: 2020-01-23T07:26:16-05:00

Commit Message:
BUILD: Update dependencies

Changed paths:
    composer.json
    composer.lock


diff --git a/composer.json b/composer.json
index 8232ae5..4f82e96 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
     "leafo/scssphp": "^0.7.6",
     "smarty/smarty": "^3.1",
     "ezyang/htmlpurifier": "^4.10",
-    "altorouter/altorouter": "^1.2",
+    "altorouter/altorouter": "^2.0",
     "piwik/device-detector": "^3.11",
     "spatie/yaml-front-matter": "^2.0",
     "erusev/parsedown": "^1.7"
diff --git a/composer.lock b/composer.lock
index 1509889..ec1be46 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,28 +4,29 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "23f0c96f79020b14929e1fc8ea5eb4eb",
+    "content-hash": "4523386343e66e910174c22bec49e0df",
     "packages": [
         {
             "name": "altorouter/altorouter",
-            "version": "v1.2.0",
+            "version": "2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dannyvankooten/AltoRouter.git",
-                "reference": "39c50092470128c12284d332bb57f306bb5b58e4"
+                "reference": "127f6e96998708a31ef32252985bea82e3b03888"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dannyvankooten/AltoRouter/zipball/39c50092470128c12284d332bb57f306bb5b58e4",
-                "reference": "39c50092470128c12284d332bb57f306bb5b58e4",
+                "url": "https://api.github.com/repos/dannyvankooten/AltoRouter/zipball/127f6e96998708a31ef32252985bea82e3b03888",
+                "reference": "127f6e96998708a31ef32252985bea82e3b03888",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "php": ">=5.6.0"
             },
             "require-dev": {
                 "codeclimate/php-test-reporter": "dev-master",
-                "phpunit/phpunit": "4.5.*"
+                "phpunit/phpunit": "5.7.*",
+                "squizlabs/php_codesniffer": "3.4.2"
             },
             "type": "library",
             "autoload": {
@@ -59,7 +60,7 @@
                 "router",
                 "routing"
             ],
-            "time": "2015-11-30T00:47:43+00:00"
+            "time": "2019-11-23T11:01:41+00:00"
         },
         {
             "name": "erusev/parsedown",


Commit: c8fbbe8380def1ff0dcf5eae339994df903e5213
    https://github.com/scummvm/scummvm-web/commit/c8fbbe8380def1ff0dcf5eae339994df903e5213
Author: mataniko (mataniko at gmail.com)
Date: 2020-01-23T07:26:43-05:00

Commit Message:
WEB: Fix static call to non-static method error.

Changed paths:
    include/Models/DownloadsModel.php


diff --git a/include/Models/DownloadsModel.php b/include/Models/DownloadsModel.php
index 74aeb8f..9b5277c 100644
--- a/include/Models/DownloadsModel.php
+++ b/include/Models/DownloadsModel.php
@@ -59,7 +59,7 @@ abstract class DownloadsModel
     }
 
     /* Get the recommended download */
-    public function getRecommendedDownload()
+    public static function getRecommendedDownload()
     {
         if (!isset($_SERVER['HTTP_USER_AGENT'])) {
             return false;




More information about the Scummvm-git-logs mailing list