Merge branch '1.x' into 2.x

* 1.x: fix: deprecations triggered by debug class loader
symfony · Aug 3, 2023 · 347248e · 347248e
2 parents b31c58d + 1a482f5
commit 347248e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/src/Flex.php b/src/Flex.php
@@ -86,6 +86,9 @@ class Flex implements PluginInterface, EventSubscriberInterface
     ];
     private $filter;
 
+    /**
+     * @return void
+     */
     public function activate(Composer $composer, IOInterface $io)
     {
         if (!\extension_loaded('openssl')) {
@@ -193,6 +196,9 @@ class_exists(__NAMESPACE__.str_replace('/', '\\', substr($file, \strlen(__DIR__)
         }
     }
 
+    /**
+     * @return void
+     */
     public function deactivate(Composer $composer, IOInterface $io)
     {
         self::$activated = false;
@@ -498,6 +504,9 @@ private function synchronizePackageJson(string $rootDir)
         }
     }
 
+    /**
+     * @return void
+     */
     public function uninstall(Composer $composer, IOInterface $io)
     {
         $this->lock->delete();

diff --git a/src/InformationOperation.php b/src/InformationOperation.php
@@ -57,6 +57,8 @@ public function getJobType()
 
     /**
      * {@inheritdoc}
+     *
+     * @return string
      */
     public function getOperationType()
     {
@@ -65,6 +67,8 @@ public function getOperationType()
 
     /**
      * {@inheritdoc}
+     *
+     * @return string
      */
     public function show($lock)
     {

diff --git a/src/Response.php b/src/Response.php
@@ -65,6 +65,9 @@ public static function fromJson(array $json): self
         return $response;
     }
 
+    /**
+     * @return mixed
+     */
     #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {