Misc cleanups (#5417)

* Fixed http://github to https://github

Signed-off-by: Roland Häder <roland@mxchange.org>
* reverted back

Signed-off-by: Roland Häder <roland@mxchange.org>
* Added type-hint 'array' as the method uses foreach() on it.

Signed-off-by: Roland Häder <roland@mxchange.org>
* Tpzo fixed ...

Signed-off-by: Roland Häder <roland@mxchange.org>
* Added missing new-line at end of file, will make some POSIX parsers being lesser
confused ...

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/composer.lock b/composer.lock
index 5ba27098357010811ab370a8b0b68159404b2189..409deb2e8f8effd964fe9e3ff97fa55d9ab746c1 100644 (file)
--- a/composer.lock
+++ b/composer.lock
@@ -2297,6 +2297,53 @@
             ],
             "time": "2017-10-19T19:58:43+00:00"
         },
+        {
+            "name": "phar-io/version",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phar-io/version.git",
+                "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phar-io/version/zipball/a70c0ced4be299a63d32fa96d9281d03e94041df",
+                "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Arne Blankerts",
+                    "email": "arne@blankerts.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Heuer",
+                    "email": "sebastian@phpeople.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Library for handling version information and constraints",
+            "time": "2017-03-05T17:38:23+00:00"
+        },
         {
             "name": "phpdocumentor/reflection-common",
             "version": "1.0.1",
@@ -3052,7 +3099,7 @@
                 }
             ],
             "description": "Provides the functionality to compare PHP values for equality",
-            "homepage": "http://www.github.com/sebastianbergmann/comparator",
+            "homepage": "https://github.com/sebastianbergmann/comparator",
             "keywords": [
                 "comparator",
                 "compare",
@@ -3154,7 +3201,7 @@
                 }
             ],
             "description": "Provides functionality to handle HHVM/PHP environments",
-            "homepage": "http://www.github.com/sebastianbergmann/environment",
+            "homepage": "https://github.com/sebastianbergmann/environment",
             "keywords": [
                 "Xdebug",
                 "environment",
@@ -3222,7 +3269,7 @@
                 }
             ],
             "description": "Provides the functionality to export PHP variables for visualization",
-            "homepage": "http://www.github.com/sebastianbergmann/exporter",
+            "homepage": "https://github.com/sebastianbergmann/exporter",
             "keywords": [
                 "export",
                 "exporter"
@@ -3274,7 +3321,7 @@
                 }
             ],
             "description": "Snapshotting of global state",
-            "homepage": "http://www.github.com/sebastianbergmann/global-state",
+            "homepage": "https://github.com/sebastianbergmann/global-state",
             "keywords": [
                 "global state"
             ],
@@ -3376,7 +3423,7 @@
                 }
             ],
             "description": "Provides functionality to recursively process PHP variables",
-            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "homepage": "https://github.com/sebastianbergmann/recursion-context",
             "time": "2016-11-19T07:33:16+00:00"
         },
         {

diff --git a/config/addon-sample.ini.php b/config/addon-sample.ini.php
index 7d8054cd2ae1af39e5a4a122422a93bff5ace14e..2665412a553c49a01a2702bbb37707f4b044c14c 100644 (file)
--- a/config/addon-sample.ini.php
+++ b/config/addon-sample.ini.php
@@ -7,4 +7,4 @@
 ;consumersecret = mysqlusername
 
 INI;
-// Keep this line
\ No newline at end of file
+// Keep this line

diff --git a/config/config.ini.php b/config/config.ini.php
index 9808c970d247f0e87d99c7d577e0e2ed8ebe55bb..8274399843e14380216462f4234afb8d694fbb00 100644 (file)
--- a/config/config.ini.php
+++ b/config/config.ini.php
@@ -3,7 +3,7 @@
 ; CONFIG.INI.PHP
 
 ; This file declares the default values for the base config of Friendica.
-; These configuration values aren't accessible from the admin settings page and custom values must be set in config/loca.ini.php
+; These configuration values aren't accessible from the admin settings page and custom values must be set in config/local.ini.php
 
 ; Please don't edit this file directly as its content may change in the upcoming versions.
 
@@ -405,4 +405,4 @@ debug = false
 lockpath =
 
 INI;
-// Keep this line
\ No newline at end of file
+// Keep this line

diff --git a/config/local-sample.ini.php b/config/local-sample.ini.php
index 0e46f22f91b550261231b1962c4557e2d3b12f5e..359f3ee68d9133faa51bde1112a842bff617c26c 100644 (file)
--- a/config/local-sample.ini.php
+++ b/config/local-sample.ini.php
@@ -38,4 +38,4 @@ default_timezone = UTC
 language = en
 
 INI;
-// Keep this line
\ No newline at end of file
+// Keep this line

diff --git a/config/settings.ini.php b/config/settings.ini.php
index c3acdaa6de7e8d55216d650652101a2a8691c10b..3a30bc38698421314737448097fc5a1ffde48586 100644 (file)
--- a/config/settings.ini.php
+++ b/config/settings.ini.php
@@ -105,4 +105,4 @@ url =
 [featurelock]
 
 INI;
-// Keep this line
\ No newline at end of file
+// Keep this line

diff --git a/src/Core/NotificationsManager.php b/src/Core/NotificationsManager.php
index fa8476b906ac3e9dd5d11a2dd93ba9d8c006083d..6605abf79bf5245859fcc8674e19a987a796b98d 100644 (file)
--- a/src/Core/NotificationsManager.php
+++ b/src/Core/NotificationsManager.php
@@ -224,7 +224,7 @@ class NotificationsManager extends BaseObject
         *      string 'ago' => T relative date of the notification
         *      bool 'seen' => Is the notification marked as "seen"
         */
-       private function formatNotifs($notifs, $ident = "")
+       private function formatNotifs(array $notifs, $ident = "")
        {
                $notif = [];
                $arr = [];

diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index 58f099b832c3b9ee7949fd3451a835a7cd98684a..bd7ccf0086255e7f2d8b500cf9897f9698ac2de5 100644 (file)
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -29,12 +29,10 @@ function vier_init(App $a)
 
        $a->set_template_engine('smarty3');
 
-       if (!empty($a->argv[0])) {
-               if ($a->argv[0] . defaults($a->argv, 1, '') === "profile".$a->user['nickname'] || $a->argv[0] === "network" && local_user()) {
-                       vier_community_info();
+       if (!empty($a->argv[0]) && $a->argv[0] . defaults($a->argv, 1, '') === "profile".$a->user['nickname'] || $a->argv[0] === "network" && local_user()) {
+               vier_community_info();
 
-                       $a->page['htmlhead'] .= "<link rel='stylesheet' type='text/css' href='view/theme/vier/wide.css' media='screen and (min-width: 1300px)'/>\n";
-               }
+               $a->page['htmlhead'] .= "<link rel='stylesheet' type='text/css' href='view/theme/vier/wide.css' media='screen and (min-width: 1300px)'/>\n";
        }
 
        if ($a->is_mobile || $a->is_tablet) {