Remove deadcode after the bump to PHP >= 8.4 #60666

nicolas-grekas · 2025-06-03T15:50:02Z

Q	A
Branch?	8.0
Bug fix?	no
New feature?	no
Deprecations?	no
Issues	-
License	MIT

OskarStark · 2025-06-03T15:56:57Z

Wow 🤩

src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

stof · 2025-06-03T16:05:59Z

src/Symfony/Bridge/Doctrine/ManagerRegistry.php

                throw new \LogicException(\sprintf('Resetting a non-lazy manager service is not supported. Declare the "%s" service as lazy.', $name));
            }

            return;


Isn't the if ($manager instanceof LazyObjectInterface) { above also dead code ? Or is there still a case where we use a LazyObjectInterface of var-exporter instead of a native lazy object on PHP 8.4+ ?

LazyObjectInterface is not deprecated, it's still used for lazy decorators, which is the remaining feature on the topic.

stof · 2025-06-03T16:10:50Z

src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php

        $prevCacheDir = false;
    }
 }
-$SYMFONY_PHPUNIT_REMOVE = $getEnvVar('SYMFONY_PHPUNIT_REMOVE', 'phpspec/prophecy'.($PHPUNIT_VERSION < 6.0 ? ' symfony/yaml' : ''));


are we really dropping support for older PHPUnit versions ? There is a difference between the default version and the supported versions.

older phpunit versions don't support PHP 8, but we bumped the bridge to PHP >= 8.1 (to keep using it when testing Symfony 6.4)

We'll need a proper cleanup to remove all code related to using older PHPUnit versions then. For instance, there is no need to remove the prophecy dependency in PHPUnit 9.6 anymore (as it is not installed by default anymore).
And we probably need a check on $PHPUNIT_VERSION to fail properly if the env variable specifies an unsupported PHPUnit version.

stof · 2025-06-03T16:14:07Z

src/Symfony/Component/Clock/DatePoint.php

-        }
-
-        return static::createFromFormat('U.u', \sprintf('%.6F', $timestamp));
+        return parent::createFromTimestamp($timestamp);


Can't we drop the method override entirely now that we don't need to polyfill it ?

the decoration remains for the static return type, which is more accurate than the native one

src/Symfony/Component/JsonStreamer/Read/LazyInstantiator.php

src/Symfony/Component/VarDumper/Caster/ResourceCaster.php

stof · 2025-06-03T16:27:09Z

src/Symfony/Component/VarExporter/Internal/LazyObjectTrait.php

-    }
+/**
+ * @internal
+ * @deprecated since Symfony 7.3


adding a @deprecated since Symfony 7.3 annotation that was not there before is suspicious to me.

added as a reminder this should removed while removing the deprecated traits
the annotation was not needed because @internal

src/Symfony/Component/VarExporter/ProxyHelper.php

src/Symfony/Component/VarExporter/README.md

nicolas-grekas

comments addressed @stof, thanks for the review!

nicolas-grekas · 2025-06-04T09:14:28Z

src/Symfony/Bridge/Doctrine/ManagerRegistry.php

                throw new \LogicException(\sprintf('Resetting a non-lazy manager service is not supported. Declare the "%s" service as lazy.', $name));
            }

            return;


LazyObjectInterface is not deprecated, it's still used for lazy decorators, which is the remaining feature on the topic.

nicolas-grekas · 2025-06-04T09:15:11Z

src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php

        $prevCacheDir = false;
    }
 }
-$SYMFONY_PHPUNIT_REMOVE = $getEnvVar('SYMFONY_PHPUNIT_REMOVE', 'phpspec/prophecy'.($PHPUNIT_VERSION < 6.0 ? ' symfony/yaml' : ''));


older phpunit versions don't support PHP 8, but we bumped the bridge to PHP >= 8.1 (to keep using it when testing Symfony 6.4)

nicolas-grekas · 2025-06-04T09:15:43Z

src/Symfony/Component/Clock/DatePoint.php

-        }
-
-        return static::createFromFormat('U.u', \sprintf('%.6F', $timestamp));
+        return parent::createFromTimestamp($timestamp);


the decoration remains for the static return type, which is more accurate than the native one

nicolas-grekas · 2025-06-04T09:20:40Z

src/Symfony/Component/VarExporter/Internal/LazyObjectTrait.php

-    }
+/**
+ * @internal
+ * @deprecated since Symfony 7.3


added as a reminder this should removed while removing the deprecated traits
the annotation was not needed because @internal

src/Symfony/Component/VarExporter/ProxyHelper.php

src/Symfony/Component/VarExporter/README.md

…ekas) This PR was merged into the 8.0 branch. Discussion ---------- Remove deadcode after the bump to PHP >= 8.4 | Q | A | ------------- | --- | Branch? | 8.0 | Bug fix? | no | New feature? | no | Deprecations? | no | Issues | - | License | MIT Commits ------- 38e079e Remove deadcode after the bump to PHP >= 8.4

This PR was merged into the 8.0 branch. Discussion ---------- [Clock] Removes redundant timezone check | Q | A |---|--- | Branch? | 8.0 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Issues | n/a | License | MIT This PR removes unused code in `MockClock::withTimeZone()`. This change cleans up the legacy branching logic, similar to the cleanup performed in other components (See #60666 on [this line](https://github.com/symfony/symfony/pull/60666/files#diff-4f259654aa1664031ca46e2710b790a0d01b5f5e0e92455a21eca48241988773L31)) Commits ------- b158a98 [Clock] Removes redundant timezone check

nicolas-grekas requested review from chalasr, dunglas and yceruto as code owners June 3, 2025 15:50

carsonbot added Status: Needs Review labels Jun 3, 2025

carsonbot added this to the 8.0 milestone Jun 3, 2025

nicolas-grekas force-pushed the deadcode branch from 46927a5 to b76b449 Compare June 3, 2025 15:55

mtarld reviewed Jun 3, 2025

View reviewed changes

src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php Outdated Show resolved Hide resolved

nicolas-grekas force-pushed the deadcode branch from b76b449 to f6e929d Compare June 3, 2025 16:09

stof reviewed Jun 3, 2025

View reviewed changes

nicolas-grekas force-pushed the deadcode branch from f6e929d to b9ed11b Compare June 4, 2025 09:25

nicolas-grekas commented Jun 4, 2025

View reviewed changes

nicolas-grekas force-pushed the deadcode branch 2 times, most recently from 321cf79 to 38e079e Compare June 4, 2025 10:36

Remove deadcode after the bump to PHP >= 8.4

13706dd

nicolas-grekas force-pushed the deadcode branch from 38e079e to 13706dd Compare June 4, 2025 10:38

nicolas-grekas merged commit d8b20d5 into symfony:8.0 Jun 4, 2025
7 of 9 checks passed

nicolas-grekas deleted the deadcode branch June 4, 2025 10:39

yoeunes mentioned this pull request Nov 5, 2025

[Clock] Removes redundant timezone check #62319

Merged

Uh oh!

Remove deadcode after the bump to PHP >= 8.4 #60666

Remove deadcode after the bump to PHP >= 8.4 #60666

Uh oh!

Conversation

nicolas-grekas commented Jun 3, 2025

Uh oh!

OskarStark commented Jun 3, 2025

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

nicolas-grekas left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants