ver. 0.294: Remove all 12 legacy autoload/shop/ classes (~2363 lines)
Complete Domain-Driven Architecture migration: - Phase 1-4: Transport, ProductSet, Coupon, Shop, Search, Basket, ProductCustomField, Category, ProductAttribute, Promotion - Phase 5: Order (~562 lines) + Product (~952 lines) - ~20 Product methods migrated to ProductRepository - Apilo sync migrated to OrderAdminService - Production hotfixes: stale Redis cache (prices 0.00), unqualified Product:: refs in LayoutEngine, object->array template conversion - AttributeRepository::getAttributeValueById() Redis cache added Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -181,15 +181,6 @@ class PromotionRepositoryTest extends TestCase
|
||||
// Frontend: basket promotion logic (migrated from front\factory\ShopPromotion)
|
||||
// =========================================================================
|
||||
|
||||
private function mockPromotion(array $data): object
|
||||
{
|
||||
return new class($data) {
|
||||
private $data;
|
||||
public function __construct($data) { $this->data = $data; }
|
||||
public function __get($key) { return isset($this->data[$key]) ? $this->data[$key] : null; }
|
||||
};
|
||||
}
|
||||
|
||||
private function makeBasket(array $items): array
|
||||
{
|
||||
$basket = [];
|
||||
@@ -212,12 +203,12 @@ class PromotionRepositoryTest extends TestCase
|
||||
$mockStmt->method('fetchAll')->willReturn([['category_id' => 1]]);
|
||||
$mockDb->method('query')->willReturn($mockStmt);
|
||||
|
||||
$promotion = $this->mockPromotion([
|
||||
$promotion = [
|
||||
'discount_type' => 1,
|
||||
'amount' => 10,
|
||||
'include_coupon' => 0,
|
||||
'include_product_promo' => 0,
|
||||
]);
|
||||
];
|
||||
|
||||
$basket = $this->makeBasket([
|
||||
['id' => 1],
|
||||
@@ -244,14 +235,14 @@ class PromotionRepositoryTest extends TestCase
|
||||
$mockStmt->method('fetchAll')->willReturn([['category_id' => 5]]);
|
||||
$mockDb->method('query')->willReturn($mockStmt);
|
||||
|
||||
$promotion = $this->mockPromotion([
|
||||
'categories' => json_encode([5]),
|
||||
'condition_categories' => json_encode([10]),
|
||||
$promotion = [
|
||||
'categories' => [5],
|
||||
'condition_categories' => [10],
|
||||
'discount_type' => 1,
|
||||
'amount' => 15,
|
||||
'include_coupon' => 1,
|
||||
'include_product_promo' => 0,
|
||||
]);
|
||||
];
|
||||
|
||||
$basket = $this->makeBasket([['id' => 1]]);
|
||||
|
||||
@@ -282,14 +273,14 @@ class PromotionRepositoryTest extends TestCase
|
||||
);
|
||||
$mockDb->method('query')->willReturn($mockStmt1);
|
||||
|
||||
$promotion = $this->mockPromotion([
|
||||
'categories' => json_encode([5]),
|
||||
'condition_categories' => json_encode([10]),
|
||||
$promotion = [
|
||||
'categories' => [5],
|
||||
'condition_categories' => [10],
|
||||
'discount_type' => 1,
|
||||
'amount' => 20,
|
||||
'include_coupon' => 0,
|
||||
'include_product_promo' => 0,
|
||||
]);
|
||||
];
|
||||
|
||||
$basket = $this->makeBasket([
|
||||
['id' => 1],
|
||||
@@ -316,14 +307,14 @@ class PromotionRepositoryTest extends TestCase
|
||||
$mockStmt->method('fetchAll')->willReturn([['category_id' => 99]]); // nie pasuje do condition_categories
|
||||
$mockDb->method('query')->willReturn($mockStmt);
|
||||
|
||||
$promotion = $this->mockPromotion([
|
||||
'categories' => json_encode([5]),
|
||||
'condition_categories' => json_encode([10]),
|
||||
$promotion = [
|
||||
'categories' => [5],
|
||||
'condition_categories' => [10],
|
||||
'discount_type' => 1,
|
||||
'amount' => 20,
|
||||
'include_coupon' => 0,
|
||||
'include_product_promo' => 0,
|
||||
]);
|
||||
];
|
||||
|
||||
$basket = $this->makeBasket([['id' => 1]]);
|
||||
|
||||
@@ -353,14 +344,14 @@ class PromotionRepositoryTest extends TestCase
|
||||
);
|
||||
$mockDb->method('query')->willReturn($mockStmt);
|
||||
|
||||
$promotion = $this->mockPromotion([
|
||||
'categories' => json_encode([5]),
|
||||
'condition_categories' => json_encode([10]),
|
||||
$promotion = [
|
||||
'categories' => [5],
|
||||
'condition_categories' => [10],
|
||||
'discount_type' => 1,
|
||||
'amount' => 25,
|
||||
'include_coupon' => 1,
|
||||
'include_product_promo' => 0,
|
||||
]);
|
||||
];
|
||||
|
||||
$basket = $this->makeBasket([
|
||||
['id' => 1],
|
||||
|
||||
@@ -4,21 +4,24 @@ namespace Tests\Unit\front\Controllers;
|
||||
use PHPUnit\Framework\TestCase;
|
||||
use front\Controllers\ShopOrderController;
|
||||
use Domain\Order\OrderRepository;
|
||||
use Domain\Order\OrderAdminService;
|
||||
|
||||
class ShopOrderControllerTest extends TestCase
|
||||
{
|
||||
private $repository;
|
||||
private $adminService;
|
||||
private $controller;
|
||||
|
||||
protected function setUp(): void
|
||||
{
|
||||
$this->repository = $this->createMock(OrderRepository::class);
|
||||
$this->controller = new ShopOrderController($this->repository);
|
||||
$this->adminService = $this->createMock(OrderAdminService::class);
|
||||
$this->controller = new ShopOrderController($this->repository, $this->adminService);
|
||||
}
|
||||
|
||||
public function testConstructorAcceptsRepository(): void
|
||||
{
|
||||
$controller = new ShopOrderController($this->repository);
|
||||
$controller = new ShopOrderController($this->repository, $this->adminService);
|
||||
$this->assertInstanceOf(ShopOrderController::class, $controller);
|
||||
}
|
||||
|
||||
@@ -37,7 +40,8 @@ class ShopOrderControllerTest extends TestCase
|
||||
$constructor = $reflection->getConstructor();
|
||||
$params = $constructor->getParameters();
|
||||
|
||||
$this->assertCount(1, $params);
|
||||
$this->assertCount(2, $params);
|
||||
$this->assertEquals('Domain\Order\OrderRepository', $params[0]->getType()->getName());
|
||||
$this->assertEquals('Domain\Order\OrderAdminService', $params[1]->getType()->getName());
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user