Skip to content

Commit

Permalink
Add support for Symfony 7, require Symfony 5.4+ and PHP 7.4+
Browse files Browse the repository at this point in the history
  • Loading branch information
mbabker committed Nov 3, 2023
1 parent d6d0d31 commit 96779fc
Show file tree
Hide file tree
Showing 9 changed files with 34 additions and 40 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,14 @@ jobs:
strategy:
matrix:
php-version:
- "7.2"
- "7.3"
- "7.4"
- "8.0"
- "8.1"
- "8.2"
dependencies:
- "highest"
include:
- php-version: "7.2"
- php-version: "7.4"
dependencies: "lowest"

steps:
Expand Down
2 changes: 1 addition & 1 deletion .phpcs.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<arg name="colors"/>
<arg value="nps"/>

<config name="php_version" value="70200"/>
<config name="php_version" value="70400"/>

<file>Cache/</file>
<file>ContextFactory/</file>
Expand Down
2 changes: 1 addition & 1 deletion Cache/CacheWarmer.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public function __construct(array $includePaths, MetadataFactoryInterface $metad
*
* @return string[] A list of classes or files to preload on PHP 7.4+
*/
public function warmUp($cacheDir)
public function warmUp(string $cacheDir, ?string $buildDir = null): array
{
$finder = Finder::create()
->ignoreVCS(true)
Expand Down
5 changes: 1 addition & 4 deletions DependencyInjection/Configuration.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,7 @@ public function __construct($debug = false)
$this->debug = $debug;
}

/**
* @return TreeBuilder
*/
public function getConfigTreeBuilder()
public function getConfigTreeBuilder(): TreeBuilder
{
$tb = new TreeBuilder('jms_serializer');

Expand Down
12 changes: 4 additions & 8 deletions DependencyInjection/JMSSerializerExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -253,14 +253,10 @@ private function loadInternal(array $config, ScopedContainer $container, array $
$container->removeDefinition('jms_serializer.metadata.doc_block_driver');
}

// enable the typed props reader on php 7.4+
if (PHP_VERSION_ID >= 70400) {
$container->getDefinition('jms_serializer.metadata.typed_properties_driver')
->setDecoratedService('jms_serializer.metadata_driver')
->setPublic(false);
} else {
$container->removeDefinition('jms_serializer.metadata.typed_properties_driver');
}
// enable the typed props reader
$container->getDefinition('jms_serializer.metadata.typed_properties_driver')
->setDecoratedService('jms_serializer.metadata_driver')
->setPublic(false);

if ($config['enum_support']) {
$container->getDefinition('jms_serializer.metadata.enum_driver')
Expand Down
2 changes: 1 addition & 1 deletion ExpressionLanguage/BasicSerializerFunctionsProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class BasicSerializerFunctionsProvider implements ExpressionFunctionProviderInte
/**
* @return ExpressionFunction[]
*/
public function getFunctions()
public function getFunctions(): array
{
return [
new ExpressionFunction('service', static function ($arg) {
Expand Down
5 changes: 4 additions & 1 deletion Tests/DependencyInjection/ConfigurationTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@ private function getContainer(array $configs = [])
$bundles = ['JMSSerializerBundle' => 'JMS\SerializerBundle\JMSSerializerBundle'];
$container = new ContainerBuilder();

$container->set('annotation_reader', new AnnotationReader());
if (class_exists(AnnotationReader::class)) {
$container->set('annotation_reader', new AnnotationReader());
}

$container->setParameter('kernel.debug', true);
$container->setParameter('kernel.cache_dir', sys_get_temp_dir() . '/serializer');
$container->setParameter('kernel.bundles', $bundles);
Expand Down
12 changes: 6 additions & 6 deletions Tests/DependencyInjection/JMSSerializerExtensionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Definition;
use Twig\Loader\ContainerRuntimeLoader;
use Twig\RuntimeLoader\ContainerRuntimeLoader;

class JMSSerializerExtensionTest extends TestCase
{
Expand Down Expand Up @@ -777,10 +777,6 @@ public function testAutoconfigureHandlers()

public function testTypedDriverIsEnabled()
{
if (PHP_VERSION_ID < 70400) {
$this->markTestSkipped(sprintf('%s requires PHP 7.4', __METHOD__));
}

if (!class_exists(TypedPropertiesDriver::class)) {
$this->markTestSkipped(sprintf('%s requires %s', __METHOD__, TypedPropertiesDriver::class));
}
Expand Down Expand Up @@ -872,7 +868,11 @@ private function getContainerForConfigLoad(array $configs, ?callable $configurat
$container->setParameter('kernel.bundles', []);
$container->setParameter('kernel.bundles_metadata', []);
$container->setParameter('foo', 'bar');
$container->set('annotation_reader', new AnnotationReader());

if (class_exists(AnnotationReader::class)) {
$container->set('annotation_reader', new AnnotationReader());
}

$container->setDefinition('doctrine', new Definition(Registry::class));
// $container->setDefinition('doctrine.orm.entity_manager', new Definition(EntityManager::class));

Expand Down
30 changes: 15 additions & 15 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,29 +21,29 @@
}
],
"require": {
"php": "^7.2 || ^8.0",
"php": "^7.4 || ^8.0",
"jms/serializer": "^3.28",
"jms/metadata": "^2.6",
"symfony/dependency-injection": "^3.4 || ^4.0 || ^5.0 || ^6.0",
"symfony/framework-bundle": "^3.4 || ^4.0 || ^5.0 || ^6.0"
"symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0",
"symfony/framework-bundle": "^5.4 || ^6.0 || ^7.0"
},
"require-dev": {
"doctrine/coding-standard": "^8.1",
"doctrine/orm": "^2.4",
"doctrine/orm": "^2.14",
"phpunit/phpunit": "^8.0 || ^9.0",
"symfony/expression-language": "^3.4 || ^4.0 || ^5.0 || ^6.0",
"symfony/finder": "^3.4 || ^4.0 || ^5.0 || ^6.0",
"symfony/form": "^3.4 || ^4.0 || ^5.0 || ^6.0",
"symfony/stopwatch": "^3.4 || ^4.0 || ^5.0 || ^6.0",
"symfony/templating": "^3.4 || ^4.0 || ^5.0 || ^6.0",
"symfony/twig-bundle": "^3.4 || ^4.0 || ^5.0 || ^6.0",
"symfony/uid": "^5.1 || ^6.0",
"symfony/validator": "^3.4 || ^4.0 || ^5.0 || ^6.0",
"symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0"
"symfony/expression-language": "^5.4 || ^6.0 || ^7.0",
"symfony/finder": "^5.4 || ^6.0 || ^7.0",
"symfony/form": "^5.4 || ^6.0 || ^7.0",
"symfony/stopwatch": "^5.4 || ^6.0 || ^7.0",
"symfony/templating": "^5.4 || ^6.0",
"symfony/twig-bundle": "^5.4 || ^6.0 || ^7.0",
"symfony/uid": "^5.4 || ^6.0 || ^7.0",
"symfony/validator": "^5.4 || ^6.0 || ^7.0",
"symfony/yaml": "^5.4 || ^6.0 || ^7.0"
},
"suggest": {
"symfony/expression-language": "Required for opcache preloading ^3.4 || ^4.0 || ^5.0 || ^6.0",
"symfony/finder": "Required for cache warmup, supported versions ^3.4 || ^4.0 || ^5.0 || ^6.0"
"symfony/expression-language": "Required for opcache preloading ^5.4 || ^6.0 || ^7.0",
"symfony/finder": "Required for cache warmup, supported versions ^5.4 || ^6.0 || ^7.0"
},
"config": {
"allow-plugins": {
Expand Down

0 comments on commit 96779fc

Please sign in to comment.