<div dir="auto">Laut deinem ersten Beitrag hast du nur das Paket php7.3 installiert. Da fehlen jede Menge andere, z.B. php7.3-mysql.<div dir="auto"><br></div><div dir="auto">Grüße</div><div dir="auto">Frank</div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">dl4huf <<a href="mailto:dl4huf@t-online.de">dl4huf@t-online.de</a>> schrieb am Fr., 22. März 2019, 17:46:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div lang="DE" link="blue" vlink="#954F72"><div class="m_6629994527117106890WordSection1"><p class="MsoNormal">Danke in der /etc/apache2/mods-enabled </p><p class="MsoNormal">Müssen noch die Links von php7.0.conf und php7.0.load</p><p class="MsoNormal">In die entsprechenden php7.3.load bzw. php7.3.conf geändert werden.</p><p class="MsoNormal"><u></u> <u></u></p><p class="MsoNormal">Das habe ich nun auch.</p><p class="MsoNormal">Es gibt jetzt keine Meldungen mehr in der apache2/error.log.</p><p class="MsoNormal"><u></u> <u></u></p><p class="MsoNormal">Aber leider geht das Frontend immer noch nicht :</p><p class="MsoNormal"><img width="815" height="485" style="width:8.4916in;height:5.05in" id="m_6629994527117106890Grafik_x0020_3" src="cid:image001.png@01D4E0D6.E92A8C90" alt="cid:image001.png@01D4E0D6.E92A8C90"></p><p class="MsoNormal"><u></u> <u></u></p><p class="MsoNormal"><u></u> <u></u></p><p class="MsoNormal"><u></u> <u></u></p><p class="MsoNormal">MfG Ronald</p><p class="MsoNormal"><u></u> <u></u></p><p class="MsoNormal"><u></u> <u></u></p><p class="MsoNormal"><u></u> <u></u></p><p class="MsoNormal"><u></u> <u></u></p><div style="border:none;border-top:solid #e1e1e1 1.0pt;padding:3.0pt 0cm 0cm 0cm"><p class="MsoNormal" style="border:none;padding:0cm"><b>Von: </b><a href="mailto:cpuidle@gmail.com" target="_blank" rel="noreferrer">Andreas Götz</a><br><b>Gesendet: </b>Freitag, 22. März 2019 17:22<br><b>An: </b><a href="mailto:volkszaehler-users@demo.volkszaehler.org" target="_blank" rel="noreferrer">volkszaehler.org - users</a><br><b>Betreff: </b>Re: [vz-users] Volkszähler 2.0 - Neue Features</p></div><p class="MsoNormal"><u></u> <u></u></p><p class="MsoNormal" style="margin-bottom:12.0pt">Nein, aber der Parserfehler ist m.E. falsche php Version. Da stimmt was mit Deiner Apacheconfig nicht. <u></u><u></u></p><div id="m_6629994527117106890AppleMailSignature"><p class="MsoNormal">Viele Grüße,<u></u><u></u></p><div><p class="MsoNormal">Andreas<u></u><u></u></p></div></div><div><p class="MsoNormal" style="margin-bottom:12.0pt"><br>Am 22.03.2019 um 17:17 schrieb dl4huf <<a href="mailto:dl4huf@t-online.de" target="_blank" rel="noreferrer">dl4huf@t-online.de</a>>:<u></u><u></u></p></div><blockquote style="margin-top:5.0pt;margin-bottom:5.0pt"><div><p class="MsoNormal">Nein ist php 7.3<u></u><u></u></p><p class="MsoNormal"> <u></u><u></u></p><p class="MsoNormal">Ist das zu hoch ?<u></u><u></u></p><p class="MsoNormal"> <u></u><u></u></p><p class="MsoNormal">MfG Ronald<u></u><u></u></p><p class="MsoNormal"> <u></u><u></u></p><div style="border:none;border-top:solid #e1e1e1 1.0pt;padding:3.0pt 0cm 0cm 0cm"><p class="MsoNormal"><b>Von: </b><a href="mailto:cpuidle@gmail.com" target="_blank" rel="noreferrer">Andreas Götz</a><br><b>Gesendet: </b>Freitag, 22. März 2019 17:12<br><b>An: </b><a href="mailto:volkszaehler-users@demo.volkszaehler.org" target="_blank" rel="noreferrer">volkszaehler.org - users</a><br><b>Betreff: </b>Re: [vz-users] Volkszähler 2.0 - Neue Features<u></u><u></u></p></div><p class="MsoNormal"> <u></u><u></u></p><p class="MsoNormal" style="margin-bottom:12.0pt">Kein php 7.1?<u></u><u></u></p><div id="m_6629994527117106890AppleMailSignature"><p class="MsoNormal">Viele Grüße,<u></u><u></u></p><div><p class="MsoNormal">Andreas<u></u><u></u></p></div></div><div><p class="MsoNormal" style="margin-bottom:12.0pt"><br>Am 22.03.2019 um 17:02 schrieb dl4huf <<a href="mailto:dl4huf@t-online.de" target="_blank" rel="noreferrer">dl4huf@t-online.de</a>>:<u></u><u></u></p></div><blockquote style="margin-top:5.0pt;margin-bottom:5.0pt"><div><p class="MsoNormal">Die apache2.conf hatte ich vergessen und nun nachgeholt.<u></u><u></u></p><p class="MsoNormal">Allerdings ändert das erst mal nichts.<u></u><u></u></p><p class="MsoNormal">Bei mit sehen die Fehler aber anders aus :<u></u><u></u></p><p class="MsoNormal"> <u></u><u></u></p><p class="MsoNormal">Ich bekommen einen „500 Internal Server Error“<u></u><u></u></p><p class="MsoNormal"> <u></u><u></u></p><p class="MsoNormal"><4B1AB0B0569F4D29B8E8C95C2D992CCB.png><u></u><u></u></p><p class="MsoNormal"> <u></u><u></u></p><p class="MsoNormal">Im apache2/error.log steht mehrfach  :<u></u><u></u></p><p class="MsoNormal">[Fri Mar 22 16:32:21.448134 2019] [:error] [pid 30191] [client <a href="http://192.168.30.64:37485" target="_blank" rel="noreferrer">192.168.30.64:37485</a>] PHP Parse error:  syntax error, unexpected '?' in /var/www/<a href="http://volkszaehler.org/vendor/symfony/yaml/Parser.php" target="_blank" rel="noreferrer">volkszaehler.org/vendor/symfony/yaml/Parser.php</a> on line 509<u></u><u></u></p><p class="MsoNormal">[Fri Mar 22 16:32:21.492292 2019] [:error] [pid 28194] [client <a href="http://192.168.30.64:37486" target="_blank" rel="noreferrer">192.168.30.64:37486</a>] PHP Parse error:  syntax error, unexpected '?' in /var/www/<a href="http://volkszaehler.org/vendor/symfony/yaml/Parser.php" target="_blank" rel="noreferrer">volkszaehler.org/vendor/symfony/yaml/Parser.php</a> on line 509<u></u><u></u></p><p class="MsoNormal"> <u></u><u></u></p><p class="MsoNormal">Die betroffene Zeile sieht so aus :<u></u><u></u></p><p class="MsoNormal">    private function getNextEmbedBlock(int $indentation = null, bool $inSequence = false): ?string<u></u><u></u></p><p class="MsoNormal"> <u></u><u></u></p><p class="MsoNormal">Wenn ich das ? hier entferne kommt bei Zeile 1052 noch mal und wenn ich auch da entferne geht’s bei <u></u><u></u></p><p class="MsoNormal">/var/www/<a href="http://volkszaehler.org/vendor/symfony/debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php" target="_blank" rel="noreferrer">volkszaehler.org/vendor/symfony/debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php</a> weiter.<u></u><u></u></p><p class="MsoNormal">Das ist also nicht die Lösung uns sieht nach einem Problem mit der PHP-Syntax aus.<u></u><u></u></p><p class="MsoNormal"> <u></u><u></u></p><p class="MsoNormal"> <u></u><u></u></p><p class="MsoNormal">Eine Idee ?<u></u><u></u></p><p class="MsoNormal"> <u></u><u></u></p><p class="MsoNormal">MfG Ronald<u></u><u></u></p><p class="MsoNormal"> <u></u><u></u></p><p class="MsoNormal"> <u></u><u></u></p><p class="MsoNormal"> <u></u><u></u></p><p class="MsoNormal"> <u></u><u></u></p><p class="MsoNormal"> <u></u><u></u></p><p class="MsoNormal"> <u></u><u></u></p><p class="MsoNormal"> <u></u><u></u></p><div style="border:none;border-top:solid #e1e1e1 1.0pt;padding:3.0pt 0cm 0cm 0cm"><p class="MsoNormal"><b>Von: </b><a href="mailto:tgut@gmx.de" target="_blank" rel="noreferrer">Thomas Suess</a><br><b>Gesendet: </b>Freitag, 22. März 2019 15:32<br><b>An: </b><a href="mailto:volkszaehler-users@demo.volkszaehler.org" target="_blank" rel="noreferrer">volkszaehler-users@demo.volkszaehler.org</a><br><b>Betreff: </b>Re: [vz-users] Volkszähler 2.0 - Neue Features<u></u><u></u></p></div><p class="MsoNormal"> <u></u><u></u></p><p class="MsoNormal"><span style="font-size:9.0pt;font-family:"Verdana",sans-serif"> </span><u></u><u></u></p><div><p class="MsoNormal"><span style="font-size:9.0pt;font-family:"Verdana",sans-serif">Folgenden Fehler kann ich im Debugmode im Browser sehen.</span><u></u><u></u></p></div><div><p class="MsoNormal"><span style="font-size:9.0pt;font-family:"Verdana",sans-serif"> </span><u></u><u></u></p></div><div><div><p class="MsoNormal"><span style="font-size:9.0pt;font-family:"Verdana",sans-serif"><!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN"><br><html><head><br><title>404 Not Found</title><br></head><body><br><h1>Not Found</h1><br><p>The requested URL /capabilities/definitions.json was not found on this server.</p><br><hr><br><address>Apache/2.4.10 (Debian) Server at xxx.xxxxxx.xxx Port 80</address><br></body></html></span><u></u><u></u></p></div><div><p class="MsoNormal"><span style="font-size:9.0pt;font-family:"Verdana",sans-serif"> </span><u></u><u></u></p></div><div><p class="MsoNormal"><span style="font-size:9.0pt;font-family:"Verdana",sans-serif"> </span><u></u><u></u></p></div><div><p class="MsoNormal"><span style="font-size:9.0pt;font-family:"Verdana",sans-serif">Viele Grüße</span><u></u><u></u></p></div><div><p class="MsoNormal"><span style="font-size:9.0pt;font-family:"Verdana",sans-serif">Gudi</span><u></u><u></u></p></div><div><p class="MsoNormal"><span style="font-size:9.0pt;font-family:"Verdana",sans-serif"> </span><u></u><u></u></p></div><div style="border:none;border-left:solid #c3d9e5 1.5pt;padding:0cm 0cm 0cm 8.0pt;margin-left:7.5pt;margin-top:7.5pt;margin-right:3.75pt;margin-bottom:3.75pt;word-wrap:break-word" name="quote"><div style="margin-bottom:7.5pt"><p class="MsoNormal" style="margin-left:210.0pt"><b><span style="font-size:9.0pt;font-family:"Verdana",sans-serif">Gesendet:</span></b><span style="font-size:9.0pt;font-family:"Verdana",sans-serif"> Freitag, 22. März 2019 um 15:25 Uhr<br><b>Von:</b> "Thomas Suess" <<a href="mailto:tgut@gmx.de" target="_blank" rel="noreferrer">tgut@gmx.de</a>><br><b>An:</b> <a href="mailto:volkszaehler-users@demo.volkszaehler.org" target="_blank" rel="noreferrer">volkszaehler-users@demo.volkszaehler.org</a><br><b>Betreff:</b> Re: [vz-users] Volkszähler 2.0 - Neue Features</span><u></u><u></u></p></div><div name="quoted-content"><div><div><div><p class="MsoNormal" style="margin-left:210.0pt"><span style="font-size:9.0pt;font-family:"Verdana",sans-serif">Hallo,</span><u></u><u></u></p></div><div><p class="MsoNormal" style="margin-left:210.0pt"><span style="font-size:9.0pt;font-family:"Verdana",sans-serif"> </span><u></u><u></u></p></div><div><p class="MsoNormal" style="margin-left:210.0pt"><span style="font-size:9.0pt;font-family:"Verdana",sans-serif">ich habe den gleichen Fehler.</span><u></u><u></u></p></div><div><p class="MsoNormal" style="margin-left:210.0pt"><span style="font-size:9.0pt;font-family:"Verdana",sans-serif"> </span><u></u><u></u></p></div><div><p class="MsoNormal" style="margin-left:210.0pt"><span style="font-size:9.0pt;font-family:"Verdana",sans-serif">Die Apache conf habe ich angepasst.</span><u></u><u></u></p></div><div><p class="MsoNormal" style="margin-left:210.0pt"><span style="font-size:9.0pt;font-family:"Verdana",sans-serif"> </span><u></u><u></u></p></div><div><div><p class="MsoNormal" style="margin-left:210.0pt"><span style="font-size:9.0pt;font-family:"Verdana",sans-serif"><br><Directory /><br>        Options FollowSymLinks<br>        AllowOverride All AuthConfig<br>        Require all granted<br></Directory></span><u></u><u></u></p></div><div><p class="MsoNormal" style="margin-left:210.0pt"><span style="font-size:9.0pt;font-family:"Verdana",sans-serif"><Directory /usr/share><br>        AllowOverride None<br>        Require all granted<br></Directory></span><u></u><u></u></p></div><div><p class="MsoNormal" style="margin-left:210.0pt"><span style="font-size:9.0pt;font-family:"Verdana",sans-serif"><Directory /var/www/><br>        Options Indexes FollowSymLinks<br>        AllowOverride All AuthConfig<br>        Require all granted<br></Directory></span><u></u><u></u></p></div><div><p class="MsoNormal" style="margin-left:210.0pt"><span style="font-size:9.0pt;font-family:"Verdana",sans-serif"> </span><u></u><u></u></p></div></div><div><p class="MsoNormal" style="margin-left:210.0pt"><span style="font-size:9.0pt;font-family:"Verdana",sans-serif"> </span><u></u><u></u></p></div><div><p class="MsoNormal" style="margin-left:210.0pt"><span style="font-size:9.0pt;font-family:"Verdana",sans-serif"> </span><u></u><u></u></p></div><div><p class="MsoNormal" style="margin-left:210.0pt"><span style="font-size:9.0pt;font-family:"Verdana",sans-serif">Im Appache Log bekomme ich folgenden Fehler:</span><u></u><u></u></p></div><div><p class="MsoNormal" style="margin-left:210.0pt"><span style="font-size:9.0pt;font-family:"Verdana",sans-serif"> </span><u></u><u></u></p></div><div><div><p class="MsoNormal" style="margin-left:210.0pt"><span style="font-size:9.0pt;font-family:"Verdana",sans-serif"><br>[Fri Mar 22 15:14:00.161799 2019] [:error] [pid 1801] [client <a href="http://192.168.2.10:36235" target="_blank" rel="noreferrer">192.168.2.10:36235</a>] PHP Fatal error:  Uncaught Error: Class 'Symfony\\Component\\Yaml\\Yaml' not found in /var/www/<a href="http://volkszaehler.org/lib/Util/Configuration.php:88/nStack" target="_blank" rel="noreferrer">volkszaehler.org/lib/Util/Configuration.php:88\nStack</a> trace:\n#0 /var/www/<a href="http://volkszaehler.org/lib/bootstrap.php" target="_blank" rel="noreferrer">volkszaehler.org/lib/bootstrap.php</a>(63): Volkszaehler\\Util\\Configuration::loadYaml('/var/www/volksz...')\n#1 /var/www/<a href="http://volkszaehler.org/htdocs/middleware.php" target="_blank" rel="noreferrer">volkszaehler.org/htdocs/middleware.php</a>(35): require('/var/www/volksz...')\n#2 {main}\n  thrown in /var/www/<a href="http://volkszaehler.org/lib/Util/Configuration.php" target="_blank" rel="noreferrer">volkszaehler.org/lib/Util/Configuration.php</a> on line 88</span><u></u><u></u></p></div><div><p class="MsoNormal" style="margin-left:210.0pt"><span style="font-size:9.0pt;font-family:"Verdana",sans-serif"> </span><u></u><u></u></p></div></div><div><div><p class="MsoNormal" style="margin-left:210.0pt"><span style="font-size:9.0pt;font-family:"Verdana",sans-serif"> </span><u></u><u></u></p></div><div><p class="MsoNormal" style="margin-left:210.0pt"><span style="font-size:9.0pt;font-family:"Verdana",sans-serif">Viele Grüße</span><u></u><u></u></p></div><div><p class="MsoNormal" style="margin-left:210.0pt"><span style="font-size:9.0pt;font-family:"Verdana",sans-serif">Gudi</span><u></u><u></u></p></div><div><p class="MsoNormal" style="margin-left:210.0pt"><span style="font-size:9.0pt;font-family:"Verdana",sans-serif"> </span><u></u><u></u></p></div><div><p class="MsoNormal" style="margin-left:210.0pt"><span style="font-size:9.0pt;font-family:"Verdana",sans-serif"> </span><u></u><u></u></p></div><div style="border:none;border-left:solid #c3d9e5 1.5pt;padding:0cm 0cm 0cm 8.0pt;margin-left:7.5pt;margin-top:7.5pt;margin-right:3.75pt;margin-bottom:3.75pt"><div style="margin-bottom:7.5pt"><p class="MsoNormal" style="margin-left:240.0pt"><b><span style="font-size:9.0pt;font-family:"Verdana",sans-serif">Gesendet:</span></b><span style="font-size:9.0pt;font-family:"Verdana",sans-serif"> Freitag, 22. März 2019 um 15:12 Uhr<br><b>Von:</b> "Andreas Götz" <<a href="mailto:cpuidle@gmail.com" target="_blank" rel="noreferrer">cpuidle@gmail.com</a>><br><b>An:</b> "<a href="http://volkszaehler.org" target="_blank" rel="noreferrer">volkszaehler.org</a> - users" <<a href="mailto:volkszaehler-users@demo.volkszaehler.org" target="_blank" rel="noreferrer">volkszaehler-users@demo.volkszaehler.org</a>><br><b>Betreff:</b> Re: [vz-users] Volkszähler 2.0 - Neue Features</span><u></u><u></u></p></div><div><div><p class="MsoNormal" style="margin-left:240.0pt"><span style="font-size:9.0pt;font-family:"Verdana",sans-serif">Apache conf angepasst? Siehe Mailingliste. <br>  </span><u></u><u></u></p><div id="m_6629994527117106890AppleMailSignature"><p class="MsoNormal" style="margin-left:240.0pt"><span style="font-size:9.0pt;font-family:"Verdana",sans-serif">Viele Grüße, </span><u></u><u></u></p><div><p class="MsoNormal" style="margin-left:240.0pt"><span style="font-size:9.0pt;font-family:"Verdana",sans-serif">Andreas</span><u></u><u></u></p></div></div><div><p class="MsoNormal" style="margin-left:240.0pt"><span style="font-size:9.0pt;font-family:"Verdana",sans-serif"><br>Am 22.03.2019 um 13:41 schrieb dl4huf <<a href="mailto:dl4huf@t-online.de" target="_blank" rel="noreferrer">dl4huf@t-online.de</a>>:<br> </span><u></u><u></u></p></div><blockquote style="margin-top:5.0pt;margin-bottom:5.0pt"><div><p class="MsoNormal" style="margin-left:384.0pt">Hallo<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt"> <u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">Ich wollte eben mal testen ob ich das Update hinbekomme.<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">Leider nein.<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">Umgebung : Volkszähler läuft auf einem virtuellen Ubuntu 16.0.4.<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">Die Daten kommen von einem 5xS0-Hutschienen-Controller (Ethersex).<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt"> <u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">In dem Ubuntu habe ich die PHP-Version von 7.0 auf 7.3 angehoben :<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt"> <u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">#sudo add-apt-repository ppa:ondrej/php<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">#sudo apt-get update<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">#sudo apt-get install php7.3<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">#php -v<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">PHP 7.3.3-1+ubuntu16.04.1+<a href="http://deb.sury.org" target="_blank" rel="noreferrer">deb.sury.org</a>+1 (cli) (built: Mar  7 2019 20:31:26) ( NTS )<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">Copyright (c) 1997-2018 The PHP Group<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">Zend Engine v3.3.3, Copyright (c) 1998-2018 Zend Technologies<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">    with Zend OPcache v7.3.3-1+ubuntu16.04.1+<a href="http://deb.sury.org" target="_blank" rel="noreferrer">deb.sury.org</a>+1, Copyright (c) 1999-2018, by Zend Technologies<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt"> <u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">dann:<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt"> <u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">#cd /var/www/<a href="http://volkszaehler.org" target="_blank" rel="noreferrer">volkszaehler.org</a><u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">#git pull<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt"># git pull<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">remote: Enumerating objects: 491, done.<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">remote: Counting objects: 100% (491/491), done.<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">remote: Compressing objects: 100% (27/27), done.<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">remote: Total 1004 (delta 469), reused 480 (delta 464), pack-reused 513<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">Empfange Objekte: 100% (1004/1004), 380.01 KiB | 0 bytes/s, Fertig.<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">Löse Unterschiede auf: 100% (748/748), abgeschlossen mit 128 lokalen Objekten.<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">Von <a href="https://github.com/volkszaehler/volkszaehler.org" target="_blank" rel="noreferrer">https://github.com/volkszaehler/volkszaehler.org</a><u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">   e2205a5..005c300  master     -> origin/master<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">* [neues Tag]       0.6        -> 0.6<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">* [neues Tag]       0.7        -> 0.7<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">* [neues Tag]       1.0        -> 1.0<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">Aktualisiere e2205a5..005c300<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">Fast-forward<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">.dockerignore                                                                           |   3 +<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">.gitignore                                                                              |  18 +-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">.gitmodules                                                                             |   3 -<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">.php_cs                                                                                 |  32 +++<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">.phpstan.neon                                                                           |  13 ++<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">.travis.yml                                                                             | 137 +++++------<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">Dockerfile                                                                              |  25 ++<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">INSTALL                                                                                 |  33 ---<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">COPYING => LICENSE                                                                      |  55 ++++-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">README.md                                                                               |  39 ++--<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">{misc/tools => bin}/README.md                                                           |  34 ++-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">bin/aggregate                                                                           | 271 ++++++++++++++++++++++<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">{misc/tools => bin}/calert                                                              |  13 +-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">misc/tools/doctrine.php => bin/doctrine                                                 |   8 +-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">{misc/tools => bin}/install.sh                                                          | 137 +++++++----<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">{misc/tools => bin}/jsonclient                                                          |   6 +-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">misc/tools/model-helper.php => bin/model-helper                                         |   8 +-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">misc/tools/push-server.php => bin/push-server                                           |  21 +-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">{misc/tools => bin}/vzclient                                                            |  78 +++++--<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">misc/tools/vzcompress2.php => bin/vzcompress2                                           |  13 +-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">{misc/tools => bin}/vzmonitor                                                           |   9 +-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">composer.json                                                                           |  45 ++--<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">docker-compose.yml                                                                      |  35 +++<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">etc/config.dist.yaml                                                                    |  43 ++++<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">etc/volkszaehler.conf.template.php                                                      | 156 -------------<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">gulpfile.js                                                                             |   4 +-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">htdocs/.htaccess                                                                        |  20 +-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">htdocs/css/print.css                                                                    |  20 ++<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">htdocs/css/style.css                                                                    | 111 ++++++++-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">htdocs/index.html                                                                       | 128 ++++++++---<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">htdocs/js/entities.js                                                                   | 119 ++++++----<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">htdocs/js/entity.js                                                                     | 668 ++++++++++++++++++++++++++++++------------------------<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">htdocs/js/functions.js                                                                  | 139 +++++++++---<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">htdocs/js/init.js                                                                       |  19 +-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">htdocs/js/jquery/jquery-ext.min.js                                                      |   2 +-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">htdocs/js/jquery/jquery-extensions.js                                                   |  32 +--<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">htdocs/js/jquery/jquery.treeTable.js                                                    |   8 +-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">htdocs/js/middleware.js                                                                 |   5 +-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">htdocs/js/options.js                                                                    |  32 ++-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">htdocs/js/plot.js                                                                       | 384 +++++++++++++++++++++++++++++++<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">htdocs/js/wui.js                                                                        | 465 ++++++++++++++-----------------------<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">htdocs/middleware.php                                                                   |   5 +-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">htdocs/vendor/flot/flot.min.js                                                          |   6 +-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">htdocs/vendor/flot/jquery.flot.js                                                       | 178 ++++++++++++++-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">htdocs/vendor/flot/jquery.flot.orderBars.js                                             | 278 +++++++++++++++++++++++<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">htdocs/vendor/jquery/jquery-2.1.3.min.js                                                |   4 -<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">htdocs/vendor/jquery/jquery-3.3.1.min.js                                                |   2 +<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">htdocs/vendor/nprogress.min.js                                                          |   1 +<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Controller/AggregatorController.php                                                 |  73 +++---<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Controller/CapabilitiesController.php                                               |  24 +-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Controller/ChannelController.php                                                    |  30 +--<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Controller/Controller.php                                                           |  42 ++--<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Controller/DataController.php                                                       |  82 +++++--<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Controller/EntityController.php                                                     | 162 +++----------<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Controller/IotController.php                                                        |  33 +--<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Controller/PrognosisController.php                                                  | 159 +++++++++++++<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Controller/QueryController.php                                                      | 104 +++++++++<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Definition/Definition.php                                                           |  28 ++-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Definition/EntityDefinition.json                                                    | 192 +++++++++++-----<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Definition/EntityDefinition.php                                                     |  31 ++-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Definition/PropertyDefinition.json                                                  |  95 +++++++-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Definition/PropertyDefinition.php                                                   |  15 +-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Interpreter/AccumulatorInterpreter.php                                              |  47 ++--<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Interpreter/AggregatorInterpreter.php                                               |  30 ++-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Interpreter/DataIterator.php                                                        |  23 +-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Interpreter/ImpulseInterpreter.php                                                  |  47 ++--<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Interpreter/Interpreter.php                                                         | 190 +++++++++-------<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Interpreter/SQL/MySQLAggregateOptimizer.php                                         | 106 ++++-----<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Interpreter/SQL/MySQLOptimizer.php                                                  | 151 +++++-------<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Interpreter/SQL/PostgreSQLOptimizer.php                                             |  34 ++-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Interpreter/SQL/SQLOptimizer.php                                                    | 210 +++++++++++------<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Interpreter/SQL/SQLiteOptimizer.php                                                 |   7 +-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Interpreter/SQL/SensorInterpreterAverageTrait.php                                   |  84 +++++++<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Interpreter/SensorInterpreter.php                                                   |  29 ++-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Interpreter/Virtual/DelayedIterator.php                                             |  70 ++++++<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Interpreter/Virtual/GroupedTimestampIterator.php                                    | 102 +++++++++<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Interpreter/Virtual/InterpreterCoordinatorTrait.php                                 |  94 ++++++++<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Interpreter/Virtual/InterpreterProxy.php                                            | 135 +++++++++++<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/{Exception/ConfigurationException.php => Interpreter/Virtual/LookbackIterator.php}  |  44 ++--<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Interpreter/Virtual/TimestampGenerator.php                                          |  97 ++++++++<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/{Exception/HttpExceptionInterface.php => Interpreter/Virtual/TimestampIterator.php} |  24 +-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Interpreter/VirtualInterpreter.php                                                  | 308 +++++++++++++++++++++++++<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Model/Aggregate.php                                                                 |   6 +-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Model/Aggregator.php                                                                |   6 +-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Model/Channel.php                                                                   |  36 +--<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Model/Data.php                                                                      |   6 +-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Model/Entity.php                                                                    |  34 ++-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Model/Property.php                                                                  |   6 +-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Router.php                                                                          |  51 ++---<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Server/HttpReceiver.php                                                             |  44 ++--<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Server/MiddlewareAdapter.php                                                        |  17 +-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Server/PPMBootstrapAdapter.php                                                      |  17 +-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Server/PushTransportInterface.php                                                   |   5 +-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Server/WampClientAdapter.php                                                        |  11 +-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Server/WsClientAdapter.php                                                          |   7 +-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Util/Aggregation.php                                                                | 217 +++++++++++-------<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Util/Configuration.php                                                              |  19 +-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Util/ConsoleApplication.php                                                         |   5 +-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Util/ConsoleSQLLogger.php                                                           |  67 ++++++<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Util/Debug.php                                                                      |  33 +--<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Util/EntityFactory.php                                                              | 246 ++++++++++++++++++++<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Util/JSON.php                                                                       |   8 +-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Util/Random.php                                                                     | 148 ------------<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/Util/UUID.php                                                                       | 336 ---------------------------<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/View/CSV.php                                                                        |  20 +-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/View/JSON.php                                                                       |  15 +-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/View/JpGraph.php                                                                    | 261 ---------------------<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/View/Text.php                                                                       |  20 +-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/View/View.php                                                                       |  24 +-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">lib/bootstrap.php                                                                       |  30 ++-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">misc/controller/1wire/log_onewire.sh                                                    | 107 ---------<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">misc/controller/1wire/<a href="http://log_onewire_ecmd.pl" target="_blank" rel="noreferrer">log_onewire_ecmd.pl</a>                                               | 111 ---------<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">misc/controller/1wire/log_onewire_ecmd.sh                                               |  60 -----<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">misc/controller/README                                                                  |  29 ---<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">misc/controller/digitalstrom/dss.sh                                                     |  53 -----<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">misc/controller/mbus/install.sh                                                         |  18 --<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">misc/controller/mbus/mbus-cmd                                                           | 215 ------------------<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">misc/controller/mbus/<a href="http://mbus.pm" target="_blank" rel="noreferrer">mbus.pm</a>                                                            | 537 -------------------------------------------<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">misc/controller/mbus/<a href="http://mbusconf.pm" target="_blank" rel="noreferrer">mbusconf.pm</a>                                                        |  11 -<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">misc/controller/misc/log_i2c_ds1631_ecmd.sh                                             |  61 -----<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">misc/controller/misc/log_open2300.sh                                                    | 108 ---------<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">misc/controller/misc/log_rawS0.lua                                                      | 133 -----------<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">misc/controller/misc/log_rawS0.sh                                                       |  33 ---<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">misc/controller/misc/log_usbflukso.sh                                                   |  37 ---<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">misc/controller/misc/log_weather.sh                                                     |  74 ------<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">misc/controller/misc/log_weather_wu.sh                                                  | 133 -----------<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">misc/frontend/fnordlicht                                                                |   1 -<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">misc/sql/README                                                                         |   2 +-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">misc/tools/aggregate.php                                                                | 190 ----------------<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">misc/tools/doctrine                                                                     |   5 -<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">phpunit.xml                                                                             |  20 +-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">test/AccumulatorTest.php                                                                |   4 +-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">test/AggregationPerformanceTest.php                                                     | 146 ------------<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">test/AggregationTest.php                                                                |  34 +--<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">test/CapabilitiesTest.php                                                               |   3 +-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">test/ChannelTest.php                                                                    |   3 +-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">test/Data.php                                                                           |  29 ++-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">test/DataPerformance.php                                                                |   7 +-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">test/EntityTest.php                                                                     |  62 ++++-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">test/FormatTest.php                                                                     |  29 +--<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">test/GroupTest.php                                                                      |  14 +-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">test/ImpulseTest.php                                                                    |   3 +-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">test/InterpreterTrait.php                                                               |  63 +++++<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">test/IotTest.php                                                                        |  40 ++++<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">test/Middleware.php                                                                     |  51 +++--<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">test/PrognosisTest.php                                                                  |  48 ++++<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">test/ProtocolTest.php                                                                   |   9 +-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">test/PushServerTest.php                                                                 |   5 +-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">test/QueryTest.php                                                                      |  34 +++<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">test/RawTest.php                                                                        |   7 +-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">test/SensorTest.php                                                                     |  35 ++-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">test/SetupPerformanceData.php                                                           |   3 +-<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">test/VirtualTest.php                                                                    | 421 ++++++++++++++++++++++++++++++++++<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">153 files changed, 6278 insertions(+), 5172 deletions(-)<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">create mode 100644 .dockerignore<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">delete mode 100644 .gitmodules<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">create mode 100644 .php_cs<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">create mode 100644 .phpstan.neon<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">create mode 100644 Dockerfile<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">delete mode 100644 INSTALL<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">rename COPYING => LICENSE (92%)<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">rename {misc/tools => bin}/README.md (90%)<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">create mode 100755 bin/aggregate<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">rename {misc/tools => bin}/calert (93%)<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">rename misc/tools/doctrine.php => bin/doctrine (84%)<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">mode change 100644 => 100755<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">rename {misc/tools => bin}/install.sh (64%)<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">rename {misc/tools => bin}/jsonclient (92%)<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">rename misc/tools/model-helper.php => bin/model-helper (93%)<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">mode change 100644 => 100755<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">rename misc/tools/push-server.php => bin/push-server (83%)<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">rename {misc/tools => bin}/vzclient (61%)<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">rename misc/tools/vzcompress2.php => bin/vzcompress2 (96%)<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">rename {misc/tools => bin}/vzmonitor (95%)<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">create mode 100755 docker-compose.yml<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">create mode 100644 etc/config.dist.yaml<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">delete mode 100644 etc/volkszaehler.conf.template.php<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">create mode 100644 htdocs/css/print.css<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">create mode 100644 htdocs/js/plot.js<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">create mode 100644 htdocs/vendor/flot/jquery.flot.orderBars.js<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">delete mode 100644 htdocs/vendor/jquery/jquery-2.1.3.min.js<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">create mode 100644 htdocs/vendor/jquery/jquery-3.3.1.min.js<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">create mode 100644 htdocs/vendor/nprogress.min.js<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">create mode 100644 lib/Controller/PrognosisController.php<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">create mode 100644 lib/Controller/QueryController.php<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">create mode 100644 lib/Interpreter/SQL/SensorInterpreterAverageTrait.php<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">create mode 100644 lib/Interpreter/Virtual/DelayedIterator.php<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">create mode 100644 lib/Interpreter/Virtual/GroupedTimestampIterator.php<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">create mode 100644 lib/Interpreter/Virtual/InterpreterCoordinatorTrait.php<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">create mode 100644 lib/Interpreter/Virtual/InterpreterProxy.php<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt"><b>rename lib/{Exception/ConfigurationException.php => Interpreter/Virtual/LookbackIterator.php} (52%)</b><u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">create mode 100644 lib/Interpreter/Virtual/TimestampGenerator.php<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt"><b>rename lib/{Exception/HttpExceptionInterface.php => Interpreter/Virtual/TimestampIterator.php} (63%)</b><u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">create mode 100644 lib/Interpreter/VirtualInterpreter.php<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">create mode 100644 lib/Util/ConsoleSQLLogger.php<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">create mode 100644 lib/Util/EntityFactory.php<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">delete mode 100644 lib/Util/Random.php<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">delete mode 100644 lib/Util/UUID.php<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">delete mode 100644 lib/View/JpGraph.php<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">delete mode 100755 misc/controller/1wire/log_onewire.sh<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">delete mode 100755 misc/controller/1wire/<a href="http://log_onewire_ecmd.pl" target="_blank" rel="noreferrer">log_onewire_ecmd.pl</a><u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">delete mode 100755 misc/controller/1wire/log_onewire_ecmd.sh<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">delete mode 100644 misc/controller/README<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">delete mode 100755 misc/controller/digitalstrom/dss.sh<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">delete mode 100644 misc/controller/mbus/install.sh<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">delete mode 100755 misc/controller/mbus/mbus-cmd<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">delete mode 100644 misc/controller/mbus/<a href="http://mbus.pm" target="_blank" rel="noreferrer">mbus.pm</a><u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">delete mode 100644 misc/controller/mbus/<a href="http://mbusconf.pm" target="_blank" rel="noreferrer">mbusconf.pm</a><u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">delete mode 100755 misc/controller/misc/log_i2c_ds1631_ecmd.sh<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">delete mode 100755 misc/controller/misc/log_open2300.sh<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">delete mode 100755 misc/controller/misc/log_rawS0.lua<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">delete mode 100755 misc/controller/misc/log_rawS0.sh<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">delete mode 100755 misc/controller/misc/log_usbflukso.sh<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">delete mode 100755 misc/controller/misc/log_weather.sh<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">delete mode 100644 misc/controller/misc/log_weather_wu.sh<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">delete mode 160000 misc/frontend/fnordlicht<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">delete mode 100644 misc/tools/aggregate.php<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">delete mode 100755 misc/tools/doctrine<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">delete mode 100644 test/AggregationPerformanceTest.php<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">create mode 100644 test/InterpreterTrait.php<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">create mode 100644 test/IotTest.php<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">create mode 100644 test/PrognosisTest.php<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">create mode 100644 test/QueryTest.php<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">create mode 100644 test/VirtualTest.php<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt"> <u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">ob die beiden rename-Exeptions relevant sind weiß ich nicht.<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt"> <u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">Dann sollte jetzt ein Composer update folgen ?<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt"> <u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">Also:<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt"> <u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt"># composer update<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">Loading composer repositories with package information<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">Updating dependencies (including require-dev)<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt"> <u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt"> <u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">  [ErrorException]<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">  "continue" targeting switch is equivalent to "break". Did you mean to use "continue 2"?<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt"> <u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt"> <u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">update [--prefer-source] [--prefer-dist] [--dry-run] [--dev] [--no-dev] [--lock] [--no-plugins] [--no-custom-installers] [--no-autoloader] [--no-scripts] [--no-progress] [--with-dependencies] [-v|vv|vvv|--verbose] [-o|--optimize-autoloader] [-a|--classmap-authoritative] [--ignore-platform-reqs] [--prefer-stable] [--prefer-lowest] [-i|--interactive] [--root-reqs] [--] [<packages>]...<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt"> <u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt"> <u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">Nach etwas googeln habe ich das hier gefunden :<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt"><a href="https://github.com/composer/composer/issues/7783#issuecomment-462306526" target="_blank" rel="noreferrer">https://github.com/composer/composer/issues/7783#issuecomment-462306526</a><u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">und angewendet (Zeile 286 von „continue“ in „continue 2“ geändert.<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt"> <u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">Danach musste ich noch „php-xml“ und „php-mbstring“ nachinstallieren und<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">dann lief „composer update“ durch.<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt"> <u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">root@ubserv:/var/www/<a href="http://volkszaehler.org" target="_blank" rel="noreferrer">volkszaehler.org</a># composer update<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">Loading composer repositories with package information<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">Updating dependencies (including require-dev)<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">  - Removing relay/relay (0.2.0)<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">  - Removing mkraemer/react-pcntl (v2.0.0)<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">  - Removing react/socket-client (v0.5.3)<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">  - Removing react/http-client (v0.4.17)<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">  - Removing phpunit/phpunit-mock-objects (3.4.3)<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">  - Removing jenssegers/proxy (v3.0.0-beta2)<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">  - Updating symfony/routing (v3.2.7 => v4.2.4)<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">    Checking out ff03eae644e6b1e26d4a04b2385fe3a1a7f04e42<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">:<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">:<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">:<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">  - Installing webpatser/laravel-uuid (3.0.2)<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">    Downloading: 100%<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt"> <u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">  - Installing jdorn/sql-formatter (v1.2.17)<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">    Downloading: 100%<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt"> <u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">symfony/contracts suggests installing psr/cache (When using the Cache contracts)<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">symfony/contracts suggests installing psr/container (When using the Service contracts)<u></u><u></u></p><p class="MsoNormal" style="margin-left:384.0pt">symfony/contracts suggests installing sym</p></div></blockquote></div></div></div></div></div></div></div></div></div></div></blockquote></div></blockquote></div></div></blockquote></div>