Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions bin/qualify-core-references.php
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,14 @@
}
}
$webRoot = dirname($srcRoot);
foreach (['pages', 'hooks', 'reports', 'events'] as $dir) {
foreach (glob($webRoot . '/lib/' . $dir . '/*.php') as $path) {
$short = preg_replace('/\\.(page|hook|report|event)$/', '', basename($path, '.php'));
$src = file_get_contents($path);
if (preg_match('/^\\s*(?:final\\s+|abstract\\s+)*class\\s+(\\w+)/mi', $src, $m)) {
$core[strtolower($m[1])] = 'FOG\\' . $m[1];
}
}
}
// The lib/{pages,hooks,reports,events} pass that used to run here is gone
// with the directories it read. Those 52 classes were the last holdouts in
// the flat `namespace FOG;`, kept there because discovery derived their name
// from the filename; they are PSR-4 files under src/{Pages,Hooks,Reports,
// Events} now, so the src/ walk above already maps them -- and maps them to
// the bucketed FQCN a plugin actually has to write. Keeping the pass would
// have been worse than redundant: it ran AFTER the walk and overwrote each
// entry with the flat `FOG\<Class>` spelling, which no longer resolves.
foreach (glob($webRoot . '/commons/*.php') as $path) {
if (preg_match_all(
'/^\\s*(?:final\\s+|abstract\\s+)*class\\s+(\\w+)/mi',
Expand Down
2 changes: 1 addition & 1 deletion ldap/reports/ldap_report.report.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
* @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link https://fogproject.org
*/
class LDAP_Report extends \FOG\ReportManagement
class LDAP_Report extends \FOG\Pages\ReportManagement
{
/**
* The page to display.
Expand Down
2 changes: 1 addition & 1 deletion location/reports/location_report.report.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
* @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link https://fogproject.org
*/
class Location_Report extends \FOG\ReportManagement
class Location_Report extends \FOG\Pages\ReportManagement
{
/**
* The page to display.
Expand Down
2 changes: 1 addition & 1 deletion ou/reports/ou_report.report.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
* @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link https://fogproject.org
*/
class OU_Report extends \FOG\ReportManagement
class OU_Report extends \FOG\Pages\ReportManagement
{
/**
* The page to display.
Expand Down
2 changes: 1 addition & 1 deletion subnetgroup/reports/subnetgroup_report.report.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
* @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link https://fogproject.org
*/
class SubnetGroup_Report extends \FOG\ReportManagement
class SubnetGroup_Report extends \FOG\Pages\ReportManagement
{
/**
* The page to display.
Expand Down
2 changes: 1 addition & 1 deletion taskstateedit/reports/taskstateedit_report.report.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
* @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link https://fogproject.org
*/
class Taskstateedit_Report extends \FOG\ReportManagement
class Taskstateedit_Report extends \FOG\Pages\ReportManagement
{
/**
* The page to display.
Expand Down
2 changes: 1 addition & 1 deletion tasktypeedit/reports/tasktypeedit_report.report.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
* @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link https://fogproject.org
*/
class Tasktypeedit_Report extends \FOG\ReportManagement
class Tasktypeedit_Report extends \FOG\Pages\ReportManagement
{
/**
* The page to display.
Expand Down
2 changes: 1 addition & 1 deletion windowskey/reports/windowskey_report.report.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
* @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link https://fogproject.org
*/
class WindowsKey_Report extends \FOG\ReportManagement
class WindowsKey_Report extends \FOG\Pages\ReportManagement
{
/**
* The page to display.
Expand Down
2 changes: 1 addition & 1 deletion wolbroadcast/reports/wolbroadcast_report.report.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
* @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link https://fogproject.org
*/
class Wolbroadcast_Report extends \FOG\ReportManagement
class Wolbroadcast_Report extends \FOG\Pages\ReportManagement
{
/**
* The page to display.
Expand Down