From 6b73026194caf596ae759cff2cf902380beb9466 Mon Sep 17 00:00:00 2001
From: Pierre Rudloff <contact@rudloff.pro>
Date: Tue, 5 Dec 2017 14:37:23 +0100
Subject: [PATCH] Fix cookie settings in tests

---
 classes/LocaleManager.php   | 1 -
 tests/LocaleManagerTest.php | 2 +-
 tests/bootstrap.php         | 2 ++
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/classes/LocaleManager.php b/classes/LocaleManager.php
index 73e9a6f..e220674 100644
--- a/classes/LocaleManager.php
+++ b/classes/LocaleManager.php
@@ -42,7 +42,6 @@ class LocaleManager
     {
         $session_factory = new \Aura\Session\SessionFactory();
         $session = $session_factory->newInstance($cookies);
-        $session->setCookieParams(['httponly' => true]);
         $this->sessionSegment = $session->getSegment('Alltube\LocaleManager');
         $cookieLocale = $this->sessionSegment->get('locale');
         if (isset($cookieLocale)) {
diff --git a/tests/LocaleManagerTest.php b/tests/LocaleManagerTest.php
index 0e88239..ae9cb14 100644
--- a/tests/LocaleManagerTest.php
+++ b/tests/LocaleManagerTest.php
@@ -27,6 +27,7 @@ class LocaleManagerTest extends TestCase
     protected function setUp()
     {
         $this->localeManager = new LocaleManager();
+        $_SESSION['Alltube\LocaleManager']['locale'] = 'foo_BAR';
     }
 
     /**
@@ -36,7 +37,6 @@ class LocaleManagerTest extends TestCase
      */
     public function testConstructorWithCookies()
     {
-        $_SESSION['Alltube\LocaleManager']['locale'] = 'foo_BAR';
         $localeManager = new LocaleManager([]);
         $this->assertEquals('foo_BAR', (string) $localeManager->getLocale());
     }
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 634e02a..44bb21f 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -9,6 +9,8 @@ use Alltube\PlaylistArchiveStream;
  */
 require_once __DIR__.'/../vendor/autoload.php';
 
+ini_set('session.use_cookies', 0);
+session_cache_limiter('');
 session_start();
 
 stream_wrapper_register('playlist', PlaylistArchiveStream::class);