From e1444284c752d8265e24786af2476dbcbd550514 Mon Sep 17 00:00:00 2001
From: Shawn Iwinski <siwinski@redhat.com>
Date: Aug 15 2017 04:45:48 +0000
Subject: Revert WIP php-symfony3-generate-autoloaders.php changes


---

diff --git a/php-symfony3-generate-autoloaders.php b/php-symfony3-generate-autoloaders.php
index ce9e16a..9b6f152 100755
--- a/php-symfony3-generate-autoloaders.php
+++ b/php-symfony3-generate-autoloaders.php
@@ -16,8 +16,7 @@ $finder->in(SYMFONY_SOURCE_DIR)->name('composer.json')->sortByName();
 
 foreach ($finder as $composerFile) {
     $autoloadGenerator = new AutoloadGenerator($composerFile);
-    echo $autoloadGenerator->getFilename().PHP_EOL;
-    echo $autoloadGenerator->getDevFilename().PHP_EOL;
+    echo $autoloadGenerator->getFilename(), "\n";
 }
 
 
@@ -337,32 +336,17 @@ final class AutoloadGenerator {
 
     private $filename = null;
 
-    private $devFilename = null;
-
     public function __construct(SplFileInfo $composerFile) {
         $composerJson = static::composerJson($composerFile);
-
-        // autoload.php
         $content = static::content(
             $composerJson,
-            static::dependencyAutoloaders($composerJson, 'require'),
-            static::dependencyAutoloaders($composerJson, 'suggest')
+            static::dependencyAutoloaders($composerJson, true),
+            static::dependencyAutoloaders($composerJson, false)
         );
+
         $this->filename = $composerFile->getPath() . '/autoload.php';
-        if (FALSE == file_put_contents($this->filename, $content)) {
-            throw new Exception(sprintf(
-                'Failed to generate autoload file "%s"',
-                $this->filename
-            ));
-        }
 
-        // autoload-dev.php
-        $content = static::content(
-            $composerJson,
-            [] + static::dependencyAutoloaders($composerJson, 'require-dev')
-        );
-        $this->devFilename = $composerFile->getPath() . '/autoload-dev.php';
-        if (FALSE == file_put_contents($this->devFilename, $content)) {
+        if (FALSE == file_put_contents($this->filename, $content)) {
             throw new Exception(sprintf(
                 'Failed to generate autoload file "%s"',
                 $this->filename
@@ -386,8 +370,9 @@ final class AutoloadGenerator {
       return $composerJson;
     }
 
-    private static function dependencyAutoloaders($composerJson, $composerKey) {
+    private static function dependencyAutoloaders($composerJson, $required) {
         $dependencyAutoloaders = [];
+        $composerKey = $required ? 'require' : 'suggest';
 
         if (isset($composerJson[$composerKey])) {
             $dependencies = array_keys(array_filter(
@@ -399,15 +384,6 @@ final class AutoloadGenerator {
             ));
 
             foreach ($dependencies as $pkg) {
-                // Use Symfony cache component as PSR cache implementation
-                // for "require-dev" dependency.
-                if (
-                    ('require-dev' == $composerKey)
-                    && ('psr/cache-implementation' == $pkg)
-                ) {
-                    $pkg = 'symfony/cache';
-                }
-
                 if ($autoloader = self::pkg2Autoload($pkg)) {
                     $dependencyAutoloaders[] = $autoloader;
                 }
@@ -437,7 +413,7 @@ final class AutoloadGenerator {
             : sprintf("%s.'/%s'", $prefix, $path);
     }
 
-    public function content($composerJson, array $dependencyAutoloadersRequired, array $dependencyAutoloadersOptional = []) {
+    public function content($composerJson, array $dependencyAutoloadersRequired, array $dependencyAutoloadersOptional) {
         $pkg = explode('/', $composerJson['name'])[1];
 
         $content = <<<AUTOLOAD
@@ -489,8 +465,4 @@ DEPENDENCY_AUTOLOADERS_REQUIRED;
     public function getFilename() {
         return $this->filename;
     }
-
-    public function getDevFilename() {
-        return $this->devFilename;
-    }
 }