feat: update autoloading and metadata configuration, improve validation paths

Author: Vitexus

.vscode/settings.json

@@ -3,25 +3,10 @@
         "Pohoda"
     ],
     "workbench.colorCustomizations": {
-        "activityBar.background": "#ba3b14",
-        "titleBar.activeBackground": "#ba3b14",
-        "titleBar.activeForeground": "#000000",
-        "titleBar.inactiveBackground": "#ba3b14",
-        "titleBar.inactiveForeground": "#000000",
-        "titleBar.border": "#ba3b14",
-        "activityBar.foreground": "#000000",
-        "statusBar.background": "#ba3b14",
-        "statusBar.foreground": "#000000",
-        "statusBar.debuggingBackground": "#ba3b14",
-        "statusBar.debuggingForeground": "#000000",
-        "tab.activeBorder": "#ba3b14",
         "iLoveWorkSpaceColors": true,
         "iLoveWorkSpaceRandom": false,
-        "activityBar.inactiveForeground": "#b69ed6",
         "activityBar.activeBorder": "#f8fbf5",
-        "activityBar.activeBackground": "#AB0552",
-        "activityBar.border": "#AB0552",
-        "statusBar.border": "#AB0552"
+        "activityBar.border": "#AB0552"
     },
     "php.version": "8.4"
 }

debian/autoload.php

@@ -4,6 +4,9 @@
 
 require_once '/usr/share/php/Composer/InstalledVersions.php';
 require_once '/usr/share/php/Ease/autoload.php';
+require_once '/usr/share/php/Lightools/Xml/autoload.php';
+require_once '/usr/share/php/Riesenia/Pohoda/autoload.php';
+require_once '/usr/share/php/PohodaSer/autoload.php';
 
 spl_autoload_register(function (string $class): void {
     $prefix = 'mServer\\';

…exsoftware_pohoda_connector.metainfo.xml …exsoftware-pohoda-connector.metainfo.xmldebian/io.github.vitexsoftware.php_vitexsoftware_pohoda_connector.metainfo.xml renamed to debian/php-vitexsoftware-pohoda-connector.metainfo.xml debian/io.github.vitexsoftware.php_vitexsoftware_pohoda_connector.metainfo.xml renamed to debian/php-vitexsoftware-pohoda-connector.metainfo.xml

@@ -16,8 +16,7 @@ override_dh_install:
 	sed -i "s|'library'|'$(PKG_TYPE)'|g" debian/php-vitexsoftware-pohoda-connector/usr/share/php/mServer/autoload.php
 	# Version stamp from main composer.json
 	jq '.version = "$(PKG_VERSION)"' composer.json | sponge debian/php-vitexsoftware-pohoda-connector/usr/share/php/mServer/composer.json
-	sed -i -e "s/\/\.\.\/\.\.\//\//g" debian/php-vitexsoftware-pohoda-connector/usr/share/php/mServer/Client.php
 
 override_dh_auto_test:
 	appstreamcli validate --pedantic --no-net \
-	    debian/io.github.vitexsoftware.php_vitexsoftware_pohoda_connector.metainfo.xml
+	    debian/php-vitexsoftware-pohoda-connector.metainfo.xml

debian/rules

@@ -561,7 +561,7 @@ public function processResponse(int $httpCode): bool
                     }
 
                     if ($this->debug) {
-                        $this->addStatusMessage('validate request by: xmllint --schema '.\dirname(__DIR__, 3).'/pohodaser/xsd/data.xsd '.$this->xmlCache.' --noout', 'debug');
+                        $this->addStatusMessage('validate request by: xmllint --schema '.\Composer\InstalledVersions::getInstallPath('vitexsoftware/pohodaser').'/xsd/data.xsd '.$this->xmlCache.' --noout', 'debug');
                     }
 
                     libxml_use_internal_errors(false);
@@ -665,7 +665,7 @@ public function commit(): bool
         $this->setPostFields(file_get_contents($this->xmlCache));
 
         if ($this->debug) {
-            $this->addStatusMessage('validate request by: xmllint --schema '.\dirname(__DIR__, 3).'/pohodaser/xsd/data.xsd '.$this->xmlCache.' --noout', 'debug');
+            $this->addStatusMessage('validate request by: xmllint --schema '.\Composer\InstalledVersions::getInstallPath('vitexsoftware/pohodaser').'/xsd/data.xsd '.$this->xmlCache.' --noout', 'debug');
         }
 
         return $this->performRequest('/xml');

src/mServer/Client.php

@@ -675,7 +675,7 @@ public static function deserialize(string $rawXml): ?\Pohoda\Response\ResponsePa
     {
         $responsePack = null;
         $serializerBuilder = SerializerBuilder::create();
-        $serializerBuilder->addMetadataDir(\dirname(__DIR__, 2).'/vendor/vitexsoftware/pohodaser/metadata/', 'Pohoda');
+        $serializerBuilder->addMetadataDir(\Composer\InstalledVersions::getInstallPath('vitexsoftware/pohodaser').'/metadata/', 'Pohoda');
         $serializerBuilder->configureHandlers(static function (HandlerRegistryInterface $handler) use ($serializerBuilder): void {
             $serializerBuilder->addDefaultHandlers();
             $handler->registerSubscribingHandler(new BaseTypesHandler()); // XMLSchema List handling