minor #32393 clean up remaining deprecations (xabbuh)

Tobion · Tobion · commit 47860981e834 · 2019-07-05T22:09:40.000+02:00
This PR was merged into the 5.0-dev branch. Discussion ---------- clean up remaining deprecations | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | yes | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Commits ------- 33fddce clean up remaining deprecations
diff --git a/src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php b/src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php
@@ -116,9 +116,6 @@ protected function doFetch(array $ids)
                 $values[$id] = null;
             } elseif (!\is_object($value)) {
                 $values[$id] = $value;
-            } elseif (!$value instanceof LazyValue) {
-                // calling a Closure is for @deprecated BC and should be removed in Symfony 5.0
-                $values[$id] = $value();
             } elseif (false === $values[$id] = include $value->file) {
                 unset($values[$id], $this->values[$id]);
                 $missingIds[] = $id;
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -600,10 +600,6 @@ public function mirror($originDir, $targetDir, \Traversable $iterator = null, $o
      */
     public function isAbsolutePath($file)
     {
-        if (null === $file) {
-            @trigger_error(sprintf('Calling "%s()" with a null in the $file argument is deprecated since Symfony 4.4.', __METHOD__), E_USER_DEPRECATED);
-        }
-
         return strspn($file, '/\\', 0, 1)
             || (\strlen($file) > 3 && ctype_alpha($file[0])
                 && ':' === $file[1]
diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
@@ -1400,15 +1400,6 @@ public function providePathsForIsAbsolutePath()
         ];
     }
 
-    /**
-     * @group legacy
-     * @expectedDeprecation Calling "Symfony\Component\Filesystem\Filesystem::isAbsolutePath()" with a null in the $file argument is deprecated since Symfony 4.4.
-     */
-    public function testIsAbsolutePathWithNull()
-    {
-        $this->assertFalse($this->filesystem->isAbsolutePath(null));
-    }
-
     public function testTempnam()
     {
         $dirname = $this->workspace;
diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
@@ -820,10 +820,6 @@ private function getPropertyPath($propertyPath): PropertyPath
      */
     public static function createCache(string $namespace, int $defaultLifetime, string $version, LoggerInterface $logger = null)
     {
-        if (null === $defaultLifetime) {
-            @trigger_error(sprintf('Passing null as "$defaultLifetime" 2nd argument of the "%s()" method is deprecated since Symfony 4.4, pass 0 instead.', __METHOD__), E_USER_DEPRECATED);
-        }
-
         if (!class_exists('Symfony\Component\Cache\Adapter\ApcuAdapter')) {
             throw new \LogicException(sprintf('The Symfony Cache component must be installed to use %s().', __METHOD__));
         }
diff --git a/src/Symfony/Component/Validator/Violation/ConstraintViolationBuilder.php b/src/Symfony/Component/Validator/Violation/ConstraintViolationBuilder.php
@@ -121,10 +121,6 @@ public function setPlural(int $number)
      */
     public function setCode(?string $code)
     {
-        if (null !== $code && !\is_string($code)) {
-            @trigger_error(sprintf('Not using a string as the error code in %s() is deprecated since Symfony 4.4. A type-hint will be added in 5.0.', __METHOD__), E_USER_DEPRECATED);
-        }
-
         $this->code = $code;
 
         return $this;

Original file line number	Diff line number	Diff line change
`@@ -820,10 +820,6 @@ private function getPropertyPath($propertyPath): PropertyPath`
`820`	`820`	`*/`
`821`	`821`	`public static function createCache(string $namespace, int $defaultLifetime, string $version, LoggerInterface $logger = null)`
`822`	`822`	`{`
`823`		`- if (null === $defaultLifetime) {`
`824`		`- @trigger_error(sprintf('Passing null as "$defaultLifetime" 2nd argument of the "%s()" method is deprecated since Symfony 4.4, pass 0 instead.', __METHOD__), E_USER_DEPRECATED);`
`825`		`- }`
`826`		`-`
`827`	`823`	`if (!class_exists('Symfony\Component\Cache\Adapter\ApcuAdapter')) {`
`828`	`824`	`throw new \LogicException(sprintf('The Symfony Cache component must be installed to use %s().', __METHOD__));`
`829`	`825`	`}`