Skip to content

Commit

Permalink
Merge pull request #11356 from creative-commoners/pulls/6/symfony7
Browse files Browse the repository at this point in the history
DEP Upgrade to symfony 7
  • Loading branch information
GuySartorelli authored Sep 3, 2024
2 parents 2b139b2 + ec2bcfd commit 1a53bc1
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 13 deletions.
23 changes: 11 additions & 12 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,16 @@
"silverstripe/assets": "^3",
"silverstripe/vendor-plugin": "^2",
"sminnee/callbacklist": "^0.1.1",
"symfony/cache": "^6.1",
"symfony/config": "^6.1",
"symfony/dom-crawler": "^6.1",
"symfony/filesystem": "^6.1",
"symfony/http-foundation": "^6.1",
"symfony/mailer": "^6.1",
"symfony/mime": "^6.1",
"symfony/translation": "^6.1",
"symfony/validator": "^6.1",
"symfony/yaml": "^6.1",
"symfony/cache": "^7.0",
"symfony/config": "^7.0",
"symfony/dom-crawler": "^7.0",
"symfony/filesystem": "^7.0",
"symfony/http-foundation": "^7.0",
"symfony/mailer": "^7.0",
"symfony/mime": "^7.0",
"symfony/translation": "^7.0",
"symfony/validator": "^7.0",
"symfony/yaml": "^7.0",
"ext-ctype": "*",
"ext-dom": "*",
"ext-hash": "*",
Expand All @@ -71,8 +71,7 @@
},
"conflict": {
"egulias/email-validator": "^2",
"oscarotero/html-parser": "<0.1.7",
"symfony/process": "<5.3.7"
"oscarotero/html-parser": "<0.1.7"
},
"provide": {
"psr/container-implementation": "1.0.0"
Expand Down
2 changes: 1 addition & 1 deletion tests/php/View/SSViewerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -679,7 +679,7 @@ public function testLoopWhitespace()
$ItemOnItsOwnLine
<% end_loop %>
after',
$data
$data
)
);

Expand Down

0 comments on commit 1a53bc1

Please sign in to comment.