[8.0] Remove deprecated functions (#3210)

* Remove deprecated functions * Update UtilsTest.php * Update UtilsTest.php * Update UtilsTest.php
guzzle · Mar 31, 2024 · 4d34863 · 4d34863
1 parent 187c2d9
commit 4d34863
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 210 deletions.
diff --git a/composer.json b/composer.json
@@ -118,10 +118,7 @@
     "autoload": {
         "psr-4": {
             "GuzzleHttp\\": "src/"
-        },
-        "files": [
-            "src/functions_include.php"
-        ]
+        }
     },
     "autoload-dev": {
         "psr-4": {

diff --git a/src/functions.php b/src/functions.php
diff --git a/src/functions_include.php b/src/functions_include.php
diff --git a/tests/UtilsTest.php b/tests/UtilsTest.php
@@ -2,7 +2,6 @@
 
 namespace GuzzleHttp\Test;
 
-use GuzzleHttp;
 use GuzzleHttp\Utils;
 use PHPUnit\Framework\TestCase;
 
@@ -43,7 +42,6 @@ public function testDescribesType($input, $output)
 
         try {
             self::assertSame($output, Utils::describeType($input));
-            self::assertSame($output, GuzzleHttp\describe_type($input));
         } finally {
             if (extension_loaded('xdebug')) {
                 ini_set('xdebug.overload_var_dump', $originalOverload);
@@ -67,7 +65,6 @@ public function testParsesHeadersFromLines()
         ];
 
         self::assertSame($expected, Utils::headersFromLines($lines));
-        self::assertSame($expected, GuzzleHttp\headers_from_lines($lines));
     }
 
     public function testParsesHeadersFromLinesWithMultipleLines()
@@ -76,31 +73,26 @@ public function testParsesHeadersFromLinesWithMultipleLines()
         $expected = ['Foo' => ['bar', 'baz', '123']];
 
         self::assertSame($expected, Utils::headersFromLines($lines));
-        self::assertSame($expected, GuzzleHttp\headers_from_lines($lines));
     }
 
     public function testChooseHandler()
     {
         self::assertIsCallable(Utils::chooseHandler());
-        self::assertIsCallable(GuzzleHttp\choose_handler());
     }
 
     public function testDefaultUserAgent()
     {
         self::assertIsString(Utils::defaultUserAgent());
-        self::assertIsString(GuzzleHttp\default_user_agent());
     }
 
     public function testReturnsDebugResource()
     {
         self::assertIsResource(Utils::debugResource());
-        self::assertIsResource(GuzzleHttp\debug_resource());
     }
 
     public function testProvidesDefaultCaBundler()
     {
         self::assertFileExists(Utils::defaultCaBundle());
-        self::assertFileExists(GuzzleHttp\default_ca_bundle());
     }
 
     public function testNormalizeHeaderKeys()
@@ -109,7 +101,6 @@ public function testNormalizeHeaderKeys()
         $expected = ['hello' => 'HelLo', 'world' => 'WORld'];
 
         self::assertSame($expected, Utils::normalizeHeaderKeys($input));
-        self::assertSame($expected, GuzzleHttp\normalize_header_keys($input));
     }
 
     public function noProxyProvider()
@@ -131,7 +122,6 @@ public function noProxyProvider()
     public function testChecksNoProxyList($host, $list, $result)
     {
         self::assertSame($result, Utils::isHostInNoProxy($host, $list));
-        self::assertSame($result, \GuzzleHttp\is_host_in_noproxy($host, $list));
     }
 
     public function testEnsuresNoProxyCheckHostIsSet()
@@ -141,17 +131,9 @@ public function testEnsuresNoProxyCheckHostIsSet()
         Utils::isHostInNoProxy('', []);
     }
 
-    public function testEnsuresNoProxyCheckHostIsSetLegacy()
-    {
-        $this->expectException(\InvalidArgumentException::class);
-
-        \GuzzleHttp\is_host_in_noproxy('', []);
-    }
-
     public function testEncodesJson()
     {
         self::assertSame('true', Utils::jsonEncode(true));
-        self::assertSame('true', \GuzzleHttp\json_encode(true));
     }
 
     public function testEncodesJsonAndThrowsOnError()
@@ -161,13 +143,6 @@ public function testEncodesJsonAndThrowsOnError()
         Utils::jsonEncode("\x99");
     }
 
-    public function testEncodesJsonAndThrowsOnErrorLegacy()
-    {
-        $this->expectException(\InvalidArgumentException::class);
-
-        \GuzzleHttp\json_encode("\x99");
-    }
-
     public function testEncodesJsonAndThrowsOnErrorWithNativeOption()
     {
         $this->expectException(\InvalidArgumentException::class);
@@ -178,7 +153,6 @@ public function testEncodesJsonAndThrowsOnErrorWithNativeOption()
     public function testDecodesJson()
     {
         self::assertTrue(Utils::jsonDecode('true'));
-        self::assertTrue(\GuzzleHttp\json_decode('true'));
     }
 
     public function testDecodesJsonAndThrowsOnError()
@@ -188,13 +162,6 @@ public function testDecodesJsonAndThrowsOnError()
         Utils::jsonDecode('{{]]');
     }
 
-    public function testDecodesJsonAndThrowsOnErrorLegacy()
-    {
-        $this->expectException(\InvalidArgumentException::class);
-
-        \GuzzleHttp\json_decode('{{]]');
-    }
-
     public function testDecodesJsonAndThrowsOnErrorWithNativeOption()
     {
         $this->expectException(\InvalidArgumentException::class);