Skip to content

Commit

Permalink
update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
dbu committed Jan 12, 2024
1 parent f876aa3 commit 838101c
Show file tree
Hide file tree
Showing 12 changed files with 14 additions and 22 deletions.
10 changes: 7 additions & 3 deletions .github/workflows/test-application.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ jobs:
test:
name: "PHP ${{ matrix.php-version }}, Symfony ${{ matrix.symfony-version }}"
runs-on: "ubuntu-20.04"
env:
SYMFONY_REQUIRE: ${{matrix.symfony-require}}

strategy:
fail-fast: false
Expand Down Expand Up @@ -47,11 +49,13 @@ jobs:
extensions: "pdo, pdo_sqlite"
tools: "composer:v2"

- name: "Require Specific Symfony Version"
- name: "Require specific symfony version"
if: "${{ matrix.symfony-version }}"
run: "composer require --no-update symfony/symfony:${{ matrix.symfony-version }}"
run: |
composer require --no-update symfony/flex
composer config --no-plugins allow-plugins.symfony/flex true
- name: "Require Additional dependencies"
- name: "Require additional dependencies"
if: "${{ matrix.composer-require }}"
run: "composer require --no-update ${{ matrix.composer-require }}"

Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ Changelog
The configuration of metadata_cache_driver changed. By default, it creates an `array` cache.
To configure a service, specify `type: service` and specify your service in the `id` property.
To use a cache pool, specify the service id of that pool.
* Removed support for namespace alias, use the FQN names.
* Introduced the ManagerRegistryInterface for the ManagerRegistry and adjusted the service alias for autowiring to the interface.
* The following container parameters are no longer taken into account (memcache and apc seem to have never been used anyways).
If you have customised the array cache class, please check if this is still needed - and note that starting from this version,
Expand All @@ -27,6 +28,7 @@ Changelog
doctrine_phpcr.odm.cache.memcached_port
doctrine_phpcr.odm.cache.memcached_instance.class
doctrine_phpcr.odm.cache.xcache.class

* If no username is defined for a session, and if you use Jackalope >= 2.0, the
credentials service for this session is no longer created and `null` is
passed as credentials.
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@
},
"require-dev": {
"doctrine/doctrine-bundle": "^2.0.3",
"doctrine/phpcr-odm": "^2.0",
"doctrine/phpcr-odm": "2.x-dev",
"doctrine/orm": "^2.0 || ^3.0",
"jackalope/jackalope-doctrine-dbal": "^2.0",
"matthiasnoback/symfony-dependency-injection-test": "^4.1",
"matthiasnoback/symfony-dependency-injection-test": "^4.3.1 || ^5.0",
"symfony/asset": "^5.4 || ^6.0 || ^7.0",
"symfony/browser-kit": "^5.4 || ^6.0 || ^7.0",
"symfony/css-selector": "^5.4 || ^6.0 || ^7.0",
"symfony/error-handler": "^4.4 || ^5.0 || ^6.0",
"symfony/error-handler": "^5.4 || ^6.0 || ^7.0",
"symfony/form": "^5.4 || ^6.0 || ^7.0",
"symfony/monolog-bridge": "^5.4 || ^6.0 || ^7.0",
"symfony/monolog-bundle": "^3.4",
Expand Down
1 change: 0 additions & 1 deletion src/DependencyInjection/Configuration.php
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,6 @@ private function getOdmDocumentManagersNode(): NodeDefinition
->scalarNode('mapping')->defaultValue(true)->end()
->scalarNode('type')->end()
->scalarNode('dir')->end()
->scalarNode('alias')->end()
->scalarNode('prefix')->end()
->booleanNode('is_bundle')->end()
->end()
Expand Down
5 changes: 1 addition & 4 deletions src/DependencyInjection/DoctrinePHPCRExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -500,9 +500,8 @@ private function loadOdmDocumentManager(array $documentManager, ContainerBuilder

private function loadOdmDocumentManagerMappingInformation(array $documentManager, Definition $odmConfig, ContainerBuilder $container): void
{
// reset state of drivers and alias map. They are only used by this methods and children.
// reset state of drivers map. It is only used by this methods and children.
$this->drivers = [];
$this->aliasMap = [];

if (!class_exists(Generic::class)) {
throw new \RuntimeException('PHPCR ODM is activated in the config but does not seem loadable.');
Expand All @@ -519,8 +518,6 @@ private function loadOdmDocumentManagerMappingInformation(array $documentManager
];
$this->loadMappingInformation($documentManager, $container);
$this->registerMappingDrivers($documentManager, $container);

$odmConfig->addMethodCall('setDocumentNamespaces', [$this->aliasMap]);
}

/**
Expand Down
3 changes: 0 additions & 3 deletions tests/Fixtures/App/DataFixtures/PHPCR/LoadData.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@

class LoadData implements FixtureInterface
{
/**
* @param DocumentManager $manager
*/
public function load(ObjectManager $manager): void
{
$base = new Generic();
Expand Down
3 changes: 0 additions & 3 deletions tests/Fixtures/App/Document/TestDocument.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
use Doctrine\Common\Collections\Collection;
use Doctrine\ODM\PHPCR\Mapping\Attributes as PHPCR;

/**
* @PHPCR\Document(referenceable=true)
*/
#[PHPCR\Document(referenceable: true)]
class TestDocument
{
Expand Down
2 changes: 1 addition & 1 deletion tests/Fixtures/App/Kernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public function registerBundles(): iterable
}
}

public function registerContainerConfiguration(LoaderInterface $loader)
public function registerContainerConfiguration(LoaderInterface $loader): void
{
$loader->load(__DIR__.'/config/config.php');
}
Expand Down
1 change: 0 additions & 1 deletion tests/Fixtures/fixtures/config/single.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
'mapping' => true,
'type' => null,
'dir' => null,
'alias' => null,
'prefix' => null,
'is-bundle' => null,
],
Expand Down
1 change: 0 additions & 1 deletion tests/Fixtures/fixtures/config/single.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
mapping="true"
type="null"
dir="null"
alias="null"
prefix="null"
is-bundle="null"
/>
Expand Down
1 change: 0 additions & 1 deletion tests/Fixtures/fixtures/config/single.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ doctrine_phpcr:
mapping: true
type: ~
dir: ~
alias: ~
prefix: ~
is_bundle: ~
auto_generate_proxy_classes: true
Expand Down
1 change: 0 additions & 1 deletion tests/Unit/DependencyInjection/ConfigurationTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ public function configurations(): array
'mapping' => true,
'type' => null,
'dir' => null,
'alias' => null,
'prefix' => null,
'is_bundle' => true,
],
Expand Down

0 comments on commit 838101c

Please sign in to comment.