Browse Source

fix broken test for travis

pull/81/head
Chris 8 years ago
parent
commit
ff75f486de
  1. 2
      .travis.yml
  2. 9
      src/Bibliography.php

2
.travis.yml

@ -10,6 +10,6 @@ php:
script: script:
- curl -L -o reflectivedoc.php https://www.monperrus.net/martin/reflectivedoc.php.txt - curl -L -o reflectivedoc.php https://www.monperrus.net/martin/reflectivedoc.php.txt
- curl -L -o gakowiki-syntax.php https://www.monperrus.net/martin/gakowiki-syntax.php.txt - curl -L -o gakowiki-syntax.php https://www.monperrus.net/martin/gakowiki-syntax.php.txt
- phpunit bibtexbrowser-test.php
- phpunit tests/bibtexbrowser-test.php
sudo: false sudo: false

9
src/Bibliography.php

@ -12,16 +12,11 @@ class Bibliography
"library" => null, "library" => null,
"academic" => null); "academic" => null);
private $config = array();
public function __construct($userConfig = array()) public function __construct($userConfig = array())
{ {
// (PHP 5 >= 5.3.0, PHP 7) // (PHP 5 >= 5.3.0, PHP 7)
$this->config = array_replace($this->defaultConfig, $userConfig);
if (!isset($_GET['bib'])) {
$_GET['bib'] = $this->config['bib'];
}
// $userConfig precedent over defaultConfig; $_GET over $userConfig
$_GET = array_replace($this->defaultConfig, $userConfig, $_GET);
} }
public function print() public function print()

Loading…
Cancel
Save