symfony · derrabus · Jul 15, 2021 · Jul 13, 2021
diff --git a/composer.json b/composer.json
@@ -18,18 +18,18 @@
     "provide": {
         "php-http/async-client-implementation": "*",
         "php-http/client-implementation": "*",
-        "psr/cache-implementation": "1.0|2.0|3.0",
-        "psr/container-implementation": "1.0",
+        "psr/cache-implementation": "2.0|3.0",
+        "psr/container-implementation": "1.1|2.0",
         "psr/event-dispatcher-implementation": "1.0",
         "psr/http-client-implementation": "1.0",
         "psr/link-implementation": "1.0",
         "psr/log-implementation": "1.0",
         "psr/simple-cache-implementation": "1.0",
-        "symfony/cache-implementation": "1.0|2.0",
-        "symfony/event-dispatcher-implementation": "2.0",
-        "symfony/http-client-implementation": "2.4",
-        "symfony/service-implementation": "1.0|2.0",
-        "symfony/translation-implementation": "2.3"
+        "symfony/cache-implementation": "1.1|2.0|3.0",
+        "symfony/event-dispatcher-implementation": "2.0|3.0",
+        "symfony/http-client-implementation": "2.5|3.0",
+        "symfony/service-implementation": "1.1|2.0|3.0",
+        "symfony/translation-implementation": "2.3|3.0"
     },
     "require": {
         "php": ">=8.0.2",
@@ -38,12 +38,12 @@
         "doctrine/event-manager": "~1.0",
         "doctrine/persistence": "^2",
         "twig/twig": "^2.13|^3.0.4",
-        "psr/cache": "^1.0|^2.0|^3.0",
-        "psr/container": "^1.0",
+        "psr/cache": "^2.0|^3.0",
+        "psr/container": "^1.1|^2.0",
         "psr/event-dispatcher": "^1.0",
         "psr/link": "^1.1",
         "psr/log": "~1.0",
-        "symfony/contracts": "^2.5",
+        "symfony/contracts": "^2.5|^3.0",
         "symfony/polyfill-ctype": "~1.8",
         "symfony/polyfill-intl-grapheme": "~1.0",
         "symfony/polyfill-intl-icu": "~1.0",
@@ -186,7 +186,7 @@
             "url": "src/Symfony/Contracts",
             "options": {
                 "versions": {
-                    "symfony/contracts": "2.5.x-dev"
+                    "symfony/contracts": "3.0.x-dev"
                 }
             }
         },

diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json
@@ -19,10 +19,10 @@
         "php": ">=8.0.2",
         "doctrine/event-manager": "~1.0",
         "doctrine/persistence": "^2",
-        "symfony/deprecation-contracts": "^2.1",
+        "symfony/deprecation-contracts": "^2.1|^3.0",
         "symfony/polyfill-ctype": "~1.8",
         "symfony/polyfill-mbstring": "~1.0",
