Ticket #47256: 47256.1.diff

composer.json

@@ -9 +9 @@
         "support": {
                 "issues": "https://core.trac.wordpress.org/"
         },
+        "repositories": [
+                {
+                        "type": "vcs",
+                        "url": "https://github.com/JamesHeinrich/getID3"
+                }
+        ],
+        "require": {
+                "james-heinrich/getid3": "2.0.x-dev#8cf765e",
+                "paragonie/random_compat": "^2.0",
+                "paragonie/sodium_compat": "^1.10",
+                "pear/text_diff": "^1.2",
+                "pomo/pomo": "^1.4",
+                "rmccue/requests": "^1.7",
+                "simplepie/simplepie": "^1.5"
+        },
         "require-dev": {
                 "dealerdirect/phpcodesniffer-composer-installer": "~0.5.0",
                 "wp-coding-standards/wpcs": "~2.1.0"
         },
+        "config": {
+                "optimize-autoloader": true,
+                "preferred-install": "dist",
+                "sort-packages": true
+        },
+        "minimum-stability": "dev",
+        "prefer-stable": true,
         "scripts": {
                 "format": "phpcbf --standard=phpcs.xml.dist --report-summary --report-source --cache -d memory_limit=256M",
                 "lint": "phpcs --standard=phpcs.xml.dist --report-summary --report-source --cache -d memory_limit=256M",

tools/webpack/packages.js

@@ -198 +198 @@
                 to: join( baseDir, `src/${ phpFiles[ filename ] }` ),
         } ) );
 
+        const phpLibrariesCopies = [
+                // FIXME: requires auto-loading
+                /*{
+                        from: join( baseDir, 'vendor/james-heinrich/getid3/src' ),
+                        to: join( baseDir, 'src/wp-includes/ID3' ),
+                },*/
+                // FIXME: sources have diverged
+                /*{
+                        from: join( baseDir, 'vendor/pomo/pomo/src' ),
+                        to: join( baseDir, 'src/wp-includes/pomo' ),
+                },*/
+                {
+                        from: join( baseDir, 'vendor/paragonie/random_compat/lib' ),
+                        to: join( baseDir, 'src/wp-includes/random_compat' ),
+                },
+                {
+                        from: join( baseDir, 'vendor/paragonie/sodium_compat/**/*.php' ),
+                        transformPath: function( targetPath ) {
+                                return targetPath.replace( 'vendor/paragonie', '../../' );
+                        },
+                },
+                {
+                        from: join( baseDir, 'vendor/rmccue/requests/library/Requests' ),
+                        to: join( baseDir, 'src/wp-includes/Requests' ),
+                        ignore: ['cacert.pem']
+                },
+                {
+                        from: join( baseDir, 'vendor/simplepie/simplepie/library/SimplePie' ),
+                        to: join( baseDir, 'src/wp-includes/SimplePie' ),
+                },
+                {
+                        from: join( baseDir, 'vendor/pear/text_diff/Text' ),
+                        to: join( baseDir, 'src/wp-includes/Text' ),
+                },
+        ];
+
         const config = {
                 mode,
 
@@ -269 +305 @@
                                         ...vendorCopies,
                                         ...cssCopies,
                                         ...phpCopies,
+                                        ...phpLibrariesCopies,
                                 ],
                         ),
                 ],