Skip to content
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

Support PHP 8.0 and doctrine/mongodb-odm-bundle #168

Merged
merged 2 commits into from
Oct 17, 2021
Merged

Support PHP 8.0 and doctrine/mongodb-odm-bundle #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
020d315
Revert "Remove dependencies not compatible with PHP 8"
alexislefebvre Jan 25, 2021
f8c2931
Merge branch 'master' into support-php-8.0-and-doctrine/mongodb-odm-b…
theofidry Sep 26, 2021
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
6 changes: 0 additions & 6 deletions .github/workflows/tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,5 @@ jobs:
dependency-versions: ${{ matrix.dependencies }}
composer-options: "--prefer-dist --prefer-stable"

- name: Remove dependencies not compatible with PHP 8
if: matrix.php-version == '8.0'
run: |
cd vendor-bin/proxy-manager && composer remove --dev --no-update doctrine/mongodb-odm-bundle && cd -
cd vendor-bin/symfony && composer remove --dev --no-update doctrine/mongodb-odm-bundle && cd -
- name: Run Tests
run: make start_databases && make test
5 changes: 1 addition & 4 deletions fixtures/Bridge/Symfony/SymfonyApp/DoctrineMongodbKernel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,13 @@ public function registerBundles()
new FrameworkBundle(),
new NelmioAliceBundle(),
new FidryAliceDataFixturesBundle(),
new DoctrineMongoDBBundle(),
];

if (class_exists(PsyshBundle::class)) {
$bundles[] = new PsyshBundle();
}

if (class_exists(DoctrineMongoDBBundle::class)) {
$bundles[] = new DoctrineMongoDBBundle();
}

return $bundles;
}

Expand Down
5 changes: 0 additions & 5 deletions tests/Bridge/Symfony/Doctrine/MongodbLoaderIntegrationTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

namespace Fidry\AlicePersistence\Bridge\Symfony\Doctrine;

use Doctrine\Bundle\MongoDBBundle\DoctrineMongoDBBundle;
use Doctrine\Common\DataFixtures\Purger\MongoDBPurger;
use Doctrine\Persistence\ManagerRegistry;
use Fidry\AliceDataFixtures\Bridge\Symfony\MongoDocument\Dummy;
Expand Down Expand Up @@ -65,10 +64,6 @@ public static function setUpBeforeClass(): void
*/
public function setUp(): void
{
if (!class_exists(DoctrineMongoDBBundle::class)) {
$this->markTestSkipped('Need doctrine/mongodb-odm-bundle package.');
}

$this->kernel = new DoctrineMongodbKernel(static::$seed, true);
$this->kernel->boot();

Expand Down