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

Bump dependencies #1093

Merged
merged 4 commits into from
Oct 12, 2021
Merged

Bump dependencies #1093

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
ad45694
Bump constraints
theofidry Oct 12, 2021
7d18a20
Bump other deps
theofidry Oct 12, 2021
9b76bd2
Fix Symfony tests
theofidry Oct 12, 2021
1638bd5
Adjust CI
theofidry Oct 12, 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
18 changes: 4 additions & 14 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,33 +12,23 @@ jobs:
fail-fast: false
matrix:
php:
- '7.3'
- '7.4'
- '8.0'
- '8.1'
symfony-versions: [false]
include:
- description: 'Symfony 3.4'
php: '7.4'
symfony-versions: 3.4.*
- description: 'Symfony 4.4'
php: '7.4'
symfony-versions: 4.4.*
- description: 'Symfony 5.0'
php: '7.4'
symfony-versions: 5.0.*
- description: 'Symfony 5.2'
- description: 'Symfony 5.3'
php: '7.4'
symfony-versions: 5.2.*
symfony-versions: 5.3.*
- description: 'Symfony 4.4'
php: '8.0'
symfony-versions: 4.4.*
- description: 'Symfony 5.0'
php: '8.0'
symfony-versions: 5.0.*
- description: 'Symfony 5.2'
- description: 'Symfony 5.3'
php: '8.0'
symfony-versions: 5.2.*
symfony-versions: 5.3.*

name: PHP ${{ matrix.php }} ${{ matrix.description }}
steps:
Expand Down
14 changes: 7 additions & 7 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,23 +20,23 @@
],

"require": {
"php": "^7.3 || ^8.0",
"php": "^7.4 || ^8.0",
"fakerphp/faker": "^1.10",
"myclabs/deep-copy": "^1.10",
"sebastian/comparator": "^3.0 || ^4.0",
"symfony/property-access": "^2.8 || ^3.4 || ^4.0 || ^5.0",
"symfony/yaml": "^2.8 || ^3.4 || ^4.0 || ^5.0"
"symfony/property-access": "^4.4 || ^5.2",
"symfony/yaml": "^4.4 || ^5.2"
},
"require-dev": {
"bamarni/composer-bin-plugin": "^1.1.0",
"bamarni/composer-bin-plugin": "^1.4.1",
"phpspec/prophecy": "^1.6",
"phpspec/prophecy-phpunit": "^2.0",
"phpunit/phpunit": "^8.5.4 || ^9.3",
"phpunit/phpunit": "^9.3",
"symfony/phpunit-bridge": "^5.1.3",
"symfony/var-dumper": "^3.4 || ^4.0 || ^5.0"
"symfony/var-dumper": "^4.4 || ^5.2"
},
"conflict": {
"symfony/framework-bundle": "<3.4"
"symfony/framework-bundle": "<4.4 || >=5.0.0,<5.2.0"
},

"autoload": {
Expand Down
8 changes: 1 addition & 7 deletions fixtures/Bridge/Symfony/Application/AppKernel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,7 @@ public function registerBundles()

public function registerContainerConfiguration(LoaderInterface $loader): void
{
if (3 === self::MAJOR_VERSION) {
$config = $this->config ?? (__DIR__.'/config_34.yml');
} else {
$config = $this->config ?? (__DIR__.'/config.yml');
}

$loader->load($config);
$loader->load($this->config ?? __DIR__.'/config.yml');
}

public function build(ContainerBuilder $container): void
Expand Down
8 changes: 1 addition & 7 deletions fixtures/Bridge/Symfony/Application/AppKernelWithCustomParameters.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,6 @@ class AppKernelWithCustomParameters extends AppKernel
{
public function registerContainerConfiguration(LoaderInterface $loader): void
{
if (3 === self::MAJOR_VERSION) {
$config = __DIR__.'/config_custom_34.yml';
} else {
$config = __DIR__.'/config_custom.yml';
}

$loader->load($config);
$loader->load(__DIR__.'/config_custom.yml');
}
}
4 changes: 3 additions & 1 deletion fixtures/Bridge/Symfony/Application/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
#

framework:
annotations:
enabled: false
secret: NelmioAliceBundleSecret
serializer:
enabled: true
Expand All @@ -17,6 +19,6 @@ framework:
utf8: true
test: ~
session:
storage_id: session.storage.mock_file
enabled: false
property_access:
magic_call: true
21 changes: 0 additions & 21 deletions fixtures/Bridge/Symfony/Application/config_34.yml
View file
Open in desktop

This file was deleted.

4 changes: 3 additions & 1 deletion fixtures/Bridge/Symfony/Application/config_custom.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
#

framework:
annotations:
enabled: false
secret: NelmioAliceBundleSecret
serializer:
enabled: true
Expand All @@ -17,7 +19,7 @@ framework:
utf8: true
test: ~
session:
storage_id: session.storage.mock_file
enabled: false

nelmio_alice:
locale: 'fr_FR'
Expand Down
25 changes: 0 additions & 25 deletions fixtures/Bridge/Symfony/Application/config_custom_34.yml
View file
Open in desktop

This file was deleted.

10 changes: 3 additions & 7 deletions tests/Bridge/Symfony/DependencyInjection/DynamicServicesConfigurationTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,9 @@ class DynamicServicesConfigurationTest extends TestCase

protected function setUp(): void
{
if (3 === AppKernel::MAJOR_VERSION) {
$config = __DIR__.'/../../../../fixtures/Bridge/Symfony/Application/config_custom_34.yml';
} else {
$config = __DIR__.'/../../../../fixtures/Bridge/Symfony/Application/config_custom.yml';
}

$this->kernel = KernelFactory::createKernel($config);
$this->kernel = KernelFactory::createKernel(
__DIR__.'/../../../../fixtures/Bridge/Symfony/Application/config_custom.yml',
);
$this->kernel->boot();
}

Expand Down
4 changes: 2 additions & 2 deletions vendor-bin/covers-validator/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"require-dev": {
"symfony/console": "^3.3",
"ockcyp/covers-validator": "^1.1"
"symfony/console": "^5.3",
"ockcyp/covers-validator": "^1.3"
},
"config": {
"bin-dir": "bin",
Expand Down
4 changes: 2 additions & 2 deletions vendor-bin/infection/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"require-dev": {
"infection/infection": "^0.20",
"theofidry/composer-inheritance-plugin": "^1.0"
"infection/infection": "^0.25",
"theofidry/composer-inheritance-plugin": "^1.2"
},
"config": {
"bin-dir": "bin",
Expand Down
2 changes: 1 addition & 1 deletion vendor-bin/profiling/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"blackfire/php-sdk": "^1.5",
"symfony/console": "^3.1",
"symfony/finder": "^3.1",
"theofidry/composer-inheritance-plugin": "^1.0"
"theofidry/composer-inheritance-plugin": "^1.2"
},
"config": {
"bin-dir": "bin",
Expand Down
4 changes: 2 additions & 2 deletions vendor-bin/symfony/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"require-dev": {
"symfony/symfony": "^3.4 || ^4.0 || ^5.0",
"theofidry/composer-inheritance-plugin": "^1.0"
"symfony/symfony": "^4.4 || ^5.0",
"theofidry/composer-inheritance-plugin": "^1.2"
},
"config": {
"bin-dir": "bin",
Expand Down