diff --git a/composer.json b/composer.json index 95f5c56..16a266d 100644 --- a/composer.json +++ b/composer.json @@ -15,14 +15,14 @@ }, "autoload": { "psr-4": { - "Nmea\\": "src/Nmea/", + "Core\\": "src/Core/", "Modules\\": "src/Modules/" } }, "autoload-dev": { "psr-4": { - "TestsNmea\\": "test/Nmea/", - "TestsModules\\": "test/Modules/" + "TestCore\\": "test/Core/", + "TestModules\\": "test/Modules/" } }, "require": { @@ -31,6 +31,7 @@ "ext-memcached": "*", "ext-bcmath": "*", "ext-sockets": "*", - "ext-pdo": "*" + "ext-pdo": "*", + "frankmarkwort/math": "^1.0" } } diff --git a/src/Nmea/AbstractHeader.php b/src/Core/AbstractHeader.php similarity index 97% rename from src/Nmea/AbstractHeader.php rename to src/Core/AbstractHeader.php index 15f203e..567e1be 100644 --- a/src/Nmea/AbstractHeader.php +++ b/src/Core/AbstractHeader.php @@ -1,10 +1,10 @@ [UnitInterface::UNIT => 'kt', UnitInterface::ROUND => 1, UnitInterface::PRINT => '%s kt'], diff --git a/src/Modules/External/AbstractFacade.php b/src/Modules/External/AbstractFacade.php index 4ab4c43..d4b86f3 100644 --- a/src/Modules/External/AbstractFacade.php +++ b/src/Modules/External/AbstractFacade.php @@ -2,8 +2,8 @@ namespace Modules\External; -use Nmea\Math\Skalar\Rad; -use Nmea\Math\Vector\PolarVector; +use Core\Math\Skalar\Rad; +use Core\Math\Vector\PolarVector; abstract class AbstractFacade { diff --git a/src/Modules/External/FromCache/AnchorFacade.php b/src/Modules/External/FromCache/AnchorFacade.php index ef29045..20eb751 100644 --- a/src/Modules/External/FromCache/AnchorFacade.php +++ b/src/Modules/External/FromCache/AnchorFacade.php @@ -7,9 +7,9 @@ use Modules\Internal\Pgns\Heading127250; use Modules\Internal\Pgns\WaterDepth128267; use Modules\Internal\Pgns\Wind130306; -use Nmea\Cache\CacheInterface; -use Nmea\Config\ConfigException; -use Nmea\Parser\ParserException; +use Core\Cache\CacheInterface; +use Core\Config\ConfigException; +use Core\Parser\ParserException; readonly class AnchorFacade { diff --git a/src/Modules/External/FromCache/LogBookFacade.php b/src/Modules/External/FromCache/LogBookFacade.php index 6dae9d4..7a76505 100644 --- a/src/Modules/External/FromCache/LogBookFacade.php +++ b/src/Modules/External/FromCache/LogBookFacade.php @@ -6,10 +6,10 @@ use Modules\Internal\Pgns\Gps129025; use Modules\Internal\Pgns\SetAndDrift129291; use Modules\Internal\Pgns\SogCog129026; -use Nmea\Cache\CacheInterface; -use Nmea\Config\ConfigException; -use Nmea\Math\Vector\PolarVector; -use Nmea\Parser\ParserException; +use Core\Cache\CacheInterface; +use Core\Config\ConfigException; +use Core\Math\Vector\PolarVector; +use Core\Parser\ParserException; class LogBookFacade extends AbstractFacade { diff --git a/src/Modules/External/FromCache/WindStatisticFacade.php b/src/Modules/External/FromCache/WindStatisticFacade.php index c9fa4d0..9698614 100644 --- a/src/Modules/External/FromCache/WindStatisticFacade.php +++ b/src/Modules/External/FromCache/WindStatisticFacade.php @@ -7,11 +7,11 @@ use Modules\Internal\Pgns\SogCog129026; use Modules\Internal\Pgns\Temperature130312; use Modules\Internal\Pgns\Wind130306; -use Nmea\Cache\CacheInterface; -use Nmea\Config\ConfigException; -use Nmea\Math\Skalar\Rad; -use Nmea\Math\Vector\PolarVector; -use Nmea\Parser\ParserException; +use Core\Cache\CacheInterface; +use Core\Config\ConfigException; +use Core\Math\Skalar\Rad; +use Core\Math\Vector\PolarVector; +use Core\Parser\ParserException; class WindStatisticFacade extends AbstractFacade { diff --git a/src/Modules/External/FromSocket/InstrumentsFacade.php b/src/Modules/External/FromSocket/InstrumentsFacade.php index 8afeff4..37dca51 100644 --- a/src/Modules/External/FromSocket/InstrumentsFacade.php +++ b/src/Modules/External/FromSocket/InstrumentsFacade.php @@ -3,12 +3,12 @@ namespace Modules\External\FromSocket; use Modules\External\AbstractFacade; -use Nmea\Config\ConfigException; -use Nmea\Math\Skalar\Rad; -use Nmea\Math\Vector\PolarVector; -use Nmea\Parser\DataFacadeFactory; -use Nmea\Parser\ParserException; -use Nmea\Parser\Data\DataFacade; +use Core\Config\ConfigException; +use Core\Math\Skalar\Rad; +use Core\Math\Vector\PolarVector; +use Core\Parser\DataFacadeFactory; +use Core\Parser\ParserException; +use Core\Parser\Data\DataFacade; class InstrumentsFacade extends AbstractFacade { diff --git a/src/Modules/Internal/Interfaces/InterfaceObservableCronWorker.php b/src/Modules/Internal/Interfaces/InterfaceObservableCronWorker.php index 23bfbe1..618b95f 100644 --- a/src/Modules/Internal/Interfaces/InterfaceObservableCronWorker.php +++ b/src/Modules/Internal/Interfaces/InterfaceObservableCronWorker.php @@ -3,8 +3,8 @@ namespace Modules\Internal\Interfaces; -use Nmea\Cache\CacheInterface; -use Nmea\Database\DatabaseInterface; +use Core\Cache\CacheInterface; +use Core\Database\DatabaseInterface; interface InterfaceObservableCronWorker { diff --git a/src/Modules/Internal/Interfaces/InterfaceObservableRealtime.php b/src/Modules/Internal/Interfaces/InterfaceObservableRealtime.php index 016cf17..a09fe82 100644 --- a/src/Modules/Internal/Interfaces/InterfaceObservableRealtime.php +++ b/src/Modules/Internal/Interfaces/InterfaceObservableRealtime.php @@ -4,11 +4,11 @@ namespace Modules\Internal\Interfaces; use ErrorException; -use Nmea\Config\ConfigException; -use Nmea\Parser\ParserException; -use Nmea\Protocol\Frames\Frame\Frame; -use Nmea\Protocol\Socket\Client; -use Nmea\Protocol\Socket\SocketException; +use Core\Config\ConfigException; +use Core\Parser\ParserException; +use Core\Protocol\Frames\Frame\Frame; +use Core\Protocol\Socket\Client; +use Core\Protocol\Socket\SocketException; interface InterfaceObservableRealtime { diff --git a/src/Modules/Internal/Interfaces/InterfaceObserverCronWorker.php b/src/Modules/Internal/Interfaces/InterfaceObserverCronWorker.php index 57325c3..4e75fc7 100644 --- a/src/Modules/Internal/Interfaces/InterfaceObserverCronWorker.php +++ b/src/Modules/Internal/Interfaces/InterfaceObserverCronWorker.php @@ -3,8 +3,8 @@ namespace Modules\Internal\Interfaces; -use Nmea\Config\ConfigException; -use Nmea\Parser\ParserException; +use Core\Config\ConfigException; +use Core\Parser\ParserException; interface InterfaceObserverCronWorker { diff --git a/src/Modules/Internal/Interfaces/InterfaceObserverRealtime.php b/src/Modules/Internal/Interfaces/InterfaceObserverRealtime.php index 4ec8265..69ce46d 100644 --- a/src/Modules/Internal/Interfaces/InterfaceObserverRealtime.php +++ b/src/Modules/Internal/Interfaces/InterfaceObserverRealtime.php @@ -5,9 +5,9 @@ use ErrorException; -use Nmea\Config\ConfigException; -use Nmea\Parser\ParserException; -use Nmea\Protocol\Socket\SocketException; +use Core\Config\ConfigException; +use Core\Parser\ParserException; +use Core\Protocol\Socket\SocketException; interface InterfaceObserverRealtime { diff --git a/src/Modules/Internal/Pgns/AbstractPgn.php b/src/Modules/Internal/Pgns/AbstractPgn.php index 8912b2f..2957eab 100644 --- a/src/Modules/Internal/Pgns/AbstractPgn.php +++ b/src/Modules/Internal/Pgns/AbstractPgn.php @@ -2,11 +2,11 @@ namespace Modules\Internal\Pgns; -use Nmea\Cache\CacheInterface; -use Nmea\Config\ConfigException; -use Nmea\Parser\Data\DataFacade; -use Nmea\Parser\DataFacadeFactory; -use Nmea\Parser\ParserException; +use Core\Cache\CacheInterface; +use Core\Config\ConfigException; +use Core\Parser\Data\DataFacade; +use Core\Parser\DataFacadeFactory; +use Core\Parser\ParserException; abstract class AbstractPgn { diff --git a/src/Modules/Internal/Pgns/Chain.php b/src/Modules/Internal/Pgns/Chain.php index f1cb57b..bee3054 100644 --- a/src/Modules/Internal/Pgns/Chain.php +++ b/src/Modules/Internal/Pgns/Chain.php @@ -2,7 +2,7 @@ namespace Modules\Internal\Pgns; -use Nmea\Cache\CacheInterface; +use Core\Cache\CacheInterface; readonly class Chain { diff --git a/src/Modules/Internal/Pgns/Gps129025.php b/src/Modules/Internal/Pgns/Gps129025.php index 62e7c92..1b294ef 100644 --- a/src/Modules/Internal/Pgns/Gps129025.php +++ b/src/Modules/Internal/Pgns/Gps129025.php @@ -3,8 +3,8 @@ namespace Modules\Internal\Pgns; use Modules\Internal\Enums\EnumPgns; -use Nmea\Config\ConfigException; -use Nmea\Parser\ParserException; +use Core\Config\ConfigException; +use Core\Parser\ParserException; class Gps129025 extends AbstractPgn { diff --git a/src/Modules/Internal/Pgns/Heading127250.php b/src/Modules/Internal/Pgns/Heading127250.php index 399b4f7..76fa377 100644 --- a/src/Modules/Internal/Pgns/Heading127250.php +++ b/src/Modules/Internal/Pgns/Heading127250.php @@ -3,8 +3,8 @@ namespace Modules\Internal\Pgns; use Modules\Internal\Enums\EnumPgns; -use Nmea\Config\ConfigException; -use Nmea\Parser\ParserException; +use Core\Config\ConfigException; +use Core\Parser\ParserException; class Heading127250 extends AbstractPgn { diff --git a/src/Modules/Internal/Pgns/SetAndDrift129291.php b/src/Modules/Internal/Pgns/SetAndDrift129291.php index eef476f..e537dd8 100644 --- a/src/Modules/Internal/Pgns/SetAndDrift129291.php +++ b/src/Modules/Internal/Pgns/SetAndDrift129291.php @@ -3,8 +3,8 @@ namespace Modules\Internal\Pgns; use Modules\Internal\Enums\EnumPgns; -use Nmea\Config\ConfigException; -use Nmea\Parser\ParserException; +use Core\Config\ConfigException; +use Core\Parser\ParserException; class SetAndDrift129291 extends AbstractPgn { diff --git a/src/Modules/Internal/Pgns/SogCog129026.php b/src/Modules/Internal/Pgns/SogCog129026.php index a1569cc..70d3bc4 100644 --- a/src/Modules/Internal/Pgns/SogCog129026.php +++ b/src/Modules/Internal/Pgns/SogCog129026.php @@ -3,8 +3,8 @@ namespace Modules\Internal\Pgns; use Modules\Internal\Enums\EnumPgns; -use Nmea\Config\ConfigException; -use Nmea\Parser\ParserException; +use Core\Config\ConfigException; +use Core\Parser\ParserException; class SogCog129026 extends AbstractPgn { diff --git a/src/Modules/Internal/Pgns/Temperature130312.php b/src/Modules/Internal/Pgns/Temperature130312.php index 6309656..cd8eb4d 100644 --- a/src/Modules/Internal/Pgns/Temperature130312.php +++ b/src/Modules/Internal/Pgns/Temperature130312.php @@ -3,8 +3,8 @@ namespace Modules\Internal\Pgns; use Modules\Internal\Enums\EnumPgns; -use Nmea\Config\ConfigException; -use Nmea\Parser\ParserException; +use Core\Config\ConfigException; +use Core\Parser\ParserException; class Temperature130312 extends AbstractPgn { diff --git a/src/Modules/Internal/Pgns/WaterDepth128267.php b/src/Modules/Internal/Pgns/WaterDepth128267.php index ef1157f..e5eba8c 100644 --- a/src/Modules/Internal/Pgns/WaterDepth128267.php +++ b/src/Modules/Internal/Pgns/WaterDepth128267.php @@ -3,8 +3,8 @@ namespace Modules\Internal\Pgns; use Modules\Internal\Enums\EnumPgns; -use Nmea\Config\ConfigException; -use Nmea\Parser\ParserException; +use Core\Config\ConfigException; +use Core\Parser\ParserException; class WaterDepth128267 extends AbstractPgn { diff --git a/src/Modules/Internal/Pgns/Wind130306.php b/src/Modules/Internal/Pgns/Wind130306.php index f827e45..551154b 100644 --- a/src/Modules/Internal/Pgns/Wind130306.php +++ b/src/Modules/Internal/Pgns/Wind130306.php @@ -4,8 +4,8 @@ use Modules\Internal\Enums\EnumPgns; -use Nmea\Config\ConfigException; -use Nmea\Parser\ParserException; +use Core\Config\ConfigException; +use Core\Parser\ParserException; class Wind130306 extends AbstractPgn { diff --git a/src/Modules/Internal/RealtimeDistributor.php b/src/Modules/Internal/RealtimeDistributor.php index e5ac580..e6d33db 100644 --- a/src/Modules/Internal/RealtimeDistributor.php +++ b/src/Modules/Internal/RealtimeDistributor.php @@ -5,11 +5,11 @@ use ErrorException; use Modules\Internal\Interfaces\InterfaceObservableRealtime; use Modules\Internal\Interfaces\InterfaceObserverRealtime; -use Nmea\Config\ConfigException; -use Nmea\Parser\ParserException; -use Nmea\Protocol\Frames\Frame\Frame; -use Nmea\Protocol\Socket\Client; -use Nmea\Protocol\Socket\SocketException; +use Core\Config\ConfigException; +use Core\Parser\ParserException; +use Core\Protocol\Frames\Frame\Frame; +use Core\Protocol\Socket\Client; +use Core\Protocol\Socket\SocketException; class RealtimeDistributor implements InterfaceObservableRealtime { diff --git a/src/Modules/Module/Cron/AnchorWatch/Bootstrap.php b/src/Modules/Module/Cron/AnchorWatch/Bootstrap.php index dc7693a..c5b60aa 100644 --- a/src/Modules/Module/Cron/AnchorWatch/Bootstrap.php +++ b/src/Modules/Module/Cron/AnchorWatch/Bootstrap.php @@ -7,8 +7,8 @@ use Modules\Internal\Interfaces\InterfaceObserverCronWorker; use Modules\Module\Cron\AnchorWatch\Observer\ObserverAnchorPrintConsole; use Modules\Module\Cron\AnchorWatch\Observer\ObserverAnchorToCache; -use Nmea\Config\ConfigException; -use Nmea\Parser\ParserException; +use Core\Config\ConfigException; +use Core\Parser\ParserException; class Bootstrap implements InterfaceObserverCronWorker { diff --git a/src/Modules/Module/Cron/AnchorWatch/Observer/ObserverAnchorToCache.php b/src/Modules/Module/Cron/AnchorWatch/Observer/ObserverAnchorToCache.php index 8bb9ca3..8e6e59c 100644 --- a/src/Modules/Module/Cron/AnchorWatch/Observer/ObserverAnchorToCache.php +++ b/src/Modules/Module/Cron/AnchorWatch/Observer/ObserverAnchorToCache.php @@ -5,8 +5,8 @@ use Exception; use Modules\Module\Cron\AnchorWatch\Anchor; -use Nmea\Cache\Memcached; -use Nmea\Config\Config; +use Core\Cache\Memcached; +use Core\Config\Config; class ObserverAnchorToCache implements InterfaceObserver { diff --git a/src/Modules/Module/Cron/Logbook/Bootstrap.php b/src/Modules/Module/Cron/Logbook/Bootstrap.php index 9ce633e..f5f9b17 100644 --- a/src/Modules/Module/Cron/Logbook/Bootstrap.php +++ b/src/Modules/Module/Cron/Logbook/Bootstrap.php @@ -7,9 +7,9 @@ use Modules\Internal\Interfaces\InterfaceObserverCronWorker; use Modules\Module\Cron\Logbook\Entity\Positions; use Modules\Module\Cron\Logbook\Mapper\PositionMapper; -use Nmea\Config\ConfigException; -use Nmea\Database\DatabaseInterface; -use Nmea\Parser\ParserException; +use Core\Config\ConfigException; +use Core\Database\DatabaseInterface; +use Core\Parser\ParserException; class Bootstrap implements InterfaceObserverCronWorker { diff --git a/src/Modules/Module/Cron/Logbook/Entity/Positions.php b/src/Modules/Module/Cron/Logbook/Entity/Positions.php index 981a3bf..74a8762 100644 --- a/src/Modules/Module/Cron/Logbook/Entity/Positions.php +++ b/src/Modules/Module/Cron/Logbook/Entity/Positions.php @@ -3,7 +3,7 @@ namespace Modules\Module\Cron\Logbook\Entity; -use Nmea\Math\Vector\PolarVector; +use Core\Math\Vector\PolarVector; class Positions implements ComparableInterface { diff --git a/src/Modules/Module/Cron/Logbook/Mapper/PositionMapper.php b/src/Modules/Module/Cron/Logbook/Mapper/PositionMapper.php index 1b2a775..8400efa 100644 --- a/src/Modules/Module/Cron/Logbook/Mapper/PositionMapper.php +++ b/src/Modules/Module/Cron/Logbook/Mapper/PositionMapper.php @@ -4,7 +4,7 @@ namespace Modules\Module\Cron\Logbook\Mapper; use Modules\Module\Cron\Logbook\Entity\Positions; -use Nmea\Database\Mapper\AbstractMapper; +use Core\Database\Mapper\AbstractMapper; class PositionMapper extends AbstractMapper { diff --git a/src/Modules/Module/Cron/WeatherStatistic/Bootstrap.php b/src/Modules/Module/Cron/WeatherStatistic/Bootstrap.php index 3a6f2bb..1d9abd4 100644 --- a/src/Modules/Module/Cron/WeatherStatistic/Bootstrap.php +++ b/src/Modules/Module/Cron/WeatherStatistic/Bootstrap.php @@ -8,8 +8,8 @@ use Modules\Internal\Interfaces\InterfaceObserverCronWorker; use Modules\Module\Cron\WeatherStatistic\Entity\WindSpeedCourse; use Modules\Module\Cron\WeatherStatistic\Mapper\WindSpeedHoursMapper; -use Nmea\Config\ConfigException; -use Nmea\Parser\ParserException; +use Core\Config\ConfigException; +use Core\Parser\ParserException; //TODO remove from Module diff --git a/src/Modules/Module/Cron/WeatherStatistic/Entity/AbstractWindSpeedCourse.php b/src/Modules/Module/Cron/WeatherStatistic/Entity/AbstractWindSpeedCourse.php index db85ace..5621f30 100644 --- a/src/Modules/Module/Cron/WeatherStatistic/Entity/AbstractWindSpeedCourse.php +++ b/src/Modules/Module/Cron/WeatherStatistic/Entity/AbstractWindSpeedCourse.php @@ -4,9 +4,9 @@ namespace Modules\Module\Cron\WeatherStatistic\Entity; //TODO remove from Module -use Nmea\Math\Skalar\Rad; -use Nmea\Math\Vector\PolarVector; -use Nmea\Math\Vector\PolarVectorOperation; +use Core\Math\Skalar\Rad; +use Core\Math\Vector\PolarVector; +use Core\Math\Vector\PolarVectorOperation; abstract class AbstractWindSpeedCourse { diff --git a/src/Modules/Module/Cron/WeatherStatistic/Entity/WindSpeedCourse.php b/src/Modules/Module/Cron/WeatherStatistic/Entity/WindSpeedCourse.php index 9735a46..002372d 100644 --- a/src/Modules/Module/Cron/WeatherStatistic/Entity/WindSpeedCourse.php +++ b/src/Modules/Module/Cron/WeatherStatistic/Entity/WindSpeedCourse.php @@ -4,8 +4,8 @@ namespace Modules\Module\Cron\WeatherStatistic\Entity; //TODO remove from Module -use Nmea\Math\EnumRange; -use Nmea\Math\Skalar\Rad; +use Core\Math\EnumRange; +use Core\Math\Skalar\Rad; class WindSpeedCourse extends AbstractWindSpeedCourse { diff --git a/src/Modules/Module/Cron/WeatherStatistic/Mapper/WindSpeedHoursMapper.php b/src/Modules/Module/Cron/WeatherStatistic/Mapper/WindSpeedHoursMapper.php index 808f12e..11d397b 100644 --- a/src/Modules/Module/Cron/WeatherStatistic/Mapper/WindSpeedHoursMapper.php +++ b/src/Modules/Module/Cron/WeatherStatistic/Mapper/WindSpeedHoursMapper.php @@ -6,7 +6,7 @@ use Modules\Module\Cron\WeatherStatistic\Collection\WindSpeedHourCollection; use Modules\Module\Cron\WeatherStatistic\Entity\WindSpeedCourse; use Modules\Module\Cron\WeatherStatistic\Entity\WindSpeedHour; -use Nmea\Database\Mapper\AbstractMapper; +use Core\Database\Mapper\AbstractMapper; class WindSpeedHoursMapper extends AbstractMapper { diff --git a/src/Modules/Module/Cron/Windrose/Mapper/WindroseMapper.php b/src/Modules/Module/Cron/Windrose/Mapper/WindroseMapper.php index 85f9438..aaf2d55 100644 --- a/src/Modules/Module/Cron/Windrose/Mapper/WindroseMapper.php +++ b/src/Modules/Module/Cron/Windrose/Mapper/WindroseMapper.php @@ -4,7 +4,7 @@ namespace Modules\Module\Cron\Windrose\Mapper; use Modules\Module\Cron\Windrose\Entity\WindRose; -use Nmea\Database\Mapper\AbstractMapper; +use Core\Database\Mapper\AbstractMapper; class WindroseMapper extends AbstractMapper { diff --git a/src/Modules/Module/Realtime/Instruments/AbstractWindSpeedCourse.php b/src/Modules/Module/Realtime/Instruments/AbstractWindSpeedCourse.php index 39d1c7f..33ebb04 100644 --- a/src/Modules/Module/Realtime/Instruments/AbstractWindSpeedCourse.php +++ b/src/Modules/Module/Realtime/Instruments/AbstractWindSpeedCourse.php @@ -3,9 +3,9 @@ namespace Modules\Module\Realtime\Instruments; -use Nmea\Math\Skalar\Rad; -use Nmea\Math\Vector\PolarVector; -use Nmea\Math\Vector\PolarVectorOperation; +use Core\Math\Skalar\Rad; +use Core\Math\Vector\PolarVector; +use Core\Math\Vector\PolarVectorOperation; abstract class AbstractWindSpeedCourse { diff --git a/src/Modules/Module/Realtime/Instruments/Bootstrap.php b/src/Modules/Module/Realtime/Instruments/Bootstrap.php index 43c7d27..6ead9a0 100644 --- a/src/Modules/Module/Realtime/Instruments/Bootstrap.php +++ b/src/Modules/Module/Realtime/Instruments/Bootstrap.php @@ -5,10 +5,10 @@ use Modules\Internal\Enums\EnumPgns; use Modules\Internal\Interfaces\InterfaceObservableRealtime; use Modules\Internal\Interfaces\InterfaceObserverRealtime; -use Nmea\Config\ConfigException; -use Nmea\Parser\ParserException; +use Core\Config\ConfigException; +use Core\Parser\ParserException; use ErrorException; -use Nmea\Protocol\Socket\SocketException; +use Core\Protocol\Socket\SocketException; class Bootstrap implements InterfaceObserverRealtime { diff --git a/src/Modules/Module/Realtime/Instruments/WindSpeedCourse.php b/src/Modules/Module/Realtime/Instruments/WindSpeedCourse.php index 65a7c5d..279f05e 100644 --- a/src/Modules/Module/Realtime/Instruments/WindSpeedCourse.php +++ b/src/Modules/Module/Realtime/Instruments/WindSpeedCourse.php @@ -2,8 +2,8 @@ declare(strict_types=1); namespace Modules\Module\Realtime\Instruments; -use Nmea\Math\EnumRange; -use Nmea\Math\Skalar\Rad; +use Core\Math\EnumRange; +use Core\Math\Skalar\Rad; class WindSpeedCourse extends AbstractWindSpeedCourse { diff --git a/src/Modules/Module/Realtime/Instruments/WindSpeedCourseFactory.php b/src/Modules/Module/Realtime/Instruments/WindSpeedCourseFactory.php index ceacf19..384972c 100644 --- a/src/Modules/Module/Realtime/Instruments/WindSpeedCourseFactory.php +++ b/src/Modules/Module/Realtime/Instruments/WindSpeedCourseFactory.php @@ -4,10 +4,10 @@ namespace Modules\Module\Realtime\Instruments; use Modules\External\FromSocket\InstrumentsFacade; -use Nmea\Config\ConfigException; -use Nmea\Parser\ParserException; -use Nmea\Protocol\Socket\Client; -use Nmea\Protocol\Socket\SocketException; +use Core\Config\ConfigException; +use Core\Parser\ParserException; +use Core\Protocol\Socket\Client; +use Core\Protocol\Socket\SocketException; readonly class WindSpeedCourseFactory { diff --git a/src/Modules/register.php b/src/Modules/register.php index 6281708..7875b75 100644 --- a/src/Modules/register.php +++ b/src/Modules/register.php @@ -2,7 +2,7 @@ use Modules\Internal\Interfaces\InterfaceObservableCronWorker; use Modules\Internal\RealtimeDistributor; -use Nmea\Cron\CronWorker; +use Core\Cron\CronWorker; return [ RealtimeDistributor::class => function (): RealtimeDistributor { diff --git a/src/deamon/cron.php b/src/deamon/cron.php index e861e1a..e7b4fc6 100644 --- a/src/deamon/cron.php +++ b/src/deamon/cron.php @@ -4,10 +4,10 @@ set_time_limit(0); use Modules\Internal\Enums\DebugModeEnum; -use Nmea\Cache\Memcached; -use Nmea\Config\Config; -use Nmea\Cron\CronWorker; -use Nmea\Database\Database; +use Core\Cache\Memcached; +use Core\Config\Config; +use Core\Cron\CronWorker; +use Core\Database\Database; require_once(__DIR__ . '/../../vendor/autoload.php'); $registerObserver = include (__DIR__ . '/../Modules/register.php'); diff --git a/src/deamon/deamon.php b/src/deamon/deamon.php index 87913a7..fe32707 100644 --- a/src/deamon/deamon.php +++ b/src/deamon/deamon.php @@ -2,11 +2,11 @@ run(); \ No newline at end of file diff --git a/src/http/anchor.phtml b/src/http/anchor.phtml index 966767c..955a8f8 100644 --- a/src/http/anchor.phtml +++ b/src/http/anchor.phtml @@ -1,6 +1,6 @@ diff --git a/src/http/anchorSet.phtml b/src/http/anchorSet.phtml index 68b2b6b..2cdd057 100644 --- a/src/http/anchorSet.phtml +++ b/src/http/anchorSet.phtml @@ -1,8 +1,8 @@ isSet('chain_length')) { diff --git a/src/http/anchorUnset.phtml b/src/http/anchorUnset.phtml index c4970ea..3442460 100644 --- a/src/http/anchorUnset.phtml +++ b/src/http/anchorUnset.phtml @@ -1,8 +1,8 @@ "; diff --git a/src/http/api/anchorJson.php b/src/http/api/anchorJson.php index ffe8aa7..08ec066 100644 --- a/src/http/api/anchorJson.php +++ b/src/http/api/anchorJson.php @@ -6,8 +6,8 @@ use Modules\External\FromCache\AnchorFacade; use Modules\Module\Cron\AnchorWatch\Anchor; -use Nmea\Cache\Memcached; -use Nmea\Config\Config; +use Core\Cache\Memcached; +use Core\Config\Config; header('Content-Type: application/json; charset=utf-8'); try { diff --git a/src/http/api/averages.php b/src/http/api/averages.php index 5875dff..fc997ff 100644 --- a/src/http/api/averages.php +++ b/src/http/api/averages.php @@ -4,8 +4,8 @@ ini_set('display_errors', '1'); use Modules\Module\Cron\WeatherStatistic\Mapper\WindSpeedHoursMapper; -use Nmea\Config\Config; -use Nmea\Database\Database; +use Core\Config\Config; +use Core\Database\Database; header('Content-Type: application/json; charset=utf-8'); diff --git a/src/http/api/setAnchor.php b/src/http/api/setAnchor.php index 9123820..611d0b8 100644 --- a/src/http/api/setAnchor.php +++ b/src/http/api/setAnchor.php @@ -1,8 +1,8 @@ run(); diff --git a/src/http/services.phtml b/src/http/services.phtml index fa50a43..526ef54 100644 --- a/src/http/services.phtml +++ b/src/http/services.phtml @@ -1,7 +1,7 @@ diff --git a/src/http/windrose.phtml b/src/http/windrose.phtml index 8a91cd5..7702400 100644 --- a/src/http/windrose.phtml +++ b/src/http/windrose.phtml @@ -4,8 +4,8 @@ error_reporting(E_ALL); ini_set('display_errors', '1'); use Modules\Module\Cron\Windrose\Mapper\WindroseMapper; -use Nmea\Config\Config; -use Nmea\Database\Database; +use Core\Config\Config; +use Core\Database\Database; require_once( __DIR__ . '/../../vendor/autoload.php'); diff --git a/test/Nmea/Cache/ArrayRingBufferTest.php b/test/Core/Cache/ArrayRingBufferTest.php similarity index 93% rename from test/Nmea/Cache/ArrayRingBufferTest.php rename to test/Core/Cache/ArrayRingBufferTest.php index f9787a0..679aa83 100644 --- a/test/Nmea/Cache/ArrayRingBufferTest.php +++ b/test/Core/Cache/ArrayRingBufferTest.php @@ -1,9 +1,9 @@ run(); diff --git a/test/Nmea/Math/Skalar/RadTest.php b/test/Core/Math/Skalar/RadTest.php similarity index 96% rename from test/Nmea/Math/Skalar/RadTest.php rename to test/Core/Math/Skalar/RadTest.php index 8dc7138..01a3ee7 100644 --- a/test/Nmea/Math/Skalar/RadTest.php +++ b/test/Core/Math/Skalar/RadTest.php @@ -1,9 +1,9 @@