PES-2241: rebase fix

src/Packetery/Module/Api/Internal/OrderController.php

@@ -13,7 +13,7 @@
 use Packetery\Core\CoreHelper;
 use Packetery\Core\Validator;
 use Packetery\Module\Exception\InvalidCarrierException;
-use Packetery\Module\Options\Provider;
+use Packetery\Module\Options\OptionsProvider;
 use Packetery\Module\Order;
 use Packetery\Module\Order\Form;
 use Packetery\Module\Order\Repository;
@@ -76,7 +76,7 @@ final class OrderController extends WP_REST_Controller {
 	/**
 	 * Options provider.
 	 *
-	 * @var Provider
+	 * @var OptionsProvider
 	 */
 	private $optionsProvider;
 
@@ -89,7 +89,7 @@ final class OrderController extends WP_REST_Controller {
 	 * @param Validator\Order $orderValidator  Order validator.
 	 * @param CoreHelper      $coreHelper      CoreHelper.
 	 * @param Form            $orderForm       Order form.
-	 * @param Provider        $optionsProvider Options provider.
+	 * @param OptionsProvider $optionsProvider Options provider.
 	 */
 	public function __construct(
 		OrderRouter $router,
@@ -98,7 +98,7 @@ public function __construct(
 		Validator\Order $orderValidator,
 		CoreHelper $coreHelper,
 		Form $orderForm,
-		Provider $optionsProvider
+		OptionsProvider $optionsProvider
 	) {
 		$this->orderForm       = $orderForm;
 		$this->orderRepository = $orderRepository;
@@ -201,9 +201,9 @@ public function saveModal( WP_REST_Request $request ) {
 				sprintf( '[data-packetery-order-id="%d"][data-packetery-order-grid-cell-weight]', $orderId ) => $this->gridExtender->getWeightCellContent( $order ),
 			],
 			Form::FIELD_WEIGHT        => $order->getFinalWeight(),
-			Form::FIELD_LENGTH        => Helper::trimDecimalPlaces( $values[ Form::FIELD_LENGTH ], $this->optionsProvider->getDimensionsNumberOfDecimals() ),
-			Form::FIELD_WIDTH         => Helper::trimDecimalPlaces( $values[ Form::FIELD_WIDTH ], $this->optionsProvider->getDimensionsNumberOfDecimals() ),
-			Form::FIELD_HEIGHT        => Helper::trimDecimalPlaces( $values[ Form::FIELD_HEIGHT ], $this->optionsProvider->getDimensionsNumberOfDecimals() ),
+			Form::FIELD_LENGTH        => CoreHelper::trimDecimalPlaces( $values[ Form::FIELD_LENGTH ], $this->optionsProvider->getDimensionsNumberOfDecimals() ),
+			Form::FIELD_WIDTH         => CoreHelper::trimDecimalPlaces( $values[ Form::FIELD_WIDTH ], $this->optionsProvider->getDimensionsNumberOfDecimals() ),
+			Form::FIELD_HEIGHT        => CoreHelper::trimDecimalPlaces( $values[ Form::FIELD_HEIGHT ], $this->optionsProvider->getDimensionsNumberOfDecimals() ),
 			Form::FIELD_ADULT_CONTENT => $order->containsAdultContent(),
 			Form::FIELD_COD           => $order->getCod(),
 			Form::FIELD_VALUE         => $order->getValue(),

src/Packetery/Module/FormFactory.php

@@ -9,7 +9,7 @@
 
 namespace Packetery\Module;
 
-use Packetery\Module\Options\Provider;
+use Packetery\Module\Options\OptionsProvider;
 use Packetery\Nette\Forms\Container;
 use Packetery\Nette\Forms\Controls\TextInput;
 use Packetery\Nette\Forms\Form;
@@ -103,7 +103,7 @@ public function addDimension( Container $container, string $name, string $label,
 	 * @return string
 	 */
 	private function setNumType( string $unit ): string {
-		if ( Provider::DIMENSIONS_UNIT_CM === $unit ) {
+		if ( OptionsProvider::DIMENSIONS_UNIT_CM === $unit ) {
 			return Form::FLOAT;
 		}
 
@@ -118,7 +118,7 @@ private function setNumType( string $unit ): string {
 	 * @return float
 	 */
 	private function setMinValue( string $unit ): float {
-		if ( Provider::DIMENSIONS_UNIT_CM === $unit ) {
+		if ( OptionsProvider::DIMENSIONS_UNIT_CM === $unit ) {
 			return 0.1;
 		}
 

src/Packetery/Module/Options/FlagManager/FeatureFlagDownloader.php

@@ -34,7 +34,7 @@ class FeatureFlagDownloader {
 	 *
 	 * @var string
 	 */
-	private string $endpointUrl;
+	private $endpointUrl;
 
 	/**
 	 * Options provider.

src/Packetery/Module/Options/OptionsProvider.php

@@ -10,7 +10,7 @@
 namespace Packetery\Module\Options;
 
 use Packetery\Core\Entity\PacketStatus;
-use Packetery\Module\Helper;
+use Packetery\Module\ModuleHelper;
 use Packetery\Module\Order\PacketSynchronizer;
 
 /**
@@ -284,7 +284,7 @@ public function getSanitizedDimensionValueInMm( $value ): ?float {
 
 		$sanitizedValue = (float) number_format( (float) $value, $this->getDimensionsNumberOfDecimals(), '.', '' );
 		if ( self::DIMENSIONS_UNIT_CM === $this->getDimensionsUnit() ) {
-			return Helper::convertToMillimeters( $sanitizedValue );
+			return ModuleHelper::convertToMillimeters( $sanitizedValue );
 		}
 
 		return $sanitizedValue;

src/Packetery/Module/Options/Page.php

@@ -480,8 +480,8 @@ public function create_form(): Form {
 			'dimensions_unit',
 			__( 'Units used for dimensions', 'packeta' ),
 			[
-				Provider::DIMENSIONS_UNIT_CM         => 'cm',
-				Provider::DEFAULT_DIMENSIONS_UNIT_MM => 'mm',
+				OptionsProvider::DIMENSIONS_UNIT_CM => 'cm',
+				OptionsProvider::DEFAULT_DIMENSIONS_UNIT_MM => 'mm',
 			]
 		)
 		->setDefaultValue( $this->optionsProvider::DEFAULT_DIMENSIONS_UNIT_MM );
@@ -657,7 +657,7 @@ public function sanitizePacketeryOptions( array $options ): array {
 
 		foreach ( [ 'default_length', 'default_width', 'default_height' ] as $dimension ) {
 			$options[ $dimension ] = is_numeric( $packeteryContainer[ $dimension ]->getValue() )
-				? Helper::trimDecimalPlaces( (float) $packeteryContainer[ $dimension ]->getValue(), 1 )
+				? CoreHelper::trimDecimalPlaces( (float) $packeteryContainer[ $dimension ]->getValue(), 1 )
 				: $packeteryContainer[ $dimension ]->getValue();
 		}
 

src/Packetery/Module/Order/Form.php

@@ -13,7 +13,7 @@
 use Packetery\Core\Validator\Order;
 use Packetery\Module\FormFactory;
 use Packetery\Module\FormValidators;
-use Packetery\Module\Options\Provider;
+use Packetery\Module\Options\OptionsProvider;
 use Packetery\Nette\Forms;
 
 /**
@@ -43,17 +43,17 @@ class Form {
 	/**
 	 * Class Provider
 	 *
-	 * @var Provider
+	 * @var OptionsProvider
 	 */
 	private $options;
 
 	/**
 	 * FormFactory constructor
 	 *
-	 * @param FormFactory $formFactory Form factory.
-	 * @param Provider    $options Options provider.
+	 * @param FormFactory     $formFactory Form factory.
+	 * @param OptionsProvider $options Options provider.
 	 */
-	public function __construct( FormFactory $formFactory, Provider $options ) {
+	public function __construct( FormFactory $formFactory, OptionsProvider $options ) {
 		$this->formFactory = $formFactory;
 		$this->options     = $options;
 	}

src/Packetery/Module/Order/GridExtender.php

@@ -19,7 +19,7 @@
 use Packetery\Module\Exception\InvalidCarrierException;
 use Packetery\Module\Log\Purger;
 use Packetery\Module\ModuleHelper;
-use Packetery\Module\Options\Provider;
+use Packetery\Module\Options\OptionsProvider;
 use Packetery\Module\Plugin;
 use Packetery\Nette\Http\Request;
 use WC_Order;
@@ -85,7 +85,7 @@ class GridExtender {
 	/**
 	 * Settings provider.
 	 *
-	 * @var Module\Options\Provider
+	 * @var OptionsProvider
 	 */
 	private $optionsProvider;
 
@@ -99,7 +99,7 @@ class GridExtender {
 	 * @param Order                 $orderValidator        Order validator.
 	 * @param ContextResolver       $contextResolver       Context resolver.
 	 * @param CarrierOptionsFactory $carrierOptionsFactory Carrier options factory.
-	 * @param Provider              $optionsProvider       Settings provider.
+	 * @param OptionsProvider       $optionsProvider       Settings provider.
 	 */
 	public function __construct(
 		CoreHelper $coreHelper,
@@ -109,7 +109,7 @@ public function __construct(
 		Order $orderValidator,
 		ContextResolver $contextResolver,
 		CarrierOptionsFactory $carrierOptionsFactory,
-		Provider $optionsProvider
+		OptionsProvider $optionsProvider
 	) {
 		$this->coreHelper            = $coreHelper;
 		$this->latteEngine           = $latteEngine;
@@ -427,8 +427,8 @@ public function getSizeInSetDimensionUnit( Core\Entity\Order $order ): Size {
 		$width  = $order->getWidth();
 		$height = $order->getHeight();
 		foreach ( [ $length, $width, $height ] as $dimension ) {
-			if ( null !== $dimension && Module\Options\Provider::DIMENSIONS_UNIT_CM === $this->optionsProvider->getDimensionsUnit() ) {
-				$size[] = Module\Helper::convertToCentimeters( (int) $dimension );
+			if ( null !== $dimension && OptionsProvider::DIMENSIONS_UNIT_CM === $this->optionsProvider->getDimensionsUnit() ) {
+				$size[] = ModuleHelper::convertToCentimeters( (int) $dimension );
 			} else {
 				$size[] = $dimension;
 			}

src/Packetery/Module/Order/Metabox.php

@@ -390,9 +390,9 @@ private function prepareMetaboxParts(): array {
 			$this->form,
 			$order->getFinalWeight(),
 			$order->getFinalWeight(),
-			Provider::DIMENSIONS_UNIT_CM === $unit ? Module\Helper::convertToCentimeters( (int) $order->getLength() ) : $order->getLength(),
-			Provider::DIMENSIONS_UNIT_CM === $unit ? Module\Helper::convertToCentimeters( (int) $order->getWidth() ) : $order->getWidth(),
-			Provider::DIMENSIONS_UNIT_CM === $unit ? Module\Helper::convertToCentimeters( (int) $order->getHeight() ) : $order->getHeight(),
+			OptionsProvider::DIMENSIONS_UNIT_CM === $unit ? ModuleHelper::convertToCentimeters( (int) $order->getLength() ) : $order->getLength(),
+			OptionsProvider::DIMENSIONS_UNIT_CM === $unit ? ModuleHelper::convertToCentimeters( (int) $order->getWidth() ) : $order->getWidth(),
+			OptionsProvider::DIMENSIONS_UNIT_CM === $unit ? ModuleHelper::convertToCentimeters( (int) $order->getHeight() ) : $order->getHeight(),
 			$order->getCod(),
 			$order->getValue(),
 			$order->containsAdultContent(),

tests/Module/HelperTest.php

@@ -5,7 +5,7 @@
 namespace Tests\Module;
 
 use PHPUnit\Framework\TestCase;
-use Packetery\Module\Helper;
+use Packetery\Module\ModuleHelper;
 
 class HelperTest extends TestCase {
 
@@ -42,7 +42,7 @@ public static function convertToCentimetersProvider(): array {
 	 * @dataProvider convertToCentimetersProvider
 	 */
 	public function testConvertToCentimeters( int $input, ?float $expected ): void {
-		$result = Helper::convertToCentimeters( $input );
+		$result = ModuleHelper::convertToCentimeters( $input );
 		$this->assertSame( $expected, $result );
 	}
 
@@ -79,7 +79,7 @@ public static function convertToMillimetersProvider(): array {
 	 * @dataProvider convertToMillimetersProvider
 	 */
 	public function testConvertToMillimeters( float $input, ?float $expected ): void {
-		$result = Helper::convertToMillimeters( $input );
+		$result = ModuleHelper::convertToMillimeters( $input );
 		$this->assertSame( $expected, $result );
 	}
 

tests/Module/Options/ProviderTest.php

@@ -4,7 +4,7 @@
 
 namespace Tests\Module\Options;
 
-use Packetery\Module\Options\Provider;
+use Packetery\Module\Options\OptionsProvider;
 use PHPUnit\Framework\TestCase;
 
 class ProviderTest extends TestCase {
@@ -34,12 +34,12 @@ public static function dimensionsUnitProvider(): array {
 	 * @dataProvider dimensionsUnitProvider
 	 */
 	public function testGetDimensionsNumberOfDecimals( string $unit, int $expectedDecimals ): void {
-		$provider = $this->getMockBuilder( Provider::class )
-		                 ->onlyMethods( [ 'getDimensionsUnit' ] )
-		                 ->getMock();
+		$provider = $this->getMockBuilder( OptionsProvider::class )
+			->onlyMethods( [ 'getDimensionsUnit' ] )
+			->getMock();
 
 		$provider->method( 'getDimensionsUnit' )
-		         ->willReturn( $unit );
+			->willReturn( $unit );
 
 		$result = $provider->getDimensionsNumberOfDecimals();
 		$this->assertSame( $expectedDecimals, $result );
@@ -95,15 +95,15 @@ public function testGetSanitizedDimensionValueInMm(
 		int $numberOfDecimals,
 		string $unit
 	): void {
-		$provider = $this->getMockBuilder( Provider::class )
-		                 ->onlyMethods( [ 'getDimensionsNumberOfDecimals', 'getDimensionsUnit' ] )
-		                 ->getMock();
+		$provider = $this->getMockBuilder( OptionsProvider::class )
+			->onlyMethods( [ 'getDimensionsNumberOfDecimals', 'getDimensionsUnit' ] )
+			->getMock();
 
 		$provider->method( 'getDimensionsNumberOfDecimals' )
-		         ->willReturn( $numberOfDecimals );
+			->willReturn( $numberOfDecimals );
 
 		$provider->method( 'getDimensionsUnit' )
-		         ->willReturn( $unit );
+			->willReturn( $unit );
 
 		$result = $provider->getSanitizedDimensionValueInMm( $dimensionValue );
 		$this->assertEquals( $expectedValue, $result );

tests/Module/Order/GridExtenderTest.php

@@ -6,11 +6,12 @@
 
 use Packetery\Core\Entity\Order;
 use Packetery\Core\Entity\Size;
-use Packetery\Core\Helper;
+use Packetery\Core\CoreHelper;
 use Packetery\Core\Validator;
 use Packetery\Latte\Engine;
+use Packetery\Module\Carrier\CarrierOptionsFactory;
 use Packetery\Module\ContextResolver;
-use Packetery\Module\Options\Provider;
+use Packetery\Module\Options\OptionsProvider;
 use Packetery\Module\Order\GridExtender;
 use Packetery\Module\Order\Repository;
 use Packetery\Nette\Http\Request;
@@ -24,7 +25,7 @@ public static function sizeProvider(): array {
 				'length'       => 300.0,
 				'width'        => 200.0,
 				'height'       => 100.0,
-				'unit'         => Provider::DIMENSIONS_UNIT_CM,
+				'unit'         => OptionsProvider::DIMENSIONS_UNIT_CM,
 				'expectedSize' => new Size( 30.0, 20.0, 10.0 )
 			],
 			[
@@ -60,16 +61,17 @@ public function testGetSizeInSetDimensionUnit( $length, $width, $height, $unit,
 		$order->method( 'getWidth' )->willReturn( $width );
 		$order->method( 'getHeight' )->willReturn( $height );
 
-		$optionsProvider = $this->createMock( Provider::class );
+		$optionsProvider = $this->createMock( OptionsProvider::class );
 		$optionsProvider->method( 'getDimensionsUnit' )->willReturn( $unit );
 
 		$gridExtender = new GridExtender(
-			$this->createMock( Helper::class ),
+			$this->createMock( CoreHelper::class ),
 			$this->createMock( Engine::class ),
 			$this->createMock( Request::class ),
 			$this->createMock( Repository::class ),
 			$this->createMock( Validator\Order::class ),
 			$this->createMock( ContextResolver::class ),
+			$this->createMock( CarrierOptionsFactory::class ),
 			$optionsProvider,
 		);