From 9b2dbbf4979292b4c8f595b0ea9f895e1c89aaab Mon Sep 17 00:00:00 2001
From: gloas <gloas@afi-sa.fr>
Date: Wed, 25 Apr 2018 13:43:21 +0200
Subject: [PATCH] dev #74650 fix errors + warnings
---
.../modules/admin/controllers/FileManagerControllerTest.php | 3 ++-
.../opac/controllers/BibNumeriqueControllerDilicomTest.php | 2 +-
.../modules/opac/controllers/JavaControllerTest.php | 2 +-
.../Class/Cosmogramme/Integration/PhaseNoticeTestCase.php | 2 +-
tests/scenarios/AdvancedSearch/AdminConfigurationTest.php | 2 +-
5 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/tests/application/modules/admin/controllers/FileManagerControllerTest.php b/tests/application/modules/admin/controllers/FileManagerControllerTest.php
index 49ba940bc00..ffbaa12ca8c 100644
--- a/tests/application/modules/admin/controllers/FileManagerControllerTest.php
+++ b/tests/application/modules/admin/controllers/FileManagerControllerTest.php
@@ -1668,6 +1668,7 @@ class FileManagerControllerFindTest extends ModelTestCase {
public function setUp() {
parent::setUp();
+ $this->old_server_name = $_SERVER['SERVER_NAME'];
$this->_initUrl();
$admin = $this->fixture('Class_Users',
['id' => 3,
@@ -1679,7 +1680,7 @@ class FileManagerControllerFindTest extends ModelTestCase {
public function tearDown() {
- $_SERVER['SERVER_NAME'] = null;
+ $_SERVER['SERVER_NAME'] = $this->old_server_name;
parent::tearDown();
}
diff --git a/tests/application/modules/opac/controllers/BibNumeriqueControllerDilicomTest.php b/tests/application/modules/opac/controllers/BibNumeriqueControllerDilicomTest.php
index 245c6e9b9f9..938c3280dde 100644
--- a/tests/application/modules/opac/controllers/BibNumeriqueControllerDilicomTest.php
+++ b/tests/application/modules/opac/controllers/BibNumeriqueControllerDilicomTest.php
@@ -319,7 +319,7 @@ class BibNumeriqueContollerDilicomConsultBookWithErrorsActionTest extends BibNum
-class BibNumeriqueControllerDilicomLoanBookActionTestCase extends BibNumeriqueContollerDilicomTestCase {
+abstract class BibNumeriqueControllerDilicomLoanBookActionTestCase extends BibNumeriqueContollerDilicomTestCase {
public function setUp() {
parent::setUp();
$_SERVER['HTTP_REFERER'] = '/viewnotice/id/3';
diff --git a/tests/application/modules/opac/controllers/JavaControllerTest.php b/tests/application/modules/opac/controllers/JavaControllerTest.php
index edc7e001f83..fa41dac57e3 100644
--- a/tests/application/modules/opac/controllers/JavaControllerTest.php
+++ b/tests/application/modules/opac/controllers/JavaControllerTest.php
@@ -57,7 +57,7 @@ class JavaControllerWidthDefaultKiosqueTest extends AbstractControllerTestCase {
-class JavaControllerCarrouselHorizontalTestCase extends AbstractControllerTestCase {
+abstract class JavaControllerCarrouselHorizontalTestCase extends AbstractControllerTestCase {
public function setUp() {
parent::setUp();
$this->fixture('Class_Profil',
diff --git a/tests/library/Class/Cosmogramme/Integration/PhaseNoticeTestCase.php b/tests/library/Class/Cosmogramme/Integration/PhaseNoticeTestCase.php
index 9e2ca79f859..79c5308835b 100644
--- a/tests/library/Class/Cosmogramme/Integration/PhaseNoticeTestCase.php
+++ b/tests/library/Class/Cosmogramme/Integration/PhaseNoticeTestCase.php
@@ -20,7 +20,7 @@
*/
-class PhaseNoticeTestCase extends Class_Cosmogramme_Integration_PhaseTestCase {
+abstract class PhaseNoticeTestCase extends Class_Cosmogramme_Integration_PhaseTestCase {
protected $_phase, $_service_runner;
public function setUp() {
diff --git a/tests/scenarios/AdvancedSearch/AdminConfigurationTest.php b/tests/scenarios/AdvancedSearch/AdminConfigurationTest.php
index 21672198670..ae828b91d92 100644
--- a/tests/scenarios/AdvancedSearch/AdminConfigurationTest.php
+++ b/tests/scenarios/AdvancedSearch/AdminConfigurationTest.php
@@ -51,7 +51,7 @@ class AdvancedSearch_AdminConfigurationUnactiveTest extends Admin_AbstractCont
-class AdvancedSearch_ActiveTestCase extends Admin_AbstractControllerTestCase {
+abstract class AdvancedSearch_ActiveTestCase extends Admin_AbstractControllerTestCase {
protected $_storm_default_to_volatile = true;
public function setUp() {
--
GitLab