[6.x] Remove vendor from namespace if it exists#14100
Open
indykoning wants to merge 1 commit intostatamic:6.xfrom
Open
[6.x] Remove vendor from namespace if it exists#14100indykoning wants to merge 1 commit intostatamic:6.xfrom
indykoning wants to merge 1 commit intostatamic:6.xfrom
Conversation
Member
|
I'm hesitant to just chop off parts of a string. Seems weird that the word |
Contributor
Author
|
The word vendor ending up in the url can be made sense of by going through the following functions public function getNamespaceAndHandleFromPath($path)
{
$namespace = collect($this->directories) // No directory is mapped so we end up with 'default'
->search(function ($directory) use ($path) {
return Str::startsWith($path, $directory);
});
if ($namespace === 'default') {
// When we're given $path of "/resources/blueprints/vendor/runway/category.yaml"
// $this->directory() ("/resources/blueprints") gets stripped.
// We end up with `vendor/runway/category.yaml`
// Then we remove the .yaml suffix and end up with `vendor/runway/category` getting passed to `getNamespaceAndHandle`
return $this->getNamespaceAndHandle(Str::after(Str::before($path, '.yaml'), $this->directory().'/'));
}
$directory = $this->directories[$namespace];
$handle = Str::after(Str::before($path, '.yaml'), $directory.'/');
return [$namespace, $handle];
}
protected function getNamespaceAndHandle($blueprint)
{
// $blueprint is received as `vendor/runway/category`
$blueprint = str_replace('/', '.', $blueprint);
// $blueprint = "vendor.runway.category"
$parts = explode('.', $blueprint);
// $parts = ['vendor', 'runway', 'category']
$handle = array_pop($parts);
// $handle = "category" & $parts = ['vendor', 'runway']
$namespace = implode('.', $parts);
// $namespace = `vendor.runway`
$namespace = empty($namespace) ? null : $namespace;
return [$namespace, $handle];
}An alternative would be to require each package utilising cms/src/Fields/BlueprintRepository.php Line 26 in 88df8a5 |
This file contains hidden or 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
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.
I've run into this issue when using https://github.com/statamic-rad-pack/runway
Th blueprint edit page does have the correct url and handles set.
Once the save button is used a 404 gets thrown. Why?
Because the url is like follows
/cp/fields/blueprints/vendor.runway/categoryMeaning it will look for a blueprint with the handle
vendor.runway::categoryBringing it to code, calling
Blueprint::find('runway::category')->namespace()returnsvendor.runway(the full path to the file is
/resources/blueprints/vendor/runway/category.yaml)I'm not sure wether this should be moved to runway, but i did not seem to see a way for runway to add a path to remove to resolve the namespace.