Skip to content

Commit a85155d

Browse files
committed
Fix symfony routing issues
1 parent 637dc1e commit a85155d

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

composer.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@
1717
],
1818
"require": {
1919
"php": "^7.1",
20-
"illuminate/container": "^5.7|^5.8|^6.0|^7.0",
21-
"illuminate/database": "^5.7|^5.8|^6.0|^7.0",
22-
"illuminate/log": "^5.7|^5.8|^6.0|^7.0",
23-
"illuminate/routing": "^5.7|^5.8|^6.0|^7.0",
24-
"illuminate/support": "^5.7|^5.8|^6.0|^7.0",
20+
"illuminate/container": "^6.0|^7.0",
21+
"illuminate/database": "^6.0|^7.0",
22+
"illuminate/log": "^6.0|^7.0",
23+
"illuminate/routing": "^6.0|^7.0",
24+
"illuminate/support": "^6.0|^7.0",
2525
"willdurand/email-reply-parser": "^2.8",
2626
"zbateson/mail-mime-parser": "^1.1"
2727
},
2828
"require-dev": {
2929
"mockery/mockery": "^1.2",
30-
"orchestra/testbench": "^3.7|^3.8|^4.0|^5.0",
30+
"orchestra/testbench": "^4.0|^5.0",
3131
"phpunit/phpunit": "^7.0|^8.0",
3232
"zendframework/zend-mail": "^2.10"
3333
},

phpunit.xml.dist

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
<log type="coverage-clover" target="build/logs/clover.xml"/>
2828
</logging>
2929
<php>
30+
<env name="MAIL_MAILER" value="log"/>
3031
<env name="DB_CONNECTION" value="testing"/>
3132
</php>
3233
</phpunit>

src/Concerns/HandlesRegularExpressions.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ protected function getRegularExpression(): string
2424

2525
$regex = $route->compile()->getRegex();
2626

27-
$regex = preg_replace('/^#\^\/(.*)/', '#^$1', $regex);
27+
$regex = preg_replace('/^{\^\/(.*)/', '{^$1', $regex);
2828

2929
$regex = str_replace('>[^/]+)', '>.+)', $regex);
3030

31-
$regex = str_replace('$#sD', '$#sDi', $regex);
31+
$regex = str_replace('$}sD', '$}sDi', $regex);
3232

3333
return $regex;
3434
}

0 commit comments

Comments
 (0)