-        "symfony/service-contracts": "^1.1|^2"
+        "symfony/service-contracts": "^1.1|^2.0|^3.0"
     },
     "require-dev": {
         "composer/package-versions-deprecated": "^1.8",

diff --git a/src/Symfony/Bridge/Monolog/composer.json b/src/Symfony/Bridge/Monolog/composer.json
@@ -18,7 +18,7 @@
     "require": {
         "php": ">=8.0.2",
         "monolog/monolog": "^1.25.1|^2",
-        "symfony/service-contracts": "^1.1|^2",
+        "symfony/service-contracts": "^1.1|^2.0|^3.0",
         "symfony/http-kernel": "^5.4|^6.0"
     },
     "require-dev": {

diff --git a/src/Symfony/Bridge/PhpUnit/composer.json b/src/Symfony/Bridge/PhpUnit/composer.json
@@ -21,7 +21,7 @@
         "php": ">=7.1.3"
     },
     "require-dev": {
-        "symfony/deprecation-contracts": "^2.1",
+        "symfony/deprecation-contracts": "^2.1|^3.0",
         "symfony/error-handler": "^5.4|^6.0"
     },
     "suggest": {

diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json
@@ -17,7 +17,7 @@
     ],
     "require": {
         "php": ">=8.0.2",
-        "symfony/translation-contracts": "^1.1|^2",
+        "symfony/translation-contracts": "^1.1|^2.0|^3.0",
         "twig/twig": "^2.13|^3.0.4"
     },
     "require-dev": {

diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TranslationsCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TranslationsCacheWarmer.php
@@ -62,7 +62,7 @@ public function isOptional()
     /**
      * {@inheritdoc}
      */
-    public static function getSubscribedServices()
+    public static function getSubscribedServices(): array
     {
         return [
             'translator' => TranslatorInterface::class,

diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php b/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php
@@ -86,7 +86,7 @@ protected function getParameter(string $name)
         return $this->container->get('parameter_bag')->get($name);
     }
 
-    public static function getSubscribedServices()
+    public static function getSubscribedServices(): array
     {
         return [
             'router' => '?'.RouterInterface::class,

diff --git a/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php b/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php
@@ -196,7 +196,7 @@ private function resolve(mixed $value): mixed
     /**
      * {@inheritdoc}
      */
-    public static function getSubscribedServices()
+    public static function getSubscribedServices(): array
     {
         return [
             'routing.loader' => LoaderInterface::class,

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php
@@ -22,6 +22,7 @@
 use Symfony\Component\Translation\Loader\LoaderInterface;
 use Symfony\Component\Translation\Loader\YamlFileLoader;
 use Symfony\Component\Translation\MessageCatalogue;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class TranslatorTest extends TestCase
 {
@@ -310,7 +311,7 @@ protected function getContainer($loader)
         return $container;
     }
 
-    public function getTranslator($loader, $options = [], $loaderFomat = 'loader', $translatorClass = Translator::class, $defaultLocale = 'en', array $enabledLocales = [])
+    public function getTranslator($loader, $options = [], $loaderFomat = 'loader', $translatorClass = Translator::class, $defaultLocale = 'en', array $enabledLocales = []): TranslatorInterface
     {
         $translator = $this->createTranslator($loader, $options, $translatorClass, $loaderFomat, $defaultLocale, $enabledLocales);
 

diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -21,7 +21,7 @@
         "symfony/cache": "^5.4|^6.0",
         "symfony/config": "^5.4|^6.0",
         "symfony/dependency-injection": "^5.4|^6.0",
-        "symfony/deprecation-contracts": "^2.1",
+        "symfony/deprecation-contracts": "^2.1|^3.0",
         "symfony/event-dispatcher": "^5.4|^6.0",
         "symfony/error-handler": "^5.4|^6.0",
         "symfony/http-foundation": "^5.4|^6.0",

@@ -20,7 +20,7 @@
         "ext-xml": "*",
         "symfony/config": "^5.4|^6.0",
         "symfony/dependency-injection": "^5.4|^6.0",
-        "symfony/deprecation-contracts": "^2.1",
+        "symfony/deprecation-contracts": "^2.1|^3.0",
         "symfony/event-dispatcher": "^5.4|^6.0",
         "symfony/http-kernel": "^5.4|^6.0",
         "symfony/http-foundation": "^5.4|^6.0",

@@ -81,7 +81,7 @@ public function isOptional()
     /**
      * {@inheritdoc}
      */
-    public static function getSubscribedServices()
+    public static function getSubscribedServices(): array
     {
         return [
             'twig' => Environment::class,

diff --git a/src/Symfony/Component/Cache/Adapter/AbstractTagAwareAdapter.php b/src/Symfony/Component/Cache/Adapter/AbstractTagAwareAdapter.php
@@ -282,7 +282,7 @@ public function deleteItems(array $keys): bool
     /**
      * {@inheritdoc}
      */
-    public function invalidateTags(array $tags)
+    public function invalidateTags(array $tags): bool
     {
         if (empty($tags)) {
             return false;

diff --git a/src/Symfony/Component/Cache/Adapter/ArrayAdapter.php b/src/Symfony/Component/Cache/Adapter/ArrayAdapter.php
@@ -73,7 +73,7 @@ static function ($key, $value, $isHit) {
     /**
      * {@inheritdoc}
      */
-    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null)
+    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null): mixed
     {
         $item = $this->getItem($key);
         $metadata = $item->getMetadata();

diff --git a/src/Symfony/Component/Cache/Adapter/ChainAdapter.php b/src/Symfony/Component/Cache/Adapter/ChainAdapter.php
@@ -92,7 +92,7 @@ static function ($sourceItem, $item, $defaultLifetime, $sourceMetadata = null) {
     /**
      * {@inheritdoc}
      */
-    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null)
+    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null): mixed
     {
         $lastItem = null;
         $i = 0;

diff --git a/src/Symfony/Component/Cache/Adapter/NullAdapter.php b/src/Symfony/Component/Cache/Adapter/NullAdapter.php
@@ -40,7 +40,7 @@ static function ($key) {
     /**
      * {@inheritdoc}
      */
-    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null)
+    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null): mixed
     {
         $save = true;
 

diff --git a/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php b/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php
@@ -83,7 +83,7 @@ public static function create(string $file, CacheItemPoolInterface $fallbackPool
     /**
      * {@inheritdoc}
      */
-    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null)
+    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null): mixed
     {
         if (!isset($this->values)) {
             $this->initialize();

diff --git a/src/Symfony/Component/Cache/Adapter/ProxyAdapter.php b/src/Symfony/Component/Cache/Adapter/ProxyAdapter.php
@@ -102,7 +102,7 @@ static function (CacheItemInterface $innerItem, array $item) {
     /**
      * {@inheritdoc}
      */
-    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null)
+    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null): mixed
     {
         if (!$this->pool instanceof CacheInterface) {
             return $this->doGet($this, $key, $callback, $beta, $metadata);

diff --git a/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php b/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php
@@ -112,7 +112,7 @@ static function (AdapterInterface $tagsAdapter, array $tags) {
     /**
      * {@inheritdoc}
      */
-    public function invalidateTags(array $tags)
+    public function invalidateTags(array $tags): bool
     {
         $ok = true;
         $tagsByKey = [];

diff --git a/src/Symfony/Component/Cache/Adapter/TagAwareAdapterInterface.php b/src/Symfony/Component/Cache/Adapter/TagAwareAdapterInterface.php
@@ -29,5 +29,5 @@ interface TagAwareAdapterInterface extends AdapterInterface
      *
      * @throws InvalidArgumentException When $tags is not valid
      */
-    public function invalidateTags(array $tags);
+    public function invalidateTags(array $tags): bool;
 }
diff --git a/src/Symfony/Component/Cache/Adapter/TraceableAdapter.php b/src/Symfony/Component/Cache/Adapter/TraceableAdapter.php
@@ -38,7 +38,7 @@ public function __construct(AdapterInterface $pool)
     /**
      * {@inheritdoc}
      */
-    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null)
+    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null): mixed
     {
         if (!$this->pool instanceof CacheInterface) {
             throw new \BadMethodCallException(sprintf('Cannot call "%s::get()": this class doesn\'t implement "%s".', get_debug_type($this->pool), CacheInterface::class));

diff --git a/src/Symfony/Component/Cache/Adapter/TraceableTagAwareAdapter.php b/src/Symfony/Component/Cache/Adapter/TraceableTagAwareAdapter.php
@@ -26,7 +26,7 @@ public function __construct(TagAwareAdapterInterface $pool)
     /**
      * {@inheritdoc}
      */
-    public function invalidateTags(array $tags)
+    public function invalidateTags(array $tags): bool
     {
         $event = $this->start(__FUNCTION__);
         try {

diff --git a/src/Symfony/Component/Cache/CacheItem.php b/src/Symfony/Component/Cache/CacheItem.php
@@ -104,7 +104,7 @@ public function expiresAfter(mixed $time): static
     /**
      * {@inheritdoc}
      */
-    public function tag(mixed $tags): ItemInterface
+    public function tag(mixed $tags): static
     {
         if (!$this->isTaggable) {
             throw new LogicException(sprintf('Cache item "%s" comes from a non tag-aware pool: you cannot tag it.', $this->key));

diff --git a/src/Symfony/Component/Cache/Tests/Adapter/AdapterTestCase.php b/src/Symfony/Component/Cache/Tests/Adapter/AdapterTestCase.php
@@ -79,7 +79,7 @@ public function __construct(int $value)
                 $this->value = $value;
             }
 
-            public function __invoke(CacheItemInterface $item, bool &$save)
+            public function __invoke(CacheItemInterface $item, bool &$save): mixed
             {
                 Assert::assertSame('bar', $item->getKey());
 

diff --git a/src/Symfony/Component/Cache/composer.json b/src/Symfony/Component/Cache/composer.json
@@ -18,15 +18,15 @@
     "provide": {
         "psr/cache-implementation": "2.0|3.0",
         "psr/simple-cache-implementation": "1.0",
-        "symfony/cache-implementation": "1.0|2.0"
+        "symfony/cache-implementation": "1.1|2.0|3.0"
     },
     "require": {
         "php": ">=8.0.2",
         "psr/cache": "^2.0|^3.0",
         "psr/log": "^1.1",
-        "symfony/cache-contracts": "^1.1.7|^2",
-        "symfony/deprecation-contracts": "^2.1",
-        "symfony/service-contracts": "^1.1|^2",
+        "symfony/cache-contracts": "^1.1.7|^2.0|^3.0",
+        "symfony/deprecation-contracts": "^2.1|^3.0",
+        "symfony/service-contracts": "^1.1|^2.0|^3.0",
         "symfony/var-exporter": "^5.4|^6.0"
     },
     "require-dev": {

diff --git a/src/Symfony/Component/Config/composer.json b/src/Symfony/Component/Config/composer.json
@@ -17,7 +17,7 @@
     ],
     "require": {
         "php": ">=8.0.2",
-        "symfony/deprecation-contracts": "^2.1",
+        "symfony/deprecation-contracts": "^2.1|^3.0",
         "symfony/filesystem": "^5.4|^6.0",
         "symfony/polyfill-ctype": "~1.8",
         "symfony/polyfill-php81": "^1.22"
@@ -26,7 +26,7 @@
         "symfony/event-dispatcher": "^5.4|^6.0",
         "symfony/finder": "^5.4|^6.0",
         "symfony/messenger": "^5.4|^6.0",
-        "symfony/service-contracts": "^1.1|^2",
+        "symfony/service-contracts": "^1.1|^2.0|^3.0",
         "symfony/yaml": "^5.4|^6.0"
     },
     "conflict": {

@@ -18,7 +18,7 @@
     "require": {
         "php": ">=8.0.2",
         "symfony/polyfill-mbstring": "~1.0",
-        "symfony/service-contracts": "^1.1|^2",
+        "symfony/service-contracts": "^1.1|^2.0|^3.0",
         "symfony/string": "^5.4|^6.0"
     },
     "require-dev": {

diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
@@ -173,14 +173,7 @@ public function set(string $id, ?object $service)
         $this->services[$id] = $service;
     }
 
-    /**
-     * Returns true if the given service is defined.
-     *
-     * @param string $id The service identifier
-     *
-     * @return bool true if the service is defined, false otherwise
-     */
-    public function has(string $id)
+    public function has(string $id): bool
     {
         if (isset($this->aliases[$id])) {
             $id = $this->aliases[$id];

diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -491,14 +491,7 @@ public function removeDefinition(string $id)
         }
     }
 
-    /**
-     * Returns true if the given service is defined.
-     *
-     * @param string $id The service identifier
-     *
-     * @return bool true if the service is defined, false otherwise
-     */
-    public function has(string $id)
+    public function has(string $id): bool
     {
         return isset($this->definitions[$id]) || isset($this->aliasDefinitions[$id]) || parent::has($id);
     }

diff --git a/src/Symfony/Component/DependencyInjection/ContainerInterface.php b/src/Symfony/Component/DependencyInjection/ContainerInterface.php
@@ -45,7 +45,7 @@ public function get(string $id, int $invalidBehavior = self::EXCEPTION_ON_INVALI
     /**
      * @return bool true if the service is defined, false otherwise
      */
-    public function has(string $id);
+    public function has(string $id): bool;
 
     /**
      * Check for whether or not a service has been initialized.

diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/ContainerBag.php b/src/Symfony/Component/DependencyInjection/ParameterBag/ContainerBag.php
@@ -45,10 +45,8 @@ public function get(string $name)
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
-    public function has(string $name)
+    public function has(string $name): bool
     {
         return $this->container->hasParameter($name);
     }

diff --git a/src/Symfony/Component/DependencyInjection/Tests/ServiceLocatorTest.php b/src/Symfony/Component/DependencyInjection/Tests/ServiceLocatorTest.php
@@ -21,7 +21,7 @@
 
 class ServiceLocatorTest extends BaseServiceLocatorTest
 {
-    public function getServiceLocator(array $factories)
+    public function getServiceLocator(array $factories): ServiceLocator
     {
         return new ServiceLocator($factories);
     }