Skip to content

Commit 1f6929f

Browse files
cliffparnitzkycliffparnitzky
committed
Restructure as bundle and set Contao 5 compatibility
1 parent de29ce3 commit 1f6929f

File tree

9 files changed

+95
-156
lines changed

9 files changed

+95
-156
lines changed

‎composer.json‎

Lines changed: 34 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,45 @@
11
{
2-
"name":"contao-monitoring/monitoring-client-sensor-server",
3-
"description":"Provides a sensor for the MonitoringClient, which reads the server data.",
4-
"keywords":["contao","monitoring"],
5-
"type":"contao-module",
6-
"homepage":"https://github.com/ContaoMonitoring/monitoring-client-sensor-server",
7-
"license":"LGPL-3.0-or-later",
8-
"authors":[
2+
"name": "contao-monitoring/monitoring-client-sensor-server",
3+
"description": "Provides a sensor for the MonitoringClient, which reads the server data.",
4+
"keywords": [
5+
"contao",
6+
"monitoring"
7+
],
8+
"type": "contao-module",
9+
"homepage": "https://github.com/ContaoMonitoring/monitoring-client-sensor-server",
10+
"license": "LGPL-3.0-or-later",
11+
"authors": [
912
{
10-
"name":"Cliff Parnitzky",
11-
"email":"contao@cliff-parnitzky.de",
12-
"role":"Developer"
13+
"name": "Cliff Parnitzky",
14+
"email": "contao@cliff-parnitzky.de",
15+
"role": "Developer"
1316
}
1417
],
15-
"support":{
16-
"email":"contao@cliff-parnitzky.de",
17-
"issues":"https://github.com/ContaoMonitoring/monitoring-client-sensor-server/issues",
18-
"source":"https://github.com/ContaoMonitoring/monitoring-client-sensor-server"
18+
"support": {
19+
"email": "contao@cliff-parnitzky.de",
20+
"issues": "https://github.com/ContaoMonitoring/monitoring-client-sensor-server/issues",
21+
"source": "https://github.com/ContaoMonitoring/monitoring-client-sensor-server"
1922
},
20-
"require":{
21-
"php":">=7.4",
22-
"contao/core-bundle":"~4.9",
23-
"contao-community-alliance/composer-plugin":"~3.0",
24-
"contao-monitoring/monitoring-client":"~1.0"
23+
"require": {
24+
"php": "^8.1",
25+
"contao/core-bundle": "^5.0",
26+
"contao-monitoring/monitoring-client": "~2.0"
2527
},
26-
"extra":{
27-
"contao":{
28-
"sources":{
29-
"system/modules/MonitoringClientSensorServer":"system/modules/MonitoringClientSensorServer"
30-
}
28+
"autoload": {
29+
"psr-4": {
30+
"ContaoMonitoring\\ContaoMonitoringClientSensorServer\\": "src/"
3131
},
32+
"classmap": [
33+
"contao/"
34+
],
35+
"exclude-from-classmap": [
36+
"contao/config/"
37+
]
38+
},
39+
"extra": {
40+
"contao-manager-plugin": "ContaoMonitoring\\ContaoMonitoringClientSensorServer\\ContaoManager\\Plugin",
3241
"branch-alias": {
33-
"dev-master": "1.1.x-dev"
42+
"dev-master": "2.0.x-dev"
3443
}
3544
}
3645
}

system/modules/MonitoringClientSensorServer/classes/MonitoringClientSensorServer.php renamed to contao/classes/MonitoringClientSensorServer.php

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,12 @@
3030
/**
3131
* Run in a custom namespace, so the class can be replaced
3232
*/
33-
namespace Monitoring;
33+
34+
namespace ContaoMonitoring\ContaoMonitoringClientSensorServer\Classes;
35+
36+
use Contao\Backend;
37+
use Contao\Database;
38+
use Contao\System;
3439

3540
/**
3641
* Class MonitoringClientSensorServer
@@ -40,7 +45,7 @@
4045
* @author Cliff Parnitzky
4146
* @package Controller
4247
*/
43-
class MonitoringClientSensorServer extends \Backend
48+
class MonitoringClientSensorServer extends Backend
4449
{
4550
/**
4651
* Constructor
@@ -70,16 +75,14 @@ public function readData($arrData)
7075
$arrData['php.version'] = phpversion();
7176
// Server
7277
$arrData['server.os'] = php_uname();
73-
$arrData['server.software'] = $_SERVER['SERVER_SOFTWARE'];
78+
$arrData['server.software'] = $_SERVER['SERVER_SOFTWARE'];
7479
// Database
75-
$version = \Database::getInstance()->prepare("SELECT @@version as version")->execute()->version;
80+
$version = Database::getInstance()->prepare("SELECT @@version as version")->execute()->version;
7681
$arrData['database.version'] = strpos($version, "-") ? substr($version, 0, strpos($version, "-")) : $version;
77-
$arrData['database.platform'] = basename(str_replace('\\', '/', get_class(\System::getContainer()->get('database_connection')->getDatabasePlatform())));
82+
$arrData['database.platform'] = basename(str_replace('\\', '/', get_class(System::getContainer()->get('database_connection')->getDatabasePlatform())));
7883
// Keep for backwards compatibility
7984
$arrData['mysql.version'] = $arrData['database.version'];
80-
85+
8186
return $arrData;
8287
}
8388
}
84-
85-
?>

system/modules/MonitoringClientSensorServer/config/config.php renamed to contao/config/config.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
/**
44
* Contao Open Source CMS
5-
* Copyright (C) 2005-2017 Leo Feyer
5+
* Copyright (C) 2005-2022 Leo Feyer
66
*
77
* Formerly known as TYPOlight Open Source CMS.
88
*
@@ -21,15 +21,15 @@
2121
* Software Foundation website at <http://www.gnu.org/licenses/>.
2222
*
2323
* PHP version 5
24-
* @copyright Cliff Parnitzky 2017-2017
24+
* @copyright Cliff Parnitzky 2017-2022
2525
* @author Cliff Parnitzky
2626
* @package MonitoringClientSensorServer
2727
* @license LGPL
2828
*/
2929

30+
use ContaoMonitoring\ContaoMonitoringClientSensorServer\Classes\MonitoringClientSensorServer;
31+
3032
/**
3133
* Hooks
3234
*/
33-
$GLOBALS['TL_HOOKS']['monitoringClientDataRead']['MonitoringClientSensorServer'] = array('MonitoringClientSensorServer', 'readData');
34-
35-
?>
35+
$GLOBALS['TL_HOOKS']['monitoringClientDataRead']['MonitoringClientSensorServer'] = array(MonitoringClientSensorServer::class, 'readData');

‎src/ContaoManager/Plugin.php‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
/*
6+
* @license LGPL-3.0-or-later
7+
*/
8+
9+
namespace ContaoMonitoring\ContaoMonitoringClientSensorServer\ContaoManager;
10+
11+
use Contao\CoreBundle\ContaoCoreBundle;
12+
use Contao\ManagerPlugin\Bundle\BundlePluginInterface;
13+
use Contao\ManagerPlugin\Bundle\Config\BundleConfig;
14+
use Contao\ManagerPlugin\Bundle\Parser\ParserInterface;
15+
use ContaoMonitoring\ContaoMonitoringClientSensorServer\ContaoMonitoringClientSensorServerBundle;
16+
17+
class Plugin implements BundlePluginInterface
18+
{
19+
public function getBundles(ParserInterface $parser): array
20+
{
21+
return [
22+
BundleConfig::create(ContaoMonitoringClientSensorServerBundle::class)
23+
->setLoadAfter([ContaoCoreBundle::class]),
24+
];
25+
}
26+
}

‎src/ContaoMonitoringClientSensorServerBundle.php‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
/*
6+
* @license LGPL-3.0-or-later
7+
*/
8+
9+
namespace ContaoMonitoring\ContaoMonitoringClientSensorServer;
10+
11+
use Symfony\Component\HttpKernel\Bundle\Bundle;
12+
13+
class ContaoMonitoringClientSensorServerBundle extends Bundle
14+
{
15+
public function getPath(): string
16+
{
17+
return \dirname(__DIR__);
18+
}
19+
}

‎system/modules/MonitoringClientSensorServer/config/autoload.ini‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎system/modules/MonitoringClientSensorServer/config/autoload.php‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎system/modules/MonitoringClientSensorServer/languages/de/modules.php‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎system/modules/MonitoringClientSensorServer/languages/en/modules.php‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)