Create constants for Mastodon notification types

[friendica.git] / src / Factory / SessionFactory.php

diff --git a/src/Factory/SessionFactory.php b/src/Factory/SessionFactory.php
index eb2371d452ce302e1e32f27abb7fe673dffdd225..491573033bd4b22994ddda1ce06381d47be5f199 100644 (file)
--- a/src/Factory/SessionFactory.php
+++ b/src/Factory/SessionFactory.php
@@ -1,11 +1,30 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Factory;
 
 use Friendica\App;
-use Friendica\Core\Cache\Cache;
 use Friendica\Core\Cache\ICache;
-use Friendica\Core\Config\Configuration;
+use Friendica\Core\Cache\Type;
+use Friendica\Core\Config\IConfig;
 use Friendica\Core\Session;
 use Friendica\Core\System;
 use Friendica\Database\Database;
@@ -29,7 +48,7 @@ class SessionFactory
        /**
         * @param App\Mode        $mode
         * @param App\BaseURL     $baseURL
-        * @param Configuration   $config
+        * @param IConfig         $config
         * @param Database        $dba
         * @param ICache          $cache
         * @param LoggerInterface $logger
@@ -37,9 +56,9 @@ class SessionFactory
         *
         * @return Session\ISession
         */
-       public function createSession(App\Mode $mode, App\BaseURL $baseURL, Configuration $config, Database $dba, ICache $cache, LoggerInterface $logger, Profiler $profiler, array $server = [])
+       public function createSession(App\Mode $mode, App\BaseURL $baseURL, IConfig $config, Database $dba, ICache $cache, LoggerInterface $logger, Profiler $profiler, array $server = [])
        {
-               $stamp1  = microtime(true);
+               $profiler->startRecording('session');
                $session = null;
 
                try {
@@ -55,10 +74,10 @@ class SessionFactory
                                                break;
                                        case self::HANDLER_CACHE:
                                                // In case we're using the db as cache driver, use the native db session, not the cache
-                                               if ($config->get('system', 'cache_driver') === Cache::TYPE_DATABASE) {
+                                               if ($config->get('system', 'cache_driver') === Type::DATABASE) {
                                                        $handler = new Session\Handler\Database($dba, $logger, $server);
                                                } else {
-                                                       $handler = new Session\Handler\Cache($cache, $logger, $server);
+                                                       $handler = new Session\Handler\Cache($cache);
                                                }
                                                break;
                                }
@@ -66,7 +85,7 @@ class SessionFactory
                                $session = new Session\Native($baseURL, $handler);
                        }
                } finally {
-                       $profiler->saveTimestamp($stamp1, 'parser', System::callstack());
+                       $profiler->stopRecording();
                        return $session;
                }
        }