Skip to content

__DIR__ Typo fixed#3

Closed
pborreli wants to merge 1 commit into
magento:masterfrom
pborreli:patch-1
Closed

__DIR__ Typo fixed#3
pborreli wants to merge 1 commit into
magento:masterfrom
pborreli:patch-1

Conversation

@pborreli

Copy link
Copy Markdown

It's dirname(__FILE__) or __DIR__, not both.

@pborreli

Copy link
Copy Markdown
Author

closing as it's not a bug actually.

searching for the directory of a directory can look weird to me but is a feature here.

@pborreli pborreli closed this Dec 14, 2011
@WouterSteen WouterSteen mentioned this pull request Oct 3, 2014
@askwhyweb askwhyweb mentioned this pull request Dec 18, 2014
@sivajik34 sivajik34 mentioned this pull request Jan 2, 2015
@cframery cframery mentioned this pull request Jan 7, 2015
@nabeelfocus nabeelfocus mentioned this pull request Jan 3, 2024
5 tasks
@alicedfisheye alicedfisheye mentioned this pull request May 14, 2024
5 tasks
@FabXav FabXav mentioned this pull request Oct 11, 2024
5 tasks
magento-devops-reposync-svc pushed a commit that referenced this pull request Feb 5, 2026
Fixed 3 errors:
1. DateTest: Made providerGetValue() static
2. PaginationProcessorTest: Added setCurPage/setPageSize to onlyMethods
3. CustomizationTest: Replaced self::once()/self::never() with string representations

Error #1: Data Provider method not static
- providerGetValue() → public static function providerGetValue()

Error #2: MethodCannotBeConfiguredException for setCurPage/setPageSize
- Added missing methods to onlyMethods() array in AbstractDb mock

Error #3: Non-static method self::once() called statically in data provider
- Replaced self::once() → 'once', self::never() → 'never'
- Added MockCreationTrait import
- Used createInvocationMatcher() in test method to convert strings

Pattern: For data providers with matcher expectations, use string
representations and convert them in test methods with createInvocationMatcher()
@raccoonuk raccoonuk mentioned this pull request May 30, 2026
5 tasks
alin-vlad added a commit to alin-vlad/magento2 that referenced this pull request Jun 8, 2026
…etic pickup billing (avoid Cleverplusplus reject)

Ultrareview magento#3 (P2, regression from U-B108). On a pickup->locker (or pickup->address)
switch, clearStaleDestinationOnAddressSwitch() nulls the synthetic pickup billing
(street/city/region/region_id). Locker writes no billing and Billing does not listen
to shipping_address_saved/delivery_mode_changed, so its props can keep a stale-valid
billing (typed earlier in courier, then a pickup detour) while the quote billing
region_id is null. validateFields() trusts the props (it short-circuits only for
isPickupMode, not locker), so the place-order gate passes — then
Cleverplusplus_Sales::ValidateAddressesBeforeSubmit rejects the order on the empty
quote billing (it requires street/city/region_id/...): a generic "Sorry, you cannot
place this order." hard-block.

Fix: when the synthetic billing is actually cleared, Delivery emits
billing_address_saved (already wired to Billing::onBillingAddressSelected ->
hydrateFromQuote). Billing re-hydrates from the now-cleared quote so its address
props drop to the cleared state (company / vat_id preserved — U-B2/C1) and the gate
friendly-requires the billing address again instead of letting an empty quote reach
Cleverplusplus. Reuses existing wiring; only fires on the synthetic-clear path.

Tests (failing-first): 2 DeliveryTest cases — synthetic clear -> billing_address_saved
emitted; real billing -> not emitted. Full Otter phpunit 961 green; u-b108 summary E2E
+ s44 billing E2E pass; pre-release SKIP_E2E GO. Follow-up: a gateway-mocked placeOrder
E2E over the courier-billing -> pickup -> locker divergence. LOCAL-ONLY.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
alin-vlad added a commit to alin-vlad/magento2 that referenced this pull request Jun 8, 2026
…gento#3)

The #otter-localities-data island inlined the full county→localities map into
every checkout HTML as { county: [{value,label}, ...] } — 577 KB raw / 132 KB
gzip — where the label is just the title-cased value (a pure derivation, ~54% of
the payload was the duplicated label + the per-row object overhead).

LocalitiesData now projects the client island to VALUE-ONLY arrays
({ county: ["VAL", ...] }); locality-reset.js rebuilds the {value,label} shape on
parse by title-casing each value (otterTitleCase), so every downstream consumer
(the native-select rebuild + the desktop combobox via otter:locality-options) is
unchanged. getAllLocalitiesMap keeps its {value,label} shape — server consumers
untouched; only this client projection changed.

Lossless — PROVEN, not sampled: otterTitleCase is byte-identical to PHP
mb_convert_case(MB_CASE_TITLE) across ALL 13,781 localities (0 mismatches). The
match required replicating PHP's Unicode word-break: capitalize after any
non-letter EXCEPT '.', which is case-ignorable between letters ("C.A. ROSETTI" ->
"C.a. Rosetti", "CLUJ-NAPOCA" -> "Cluj-Napoca", "DUMBRAVA (SASCIORI, AB)" ->
"Dumbrava (Sasciori, Ab)"). The first-cut [^letter] rule was wrong; the parity
diff caught it.

Result: island 577->168 KB raw, 132->56 KB gzip (-57.6%) on every checkout load.
Verified: e2e u-b104 (Title-Case display) + u-b106 (instant reset) + s37 green.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
alin-vlad added a commit to alin-vlad/magento2 that referenced this pull request Jun 8, 2026
Records the perf sprint: 7 shipped fixes (U-B135…U-B141), the two third-party
DI-preference mechanisms (TimeoutService / CachedTokenOrsData swap/override the
vendors' PROTECTED members — never editing source), the magento#2 carrier-mis-target
correction (Carriergo → Carrier), and the 3 declined candidates with evidence:
magento#5 (cityOptions is client-$wire on the shared autocomplete primitive; page weight
already banked by magento#3), magento#9 (conflicts U-B67's instant PF/PJ toggle), magento#10 (the
documented Hyva out-of-sync resync; targeted emits risk staleness). AGENTS.md ADR
index updated.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
alin-vlad added a commit to alin-vlad/magento2 that referenced this pull request Jun 8, 2026
… island (magento#3)

U-B138 projected the client island to value-only arrays but left this ViewModel
test asserting the old {value,label} shape (it wasn't in the targeted run — the
localitate e2e was). Now asserts the value-only projection. Full Otter suite
1047/1047.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
alin-vlad added a commit to alin-vlad/magento2 that referenced this pull request Jun 8, 2026
…ento#3)

InnoShip\...\Rest\Service logs the full /api/Order (AWB) request body — recipient
name, phone, full street — on a courier error (Service.php:105, ungated), and
logs X-Api-Key headers in logRequestResponse(). The module is read-only and the
leak is inline in the method (no interceptable seam), so a Monolog PROCESSOR (the
standard log-scrubbing mechanism, not a vendor-method rewrite) is wired onto the
InnoShip logger via di.xml — merging with its own name+handlers declaration. It
redacts PII keys (name/phone/email/street/recipient/locality + x-api-key) from
each record's message (when it's a JSON body) and context before the handler
writes. Fail-open: non-JSON/non-array records pass through unchanged.

Verified: 3 unit tests (recipient PII in a JSON AWB body redacted + non-PII
preserved; X-Api-Key + phone redacted from context + non-PII preserved; non-JSON
message untouched); cache:flush clean (di merge valid).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants