Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions .github/workflows/generate_php_sources.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

steps:
- uses: actions/checkout@v4

- name: Make gradlew executable
run: chmod +x ./gradlew

Expand Down Expand Up @@ -55,9 +55,12 @@ jobs:
- name: Test SDKs
run: python ./scripts/test_sdk.py --language php
env:
TEST_CLIENT_ID: ${{ secrets.SDK_TEST_CLIENT_ID }}
TEST_CLIENT_SECRET: ${{ secrets.SDK_TEST_CLIENT_SECRET }}
TEST_APPLICATION_ID: ${{ secrets.SDK_TEST_APPLICATION_ID }}
RETAILMEDIA_TEST_CLIENT_ID: ${{ secrets.RETAILMEDIA_SDK_TEST_CLIENT_ID }}
RETAILMEDIA_TEST_CLIENT_SECRET: ${{ secrets.RETAILMEDIA_SDK_TEST_CLIENT_SECRET }}
RETAILMEDIA_TEST_APPLICATION_ID: ${{ secrets.RETAILMEDIA_SDK_TEST_APPLICATION_ID }}
MARKETINGSOLUTIONS_TEST_CLIENT_ID: ${{ secrets.MARKETINGSOLUTIONS_SDK_TEST_CLIENT_ID }}
MARKETINGSOLUTIONS_TEST_CLIENT_SECRET: ${{ secrets.MARKETINGSOLUTIONS_SDK_TEST_CLIENT_SECRET }}
MARKETINGSOLUTIONS_TEST_APPLICATION_ID: ${{ secrets.MARKETINGSOLUTIONS_SDK_TEST_APPLICATION_ID }}
shell: bash

- name: Upload SDKs
Expand Down
11 changes: 7 additions & 4 deletions .github/workflows/test_php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

steps:
- uses: actions/checkout@v4

- name: Make gradlew executable
run: chmod +x ./gradlew

Expand Down Expand Up @@ -51,7 +51,10 @@ jobs:
- name: Test SDKs
run: python ./scripts/test_sdk.py --language php
env:
TEST_CLIENT_ID: ${{ secrets.SDK_TEST_CLIENT_ID }}
TEST_CLIENT_SECRET: ${{ secrets.SDK_TEST_CLIENT_SECRET }}
TEST_APPLICATION_ID: ${{ secrets.SDK_TEST_APPLICATION_ID }}
RETAILMEDIA_TEST_CLIENT_ID: ${{ secrets.RETAILMEDIA_SDK_TEST_CLIENT_ID }}
RETAILMEDIA_TEST_CLIENT_SECRET: ${{ secrets.RETAILMEDIA_SDK_TEST_CLIENT_SECRET }}
RETAILMEDIA_TEST_APPLICATION_ID: ${{ secrets.RETAILMEDIA_SDK_TEST_APPLICATION_ID }}
MARKETINGSOLUTIONS_TEST_CLIENT_ID: ${{ secrets.MARKETINGSOLUTIONS_SDK_TEST_CLIENT_ID }}
MARKETINGSOLUTIONS_TEST_CLIENT_SECRET: ${{ secrets.MARKETINGSOLUTIONS_SDK_TEST_CLIENT_SECRET }}
MARKETINGSOLUTIONS_TEST_APPLICATION_ID: ${{ secrets.MARKETINGSOLUTIONS_SDK_TEST_APPLICATION_ID }}
shell: bash
3 changes: 3 additions & 0 deletions generator/php/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@ task generateClient(type: GradleBuild) {
invokerPackage : "${namespaceBase}".toString(),
packageName : "criteo-api-${criteoService}-sdk".toString(),
]
additionalProperties = [
criteoServiceAsPrefix : "${criteoService}".toString().toUpperCase(),
]
}


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ class GatewayApiTest extends TestCase
{
parent::__construct();

$this->clientId = $_SERVER["TEST_CLIENT_ID"];
$this->clientSecret = $_SERVER["TEST_CLIENT_SECRET"];
$this->applicationId = (int) $_SERVER["TEST_APPLICATION_ID"];
$this->clientId = $_SERVER["{{criteoServiceAsPrefix}}_TEST_CLIENT_ID"];
$this->clientSecret = $_SERVER["{{criteoServiceAsPrefix}}_TEST_CLIENT_SECRET"];
$this->applicationId = (int) $_SERVER["{{criteoServiceAsPrefix}}_TEST_APPLICATION_ID"];
}

public function secretEnvironmentVariables()
Expand Down