POC: manage third party libs via composer #8240
Draft
+290
−3,866
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
remove more calls to code in sources folder
live627
reviewed
Jun 11, 2024
live627
reviewed
Jun 11, 2024
Co-authored-by: John Rayes <live627@gmail.com>
Co-authored-by: John Rayes <live627@gmail.com>
live627
reviewed
Jun 18, 2024
| @@ -1523,8 +1523,7 @@ public static function getFileVersions(array &$versionOptions): array | |||
| ); | |||
|
|
|||
| $ignore_sources = [ | |||
| Config::$sourcedir . '/minify/*', | |||
| Config::$sourcedir . '/ReCaptcha/*', | |||
| Config::$vendordir . '/*', | |||
There was a problem hiding this comment.
If I'm reading the code right, this line can go because ``$vendordiris outside of$sourcedir`, no?
live627
reviewed
Jun 18, 2024
Comment on lines
-1681
to
+1695
| include_once implode(DIRECTORY_SEPARATOR, [Config::$sourcedir, 'minify', 'src', 'Exception.php']); | ||
| include_once implode(DIRECTORY_SEPARATOR, [Config::$vendordir, 'minify', 'src', 'Exception.php']); | ||
|
|
||
| include_once implode(DIRECTORY_SEPARATOR, [Config::$sourcedir, 'minify', 'src', 'Exceptions', 'BasicException.php']); | ||
| include_once implode(DIRECTORY_SEPARATOR, [Config::$vendordir, 'minify', 'src', 'Exceptions', 'BasicException.php']); | ||
|
|
||
| include_once implode(DIRECTORY_SEPARATOR, [Config::$sourcedir, 'minify', 'src', 'Exceptions', 'FileImportException.php']); | ||
| include_once implode(DIRECTORY_SEPARATOR, [Config::$vendordir, 'minify', 'src', 'Exceptions', 'FileImportException.php']); | ||
|
|
||
| include_once implode(DIRECTORY_SEPARATOR, [Config::$sourcedir, 'minify', 'src', 'Exceptions', 'IOException.php']); | ||
| include_once implode(DIRECTORY_SEPARATOR, [Config::$vendordir, 'minify', 'src', 'Exceptions', 'IOException.php']); | ||
|
|
||
| include_once implode(DIRECTORY_SEPARATOR, [Config::$sourcedir, 'minify', 'src', 'Minify.php']); | ||
| include_once implode(DIRECTORY_SEPARATOR, [Config::$vendordir, 'minify', 'src', 'Minify.php']); | ||
|
|
||
| include_once implode(DIRECTORY_SEPARATOR, [Config::$sourcedir, 'minify', 'path-converter', 'src', 'Converter.php']); | ||
| include_once implode(DIRECTORY_SEPARATOR, [Config::$vendordir, 'minify', 'path-converter', 'src', 'Converter.php']); | ||
|
|
||
| include_once implode(DIRECTORY_SEPARATOR, [Config::$sourcedir, 'minify', 'src', 'CSS.php']); | ||
| include_once implode(DIRECTORY_SEPARATOR, [Config::$vendordir, 'minify', 'src', 'CSS.php']); | ||
|
|
||
| include_once implode(DIRECTORY_SEPARATOR, [Config::$sourcedir, 'minify', 'src', 'JS.php']); | ||
| include_once implode(DIRECTORY_SEPARATOR, [Config::$vendordir, 'minify', 'src', 'JS.php']); |
There was a problem hiding this comment.
would it not be better to just include the Composer autoload file here?
live627
reviewed
Jun 18, 2024
| @@ -54,7 +54,7 @@ | |||
| } | |||
|
|
|||
| // 4. Get some more stuff we need. | |||
| require_once $sourcedir . '/Autoloader.php'; | |||
| require_once '/vendor/autoload.php'; | |||
There was a problem hiding this comment.
why the leading slash? Wouldn't that try to look in the top directory?
Sesquipedalian
requested changes
Jun 24, 2024
Comment on lines
+137
to
+162
| $loader = require SMF\Config::$vendordir . '/autoload.php'; | ||
| $third_party_mappers = []; | ||
|
|
||
| // Ensure $sourcedir is set to something valid. | ||
| if (class_exists(Config::class, false) && isset(Config::$sourcedir)) { | ||
| $sourcedir = Config::$sourcedir; | ||
| } | ||
|
|
||
| require_once SMF\Config::$sourcedir . '/Autoloader.php'; | ||
| if (empty($sourcedir) || !is_dir($sourcedir)) { | ||
| $sourcedir = __DIR__; | ||
| } | ||
|
|
||
| // Do any third-party scripts want in on the fun? | ||
| if (!defined('SMF_INSTALLING') && class_exists(Config::class, false)) { | ||
| if (!class_exists(IntegrationHook::class, false) && is_file($sourcedir . '/IntegrationHook.php')) { | ||
| require_once $sourcedir . '/IntegrationHook.php'; | ||
| } | ||
|
|
||
| if (class_exists(IntegrationHook::class, false)) { | ||
| IntegrationHook::call('integrate_autoload', [&$third_party_mappers]); | ||
| } | ||
| } | ||
|
|
||
| foreach ($third_party_mappers as $prefix => $dirname) { | ||
| $loader->addPsr4($prefix, $dirname); | ||
| } |
There was a problem hiding this comment.
I'd prefer to see this code moved back into an autoloader class file rather than having it here in index.php.
Part of the reason for moving the existing autoloading code into a separate class was to avoid polluting the global namespace with variables in index.php. (Note: when backward compatibility support is enabled we end up putting references to class variables from SMF's namespace into the global namespace anyway, but the idea is to eliminate that in a future version.)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a simple POC for allowing SMF to handle their internal third party libraries via composer.
Some key features to take into consideration for this POC