updating composer packages, related to #684

NatLibFi · Jan 12, 2018 · cb3abd4 · cb3abd4
1 parent d10c4f6
commit cb3abd4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/composer.json b/composer.json
@@ -8,11 +8,11 @@
       "type": "package",
       "package": {
         "name": "medialize/uri.js",
-        "version": "1.18.2",
+        "version": "1.19.0",
         "source": {
           "url": "https://github.com/medialize/URI.js.git",
           "type": "git",
-          "reference": "v1.18.2"
+          "reference": "v1.19.0"
         }
       }
     },
@@ -35,24 +35,23 @@
     "components/handlebars.js": "v4.0.11",
     "davidstutz/bootstrap-multiselect": "v0.9.13",
     "easyrdf/easyrdf": "0.10.0-alpha.1",
-    "twig/twig": "1.35.*",
+    "twig/twig": "2.4.*",
     "twig/extensions": "1.5.*",
-    "twitter/bootstrap": "3.2.*",
+    "twitter/bootstrap": "3.3.*",
     "twitter/typeahead.js": "v0.10.5",
-    "willdurand/negotiation": "1.5.*",
+    "willdurand/negotiation": "2.3.*",
     "vakata/jstree": "3.3.*",
     "punic/punic": "1.6.5",
     "ml/json-ld": "1.*",
-    "medialize/uri.js": "1.18.2",
+    "medialize/uri.js": "1.19.0",
     "ext-gettext": "*",
     "monolog/monolog": "1.23.*"
   },
   "require-dev": {
-    "phpunit/phpunit": "4.8 - 5.3.5",
-    "umpirsky/twig-gettext-extractor": "1.1.*",
-    "phpdocumentor/phpdocumentor": "2.*",
+    "phpunit/phpunit": "4.8 - 5.4.5",
+    "umpirsky/twig-gettext-extractor": "1.3.*",
     "codeclimate/php-test-reporter": "0.4.4",
-    "symfony/dom-crawler": "3.2.6",
+    "symfony/dom-crawler": "3.4.3",
     "mockery/mockery": "1.0.0-alpha1"
   },
   "autoload": {

diff --git a/controller/Controller.php b/controller/Controller.php
@@ -21,7 +21,7 @@ class Controller
     public function __construct($model)
     {
         $this->model = $model;
-        $this->negotiator = new \Negotiation\FormatNegotiator();
+        $this->negotiator = new \Negotiation\Negotiator();
 
         // Specify the location of the translation tables
         bindtextdomain('skosmos', 'resource/translations');

diff --git a/controller/RestController.php b/controller/RestController.php
@@ -30,7 +30,7 @@ private function returnJson($data)
         }
 
         // otherwise negotiate suitable format for the response and return that
-        $negotiator = new \Negotiation\FormatNegotiator();
+        $negotiator = new \Negotiation\Negotiator();
         $priorities = array('application/json', 'application/ld+json');
         $best = filter_input(INPUT_SERVER, 'HTTP_ACCEPT', FILTER_SANITIZE_STRING) ? $negotiator->getBest(filter_input(INPUT_SERVER, 'HTTP_ACCEPT', FILTER_SANITIZE_STRING), $priorities) : null;
         $format = ($best !== null) ? $best->getValue() : $priorities[0];