Expose ConcreteImplementation as non-internal

nicolas-grekas · nicolas-grekas · commit acad0bd6ae61 · 2022-10-21T14:41:35.000+02:00
diff --git a/src/ConcreteImplementation.php b/src/ConcreteImplementation.php
@@ -7,18 +7,32 @@
  * file that was distributed with this source code.
  */
 
-namespace FriendsOfPHP\WellKnownImplementations\Internal;
+namespace FriendsOfPHP\WellKnownImplementations;
 
 use Composer\InstalledVersions;
 
 /**
- * @internal
+ * @author Nicolas Grekas <p@tchwork.com>
  */
 class ConcreteImplementation
 {
     public const PSR7_VENDOR = PSR7_VENDOR;
     public const PSR18_VENDOR = PSR18_VENDOR;
     public const HTTPLUG_VENDOR = HTTPLUG_VENDOR;
+
+    public const VENDOR_GUZZLE = 'Guzzle';
+    public const VENDOR_HTTPLUG_CURL = 'HttplugCurl';
+    public const VENDOR_HTTPLUG_GUZZLE6 = 'HttplugGuzzle6';
+    public const VENDOR_HTTPLUG_GUZZLE7 = 'HttplugGuzzle7';
+    public const VENDOR_HTTPLUG_REACT = 'HttplugReact';
+    public const VENDOR_LAMINAS = 'Laminas';
+    public const VENDOR_NYHOLM = 'Nyholm';
+    public const VENDOR_PHP_SLIM = 'Slim';
+    public const VENDOR_PHP_Symfony = 'Symfony';
+
+    /**
+     * @internal
+     */
     public const IMPLEMENTATIONS = [
         'PSR7' => [
             'Nyholm' => 'nyholm/psr7',
@@ -32,13 +46,16 @@ class ConcreteImplementation
         ],
         'HTTPLUG' => [
             'Symfony' => ['symfony/http-client' => '4.4'],
-            'PhpHttpGuzzle7' => 'php-http/guzzle7-adapter',
-            'PhpHttpGuzzle6' => 'php-http/guzzle6-adapter',
-            'PhpHttpCurl' => 'php-http/curl-client',
-            'PhpHttpReact' => 'php-http/react-adapter',
+            'HttplugGuzzle7' => 'php-http/guzzle7-adapter',
+            'HttplugGuzzle6' => 'php-http/guzzle6-adapter',
+            'HttplugCurl' => 'php-http/curl-client',
+            'HttplugReact' => 'php-http/react-adapter',
         ],
     ];
 
+    /**
+     * @internal
+     */
     public static function initialize(): void
     {
         foreach (self::IMPLEMENTATIONS as $const => $packages) {
diff --git a/src/Internal/ComposerPlugin.php b/src/Internal/ComposerPlugin.php
@@ -26,8 +26,11 @@
 use Composer\Script\Event;
 use Composer\Script\ScriptEvents;
 use Composer\Util\Filesystem;
+use FriendsOfPHP\WellKnownImplementations\ConcreteImplementation;
 
 /**
+ * @author Nicolas Grekas <p@tchwork.com>
+ *
  * @internal
  */
 class ComposerPlugin implements PluginInterface, EventSubscriberInterface
@@ -88,35 +91,41 @@ public function uninstall(Composer $composer, IOInterface $io)
     public function preAutoloadDump(Event $event)
     {
         $filesystem = new Filesystem();
-        $vendor = $filesystem->normalizePath(realpath(realpath($event->getComposer()->getConfig()->get('vendor-dir'))));
-        $filesystem->ensureDirectoryExists($vendor.'/composer');
+        $vendorDir = $filesystem->normalizePath(realpath(realpath($event->getComposer()->getConfig()->get('vendor-dir'))));
+        $filesystem->ensureDirectoryExists($vendorDir.'/composer');
 
         $repo = $event->getComposer()->getRepositoryManager()->getLocalRepository();
         $vendors = self::initializeConcreteImplementation($repo);
 
-        $namespace = __NAMESPACE__;
         $psr7Vendor = str_replace(['NULL', '\\\\'], ['null', '\\'], var_export(PSR7_VENDOR, true));
         $psr18Vendor = str_replace(['NULL', '\\\\'], ['null', '\\'], var_export(PSR18_VENDOR, true));
         $httplugVendor = str_replace(['NULL', '\\\\'], ['null', '\\'], var_export(HTTPLUG_VENDOR, true));
 
-        $filesystem->filePutContentsIfModified($vendor.'/composer/WellKnownConcreteImplementation.php', <<<EOPHP
+        natcasesort($vendors);
+        $vendorConsts = '';
+        foreach ($vendors as $vendor) {
+            $vendorConsts .= "\n    public const VENDOR".strtoupper(preg_replace('/[A-Z]++/', '_$0', $vendor)).' = '.var_export($vendor, true).';';
+        }
+
+        $filesystem->filePutContentsIfModified($vendorDir.'/composer/WellKnownConcreteImplementation.php', <<<EOPHP
 <?php
 
-namespace $namespace;
+namespace FriendsOfPHP\WellKnownImplementations;
 
 class ConcreteImplementation
 {
     public const PSR7_VENDOR = $psr7Vendor;
     public const PSR18_VENDOR = $psr18Vendor;
     public const HTTPLUG_VENDOR = $httplugVendor;
+$vendorConsts
 }
 
 EOPHP
         );
 
         $rootPackage = $event->getComposer()->getPackage();
         $autoload = $rootPackage->getAutoload();
-        $autoload['classmap'][] = $vendor.'/composer/WellKnownConcreteImplementation.php';
+        $autoload['classmap'][] = $vendorDir.'/composer/WellKnownConcreteImplementation.php';
         $rootPackage->setAutoload($autoload);
 
         unset($vendors[PSR7_VENDOR], $vendors[PSR18_VENDOR], $vendors[HTTPLUG_VENDOR]);
@@ -126,8 +135,8 @@ class ConcreteImplementation
                 continue;
             }
             $autoload = $package->getAutoload();
+            $autoload['exclude-from-classmap'][] = 'src/ConcreteImplementation.php';
             $autoload['exclude-from-classmap'][] = 'src/Internal/ComposerPlugin.php';
-            $autoload['exclude-from-classmap'][] = 'src/Internal/ConcreteImplementation.php';
             foreach ($vendors as $vendor) {
                 $autoload['exclude-from-classmap'][] = 'src/Internal/'.$vendor.'/';
             }
diff --git a/src/Internal/HttplugCurl/HttplugCurlHttplugClient.php b/src/Internal/HttplugCurl/HttplugCurlHttplugClient.php
@@ -7,15 +7,15 @@
  * file that was distributed with this source code.
  */
 
-namespace FriendsOfPHP\WellKnownImplementations\Internal\PhpHttpCurl;
+namespace FriendsOfPHP\WellKnownImplementations\Internal\HttplugCurl;
 
 use FriendsOfPHP\WellKnownImplementations\WellKnownPsr17Factory;
 use Http\Client\Curl\Client;
 
 /**
  * @internal
  */
-class PhpHttpCurlHttplugClient extends Client
+class HttplugCurlHttplugClient extends Client
 {
     public function __construct()
     {
diff --git a/src/Internal/HttplugGuzzle6/HttplugGuzzle6HttplugClient.php b/src/Internal/HttplugGuzzle6/HttplugGuzzle6HttplugClient.php
@@ -7,17 +7,17 @@
  * file that was distributed with this source code.
  */
 
-namespace FriendsOfPHP\WellKnownImplementations\Internal\PhpHttpGuzzle6;
+namespace FriendsOfPHP\WellKnownImplementations\Internal\HttplugGuzzle6;
 
 use Http\Adapter\Guzzle6\Client;
 
-class_alias(Client::class, PhpHttpGuzzle6HttplugClient::class);
+class_alias(Client::class, HttplugGuzzle6HttplugClient::class);
 
 if (false) {
     /**
      * @internal
      */
-    class PhpHttpGuzzle6HttplugClient extends Client
+    class HttplugGuzzle6HttplugClient extends Client
     {
         public function __construct()
         {
diff --git a/src/Internal/HttplugGuzzle7/HttplugGuzzle7HttplugClient.php b/src/Internal/HttplugGuzzle7/HttplugGuzzle7HttplugClient.php
@@ -7,17 +7,17 @@
  * file that was distributed with this source code.
  */
 
-namespace FriendsOfPHP\WellKnownImplementations\Internal\PhpHttpGuzzle7;
+namespace FriendsOfPHP\WellKnownImplementations\Internal\HttplugGuzzle7;
 
 use Http\Adapter\Guzzle7\Client;
 
-class_alias(Client::class, PhpHttpGuzzle7HttplugClient::class);
+class_alias(Client::class, HttplugGuzzle7HttplugClient::class);
 
 if (false) {
     /**
      * @internal
      */
-    class PhpHttpGuzzle7HttplugClient extends Client
+    class HttplugGuzzle7HttplugClient extends Client
     {
         public function __construct()
         {
diff --git a/src/Internal/HttplugReact/HttplugReactHttplugClient.php b/src/Internal/HttplugReact/HttplugReactHttplugClient.php
@@ -7,17 +7,17 @@
  * file that was distributed with this source code.
  */
 
-namespace FriendsOfPHP\WellKnownImplementations\Internal\PhpHttpReact;
+namespace FriendsOfPHP\WellKnownImplementations\Internal\HttplugReact;
 
 use Http\Adapter\React\Client;
 
-class_alias(Client::class, PhpHttpReactHttplugClient::class);
+class_alias(Client::class, HttplugReactHttplugClient::class);
 
 if (false) {
     /**
      * @internal
      */
-    class PhpHttpReactHttplugClient extends Client
+    class HttplugReactHttplugClient extends Client
     {
         public function __construct()
         {
diff --git a/src/WellKnownHttplugClient.php b/src/WellKnownHttplugClient.php
@@ -9,7 +9,6 @@
 
 namespace FriendsOfPHP\WellKnownImplementations;
 
-use FriendsOfPHP\WellKnownImplementations\Internal\ConcreteImplementation;
 use Http\Client\HttpAsyncClient;
 use Http\Client\HttpClient;
 
diff --git a/src/WellKnownPsr18Client.php b/src/WellKnownPsr18Client.php
@@ -9,7 +9,6 @@
 
 namespace FriendsOfPHP\WellKnownImplementations;
 
-use FriendsOfPHP\WellKnownImplementations\Internal\ConcreteImplementation;
 use Psr\Http\Client\ClientInterface;
 
 if (null !== $vendor = ConcreteImplementation::PSR18_VENDOR) {
diff --git a/src/WellKnownPsr7Request.php b/src/WellKnownPsr7Request.php
@@ -9,7 +9,6 @@
 
 namespace FriendsOfPHP\WellKnownImplementations;
 
-use FriendsOfPHP\WellKnownImplementations\Internal\ConcreteImplementation;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\UriInterface;
 
diff --git a/src/WellKnownPsr7Response.php b/src/WellKnownPsr7Response.php
@@ -9,7 +9,6 @@
 
 namespace FriendsOfPHP\WellKnownImplementations;
 
-use FriendsOfPHP\WellKnownImplementations\Internal\ConcreteImplementation;
 use Psr\Http\Message\ResponseInterface;
 
 if (null !== $vendor = ConcreteImplementation::PSR7_VENDOR) {
diff --git a/src/WellKnownPsr7ServerRequest.php b/src/WellKnownPsr7ServerRequest.php
@@ -9,7 +9,6 @@
 
 namespace FriendsOfPHP\WellKnownImplementations;
 
-use FriendsOfPHP\WellKnownImplementations\Internal\ConcreteImplementation;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\UriInterface;
 
diff --git a/src/WellKnownPsr7Stream.php b/src/WellKnownPsr7Stream.php
@@ -9,7 +9,6 @@
 
 namespace FriendsOfPHP\WellKnownImplementations;
 
-use FriendsOfPHP\WellKnownImplementations\Internal\ConcreteImplementation;
 use Psr\Http\Message\StreamInterface;
 
 if (null !== $vendor = ConcreteImplementation::PSR7_VENDOR) {
diff --git a/src/WellKnownPsr7UploadedFile.php b/src/WellKnownPsr7UploadedFile.php
@@ -9,7 +9,6 @@
 
 namespace FriendsOfPHP\WellKnownImplementations;
 
-use FriendsOfPHP\WellKnownImplementations\Internal\ConcreteImplementation;
 use Psr\Http\Message\StreamInterface;
 use Psr\Http\Message\UploadedFileInterface;
 
diff --git a/src/WellKnownPsr7Uri.php b/src/WellKnownPsr7Uri.php
@@ -9,7 +9,6 @@
 
 namespace FriendsOfPHP\WellKnownImplementations;
 
-use FriendsOfPHP\WellKnownImplementations\Internal\ConcreteImplementation;
 use Psr\Http\Message\UriInterface;
 
 if (null !== $vendor = ConcreteImplementation::PSR7_VENDOR) {
diff --git a/tests/WellKnownHttplugClientTest.php b/tests/WellKnownHttplugClientTest.php
@@ -9,9 +9,9 @@
 
 namespace FriendsOfPHP\WellKnownImplementations\Tests;
 
+use FriendsOfPHP\WellKnownImplementations\ConcreteImplementation;
 use FriendsOfPHP\WellKnownImplementations\WellKnownHttplugClient;
 use FriendsOfPHP\WellKnownImplementations\WellKnownPsr7Request;
-use FriendsOfPHP\WellKnownImplementations\Internal\ConcreteImplementation;
 use Http\Client\HttpAsyncClient;
 use Http\Client\HttpClient;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/WellKnownPsr17FactoryTest.php b/tests/WellKnownPsr17FactoryTest.php
diff --git a/tests/WellKnownPsr18ClientTest.php b/tests/WellKnownPsr18ClientTest.php
@@ -9,9 +9,9 @@
 
 namespace FriendsOfPHP\WellKnownImplementations\Tests;
 
+use FriendsOfPHP\WellKnownImplementations\ConcreteImplementation;
 use FriendsOfPHP\WellKnownImplementations\WellKnownPsr18Client;
 use FriendsOfPHP\WellKnownImplementations\WellKnownPsr7Request;
-use FriendsOfPHP\WellKnownImplementations\Internal\ConcreteImplementation;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Client\ClientInterface;
 
diff --git a/tests/WellKnownPsr7RequestTest.php b/tests/WellKnownPsr7RequestTest.php
diff --git a/tests/WellKnownPsr7ResponseTest.php b/tests/WellKnownPsr7ResponseTest.php
diff --git a/tests/WellKnownPsr7ServerRequestTest.php b/tests/WellKnownPsr7ServerRequestTest.php
diff --git a/tests/WellKnownPsr7StreamTest.php b/tests/WellKnownPsr7StreamTest.php
diff --git a/tests/WellKnownPsr7UploadedFileTest.php b/tests/WellKnownPsr7UploadedFileTest.php
diff --git a/tests/WellKnownPsr7UriTest.php b/tests/WellKnownPsr7UriTest.php
