1 files changed, 42 insertions, 25 deletions

diff --git a/php-symfony4-generate-autoloaders.php b/php-symfony4-generate-autoloaders.php
index d8f53ad..06283bc 100755
--- a/php-symfony4-generate-autoloaders.php
+++ b/php-symfony4-generate-autoloaders.php
@@ -3,7 +3,7 @@
 
 define('SYMFONY_SOURCE_DIR', __DIR__.'/src/Symfony');
 
-require_once '__PHPDIR__/Fedora/Autoloader/autoload.php';
+require_once '__PHPDIR__/Symfony/Polyfill/autoload.php';
 \Fedora\Autoloader\Autoload::addPsr4('Symfony\\', SYMFONY_SOURCE_DIR);
 
 use Symfony\Component\Finder\Finder;
@@ -42,7 +42,10 @@ final class AutoloadGenerator {
         ],
         'doctrine/cache' => [
             'prefix' => 'FEDORA_SYMFONY4_PHP_DIR',
-            'path' => 'Doctrine/Common/Cache/autoload.php',
+            'path' => [
+                'Doctrine/Common/Cache2/autoload.php',
+                'Doctrine/Common/Cache/autoload.php',
+            ],
         ],
         'doctrine/collections' => [
             'prefix' => 'FEDORA_SYMFONY4_PHP_DIR',
@@ -59,6 +62,7 @@ final class AutoloadGenerator {
         'doctrine/persistence' => [
             'prefix' => 'FEDORA_SYMFONY4_PHP_DIR',
             'path' => [
+                'Doctrine/Persistence3/autoload.php',
                 'Doctrine/Persistence2/autoload.php',
                 'Doctrine/Common/Persistence/autoload.php',
             ],
@@ -73,16 +77,16 @@ final class AutoloadGenerator {
         ],
         'doctrine/dbal' => [
             'prefix' => 'FEDORA_SYMFONY4_PHP_DIR',
-             [
-                'path' => 'Doctrine/DBAL3/autoload.php',
-                'path' => 'Doctrine/DBAL/autoload.php',
+             'path' => [
+                'Doctrine/DBAL3/autoload.php',
+                'Doctrine/DBAL/autoload.php',
              ],
         ],
         'doctrine/doctrine-bundle' => [
             'prefix' => 'FEDORA_SYMFONY4_PHP_DIR',
-            [
-                'path' => 'Doctrine/Bundle/DoctrineBundle2/autoload.php',
-                'path' => 'Doctrine/Bundle/DoctrineBundle/autoload.php',
+            'path' => [
+                'Doctrine/Bundle/DoctrineBundle2/autoload.php',
+                'Doctrine/Bundle/DoctrineBundle/autoload.php',
             ],
         ],
         'doctrine/orm' => [
@@ -91,7 +95,10 @@ final class AutoloadGenerator {
         ],
         'egulias/email-validator' => [
             'prefix' => 'FEDORA_SYMFONY4_PHP_DIR',
-            'path' => 'Egulias/EmailValidator2/autoload.php',
+            'path' => [
+                'Egulias/EmailValidator3/autoload.php',
+                'Egulias/EmailValidator2/autoload.php',
+            ],
         ],
         'guzzlehttp/promises' => [
             'prefix' => 'FEDORA_SYMFONY4_PHP_DIR',
@@ -113,9 +120,9 @@ final class AutoloadGenerator {
             'prefix' => 'FEDORA_SYMFONY4_PHP_DIR',
             'path' => 'Nyholm/Psr7/autoload.php',
         ],
-        'ocramius/proxy-manager' => [
+        'friendsofphp/proxy-manager-lts' => [
             'prefix' => 'FEDORA_SYMFONY4_PHP_DIR',
-            'path' => 'ProxyManager/autoload.php',
+            'path' => 'FriendsOfPHP/ProxyManager/autoload.php',
         ],
         'phpdocumentor/reflection-docblock' => [
             'prefix' => 'FEDORA_SYMFONY4_PHP_DIR',
@@ -151,7 +158,10 @@ final class AutoloadGenerator {
         ],
         'psr/simple-cache' => [
             'prefix' => 'FEDORA_SYMFONY4_PHP_DIR',
-            'path' => 'Psr/SimpleCache/autoload.php',
+            'path' => [
+                'Psr/SimpleCache2/autoload.php',
+                'Psr/SimpleCache/autoload.php',
+            ],
         ],
         'symfony/asset' => [
             'prefix' => 'FEDORA_SYMFONY4_DIR',
@@ -302,7 +312,7 @@ final class AutoloadGenerator {
         ],
         'symfony/monolog-bridge' => [
             'prefix' => 'FEDORA_SYMFONY4_DIR',
-            'path' => 'Component/Monolog/autoload.php',
+            'path' => 'Bridge/Monolog/autoload.php',
         ],
         'symfony/options-resolver' => [
             'prefix' => 'FEDORA_SYMFONY4_DIR',
@@ -316,24 +326,31 @@ final class AutoloadGenerator {
         'symfony/polyfill-intl-icu' => false,
         'symfony/polyfill-intl-idn' => false,
         'symfony/polyfill-mbstring' => false,
-        'symfony/polyfill-php72' => (PHP_VERSION_ID < 70200)
-            ? [
+        'symfony/polyfill-php72' =>
+            [
+                'prefix' => 'FEDORA_SYMFONY4_PHP_DIR', // external
+                'path' => 'Symfony/Polyfill/autoload.php',
+            ],
+        'symfony/polyfill-php73' =>
+            [
                 'prefix' => 'FEDORA_SYMFONY4_PHP_DIR', // external
                 'path' => 'Symfony/Polyfill/autoload.php',
-            ]
-            : false,
-        'symfony/polyfill-php73' => (PHP_VERSION_ID < 70300)
-            ? [
+            ],
+        'symfony/polyfill-php74' =>
+            [
                 'prefix' => 'FEDORA_SYMFONY4_PHP_DIR', // external
                 'path' => 'Symfony/Polyfill/autoload.php',
-            ]
-            : false,
-        'symfony/polyfill-php80' => (PHP_VERSION_ID < 80000)
-            ? [
+            ],
+        'symfony/polyfill-php80' =>
+            [
                 'prefix' => 'FEDORA_SYMFONY4_PHP_DIR', // external
                 'path' => 'Symfony/Polyfill/autoload.php',
-            ]
-            : false,
+            ],
+        'symfony/polyfill-php81' =>
+            [
+                'prefix' => 'FEDORA_SYMFONY4_PHP_DIR', // external
+                'path' => 'Symfony/Polyfill/autoload.php',
+            ],
         'symfony/process' => [
             'prefix' => 'FEDORA_SYMFONY4_DIR',
             'path' => 'Component/Process/autoload.php',