Permalink
Browse files

Allow newer sf versions

  • Loading branch information...
flack committed Jul 12, 2018
1 parent 2b4a93c commit 0a8a156c2ff4ac1be27cebafdf94f14e013f1f72
Showing with 14 additions and 14 deletions.
  1. +12 −12 composer.json
  2. +2 −2 src/midcom/datamanager/engine.php
View
@@ -39,18 +39,18 @@
"simplepie/simplepie": "^1.5",
"studio-42/elfinder": ">= 2.1.31",
"swiftmailer/swiftmailer": "^5.2.0",
"symfony/config": "~2.5 | ~3.4",
"symfony/css-selector": "~2.6 | ~3.4",
"symfony/dom-crawler": "~2.6 | ~3.4",
"symfony/event-dispatcher": "~3.4",
"symfony/finder": "~2.8 | ~3.4",
"symfony/form": "~3.4",
"symfony/http-foundation": "~2.8.29 | ~3.4",
"symfony/intl": "~3.4",
"symfony/options-resolver": "~3.4",
"symfony/security-csrf": "~2.5 | ~3.4",
"symfony/translation": "~2.3 | ~3.4",
"symfony/validator": "~2.8 | ~3.4"
"symfony/config": "~2.5 | ~3.4 | ^4.0",
"symfony/css-selector": "~2.6 | ~3.4 | ^4.0",
"symfony/dom-crawler": "~2.6 | ~3.4 | ^4.0",
"symfony/event-dispatcher": "~3.4 | ^4.0",
"symfony/finder": "~2.8 | ~3.4 | ^4.0",
"symfony/form": "~3.4 | ^4.0",
"symfony/http-foundation": "~2.8.29 | ~3.4 | ^4.0",
"symfony/intl": "~3.4 | ^4.0",
"symfony/options-resolver": "~3.4 | ^4.0",
"symfony/security-csrf": "~2.5 | ~3.4 | ^4.0",
"symfony/translation": "~2.3 | ~3.4 | ^4.0",
"symfony/validator": "~2.8 | ~3.4 | ^4.0"
},
"scripts": {
"post-install-cmd": [
@@ -22,11 +22,11 @@ public function renderBlock(FormView $view, $resource, $blockName, array $variab
return $resource->$blockName($view, $data);
}
public function setTheme(FormView $view, $themes)
public function setTheme(FormView $view, $themes, $useDefaultThemes = true)
{
$this->themes = [];
$this->resources = [];
parent::setTheme($view, $themes);
parent::setTheme($view, $themes, $useDefaultThemes);
}
/**

0 comments on commit 0a8a156

Please sign in to comment.