[4.0] Cleanup classmap and include it properly for stubs generation #17667
Conversation
libraries/classmap.php
Outdated
|
|
||
| JLoader::registerAlias('JAccess', '\\Joomla\\CMS\\Access\\Access', '5.0'); | ||
| JLoader::registerAlias('JAccessRule', '\\Joomla\\CMS\\Access\\Rule', '5.0'); | ||
| JLoader::registerAlias('JAccessRules', '\\Joomla\\CMS\\Access\\Rules', '5.0'); | ||
| JLoader::registerAlias('JAccessWrapperAccess', '\\Joomla\\CMS\\Access\\Wrapper\\Access', '4.0'); | ||
| JLoader::registerAlias('JAccessExceptionNotallowed', '\\Joomla\\CMS\\Access\\Exception\\NotAllowed', '5.0'); |
There was a problem hiding this comment.
Pretty sure this one should exist :/ Have I accidently removed it in a conflict somewhere
There was a problem hiding this comment.
I can't find in core a class with the name NotAllowed.
There was a problem hiding this comment.
d5f9f72 I've added it back. Somehow the class got deleted but was being used in like 20 different places in the code :/
build/stubGenerator.php
Outdated
| @@ -25,6 +25,9 @@ | |||
| } | |||
|
|
|||
| // Get the Platform with legacy libraries. | |||
| require_once JPATH_LIBRARIES . '/bootstrap.php'; | |||
There was a problem hiding this comment.
You shouldn't need bootstrap.php and import.legacy.php I don't think. Bootstrap was a replacement and we just left the others for b/c in cli scripts
There was a problem hiding this comment.
Problem is that then the following code is not loaded which initialises the extensions
https://github.com/joomla/joomla-cms/blob/4.0-dev/libraries/bootstrap.php#L43-L45. I can add that to the stubs generator manually, otherwise the https://github.com/joomla/joomla-cms/blob/4.0-dev/libraries/extensions.classmap.php fails, because of class not found.
There was a problem hiding this comment.
What happens if we remove import.legacy.php and replace it with bootstrap?
|
I could also remove cms.php. Should be ok now, stubsgenerator works now on 4 as well. |
…olandd-4.0-dev * '4.0-dev' of https://github.com/joomla/joomla-cms: (35 commits) Delete redis handler in favor of fw handler (joomla#17798) Remove deprecated JArrayHelper (joomla#17795) [4.0] codestyle (joomla#17779) Update error renderers for PHP 7 code structure, update Exception/Throwable references to only reference Throwable (joomla#17750) Improve article association links Fix parsing routes with language filter enabled Fix JString use [4.0] Fix content margin if no "top" modules are assigned (joomla#17699) Removed required state for Secret Key field (joomla#17713) [4.0] [installation] set proper default for lastResetTime (joomla#16847) [4.0] Remove FOF From Joomla Core (joomla#17687) [4.0] Add Controller suffix to extension controllers (joomla#17624) Fix menu association form field not loading remove html imports (joomla#17691) [4.0] Update Bootstrap to beta-1 (joomla#17496) Move files [4.0] Cleanup classmap and include it properly for stubs generation (joomla#17667) Add back class that got deleted somewhere Fix Sql field class name (joomla#17666) [4.0] Fix namespaced form fields Part 2 (joomla#17664) ...
Cleanup classmap and include it properly for stubs generation.