Replace Logger:: with logger property

[friendica.git] / src / Model / Contact.php

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 1221261c87ebe5ed8fd21fad3a190b061083987d..8d7799f636eb60a6d9f665f2237af835e3ffe879 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -57,36 +57,6 @@ class Contact
        const DEFAULT_AVATAR_THUMB = '/images/person-80.jpg';
        const DEFAULT_AVATAR_MICRO = '/images/person-48.jpg';
 
-       /**
-        * @deprecated since version 2019.03
-        * @see User::PAGE_FLAGS_NORMAL
-        */
-       const PAGE_NORMAL    = User::PAGE_FLAGS_NORMAL;
-       /**
-        * @deprecated since version 2019.03
-        * @see User::PAGE_FLAGS_SOAPBOX
-        */
-       const PAGE_SOAPBOX   = User::PAGE_FLAGS_SOAPBOX;
-       /**
-        * @deprecated since version 2019.03
-        * @see User::PAGE_FLAGS_COMMUNITY
-        */
-       const PAGE_COMMUNITY = User::PAGE_FLAGS_COMMUNITY;
-       /**
-        * @deprecated since version 2019.03
-        * @see User::PAGE_FLAGS_FREELOVE
-        */
-       const PAGE_FREELOVE  = User::PAGE_FLAGS_FREELOVE;
-       /**
-        * @deprecated since version 2019.03
-        * @see User::PAGE_FLAGS_BLOG
-        */
-       const PAGE_BLOG      = User::PAGE_FLAGS_BLOG;
-       /**
-        * @deprecated since version 2019.03
-        * @see User::PAGE_FLAGS_PRVGROUP
-        */
-       const PAGE_PRVGROUP  = User::PAGE_FLAGS_PRVGROUP;
        /**
         * @}
         */
@@ -2409,7 +2379,7 @@ class Contact
                }
 
                if (($network != '') && ($ret['network'] != $network)) {
-                       Logger::log('Expected network ' . $network . ' does not match actual network ' . $ret['network']);
+                       Logger::notice('Expected network ' . $network . ' does not match actual network ' . $ret['network']);
                        return $result;
                }
 
@@ -2559,7 +2529,7 @@ class Contact
                                }
                        } elseif ($protocol == Protocol::DIASPORA) {
                                $ret = Diaspora::sendShare($owner, $contact);
-                               Logger::log('share returns: ' . $ret);
+                               Logger::notice('share returns: ' . $ret);
                        } elseif ($protocol == Protocol::ACTIVITYPUB) {
                                $activity_id = ActivityPub\Transmitter::activityIDFromContact($contact_id);
                                if (empty($activity_id)) {
@@ -2568,7 +2538,7 @@ class Contact
                                }
 
                                $ret = ActivityPub\Transmitter::sendActivity('Follow', $contact['url'], $uid, $activity_id);
-                               Logger::log('Follow returns: ' . $ret);
+                               Logger::notice('Follow returns: ' . $ret);
                        }
                }
 
@@ -2686,7 +2656,7 @@ class Contact
                } else {
                        // send email notification to owner?
                        if (DBA::exists('contact', ['nurl' => Strings::normaliseLink($url), 'uid' => $importer['uid'], 'pending' => true])) {
-                               Logger::log('ignoring duplicated connection request from pending contact ' . $url);
+                               Logger::notice('ignoring duplicated connection request from pending contact ' . $url);
                                return null;
                        }
 
@@ -2806,7 +2776,7 @@ class Contact
                $contacts = DBA::select('contact', ['id', 'uid', 'name', 'url', 'bd'], $condition);
 
                while ($contact = DBA::fetch($contacts)) {
-                       Logger::log('update_contact_birthday: ' . $contact['bd']);
+                       Logger::notice('update_contact_birthday: ' . $contact['bd']);
 
                        $nextbd = DateTimeFormat::utcNow('Y') . substr($contact['bd'], 4);