Skip to content

Allow doctrine-bundle 2 in dev requirements #3032

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 30, 2022
Merged

Allow doctrine-bundle 2 in dev requirements #3032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7cd6d74
Allow doctrine-bundle 2 in dev requirements
stof Jan 14, 2022
2b85970
Fix the skipping check in MailerTest
stof Jan 14, 2022
e68ac62
Skip the bcrypt encoder test on Symfony 5
stof Jan 14, 2022
1770765
Avoid using the buggy 3.5.0 version of php-cs-fixer
stof Jan 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions Tests/Mailer/MailerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,14 @@
use PHPUnit\Framework\TestCase;
use Swift_Mailer;
use Swift_Transport_NullTransport;
use Symfony\Component\Templating\EngineInterface;

class MailerTest extends TestCase
{
protected function setUp()
{
// skip test for Symfony > 5
if (!interface_exists(EngineInterface::class)) {
$this->markTestSkipped(sprintf('%s class not exists', EngineInterface::class));
if (!interface_exists('Symfony\Bundle\FrameworkBundle\Templating\EngineInterface')) {
$this->markTestSkipped('Symfony\Bundle\FrameworkBundle\Templating\EngineInterface class not exists');
}
}

Expand Down
4 changes: 4 additions & 0 deletions Tests/Util/PasswordUpdaterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ public function testUpdatePassword()

public function testUpdatePasswordWithBCrypt()
{
if (!class_exists('Symfony\Component\Security\Core\Encoder\BCryptPasswordEncoder')) {
$this->markTestSkipped('This test requires Symfony 4');
}

$encoder = $this->getMockBuilder('Symfony\Component\Security\Core\Encoder\BCryptPasswordEncoder')
->disableOriginalConstructor()
->getMock();
Expand Down
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
"symfony/doctrine-bridge": "<4.4"
},
"require-dev": {
"doctrine/doctrine-bundle": "^1.3",
"friendsofphp/php-cs-fixer": "^3.0.2",
"doctrine/doctrine-bundle": "^1.3 || ^2",
"friendsofphp/php-cs-fixer": "^3.0.2, !=3.5.0",
"swiftmailer/swiftmailer": "^4.3 || ^5.0 || ^6.0",
"symfony/console": "^4.4 || ^5.0",
"symfony/phpunit-bridge": "^5.3",
Expand Down