Merge pull request #64 from Setono/new-event-approach

Use new meta conversions API libraries
Setono · Jul 27, 2022 · b50a727 · b50a727
2 parents 80a51ac + 3cc0973
commit b50a727
Show file tree

Hide file tree

Showing 110 changed files with 984 additions and 3,446 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -74,7 +74,6 @@ jobs:
                     - "highest"
 
                 symfony:
-                    - "^4.4"
                     - "^5.4"
 
         steps:
@@ -118,7 +117,6 @@ jobs:
                     - "highest"
 
                 symfony:
-                    - "^4.4"
                     - "^5.4"
 
         steps:
@@ -162,7 +160,6 @@ jobs:
                     - "highest"
 
                 symfony:
-                    - "^4.4"
                     - "^5.4"
 
         steps:
@@ -203,7 +200,6 @@ jobs:
                     - "highest"
 
                 symfony:
-                    - "^4.4"
                     - "^5.4"
 
         steps:
@@ -229,18 +225,16 @@ jobs:
                     dependency-versions: "${{ matrix.dependencies }}"
 
             -   name: "Lint container"
-                # Do not lint on SF4 because we get this error: Invalid definition for service "doctrine.migrations.dependency_factory": argument 2 of "Doctrine\Migrations\DependencyFactory::setDefinition()" accepts "callable", "SyliusLabs\DoctrineMigrationsExtraBundle\Factory\ContainerAwareVersionFactory" passed.
-                # Note: We cannot use the if statement here, because of https://github.community/t/matrix-cannot-be-used-in-jobs-level-if/17177/10
-                run: 'if [ "${{ matrix.symfony }}" != "^4.4" ]; then (cd tests/Application && bin/console lint:container); fi'
+                run: "(cd tests/Application && bin/console lint:container)"
 
             -   name: "Create database"
-                run: "(cd tests/Application && bin/console doctrine:database:create -vvv)"
+                run: "(cd tests/Application && bin/console doctrine:database:create)"
 
             -   name: "Create database schema"
-                run: "(cd tests/Application && bin/console doctrine:schema:create -vvv)"
+                run: "(cd tests/Application && bin/console doctrine:schema:create)"
 
             -   name: "Validate Doctrine mapping"
-                run: "(cd tests/Application && bin/console doctrine:schema:validate -vvv)"
+                run: "(cd tests/Application && bin/console doctrine:schema:validate)"
 
     code-coverage:
         name: "Code Coverage (PHP${{ matrix.php-version }} | Deps: ${{ matrix.dependencies }})"

diff --git a/composer-unused.php b/composer-unused.php
@@ -7,8 +7,7 @@
 
 return static function (Configuration $config): Configuration {
     return $config
-        ->addNamedFilter(NamedFilter::fromString('setono/consent-bundle'))
-        ->addNamedFilter(NamedFilter::fromString('symfony/http-client'))
-        ->addNamedFilter(NamedFilter::fromString('symfony/lock'))
+        ->addNamedFilter(NamedFilter::fromString('doctrine/orm'))
+        ->addNamedFilter(NamedFilter::fromString('symfony/routing'))
     ;
 };
diff --git a/composer.json b/composer.json
@@ -7,60 +7,54 @@
         "sylius",
         "sylius-plugin",
         "setono",
-        "facebook"
+        "facebook",
+        "meta",
+        "server side tracking"
     ],
     "require": {
         "php": ">=7.4",
         "ext-json": "*",
         "doctrine/collections": "^1.6",
         "doctrine/dbal": "^2.13",
         "doctrine/orm": "^2.12",
-        "facebook/php-business-sdk": "^13.0",
         "fakerphp/faker": "^1.19",
         "knplabs/knp-menu": "^3.3",
+        "psr/event-dispatcher": "^1.0",
         "psr/log": "^1.1 || ^2.0 || ^3.0",
-        "setono/bot-detection-bundle": "^1.7",
-        "setono/client-id-bundle": "^0.2",
-        "setono/client-id-contracts": "^0.2",
-        "setono/consent-bundle": "^0.1",
-        "setono/consent-contracts": "^0.1",
-        "setono/symfony-main-request-trait": "^1.0",
+        "setono/meta-conversions-api-bundle": "dev-master",
+        "setono/meta-conversions-api-php-sdk": "^0.2.2",
         "sylius/resource-bundle": "^1.6",
-        "symfony/config": "^4.4 || ^5.4",
-        "symfony/console": "^4.4 || ^5.4",
-        "symfony/dependency-injection": "^4.4 || ^5.4",
-        "symfony/event-dispatcher": "^4.4 || ^5.4",
-        "symfony/form": "^4.4 || ^5.4",
-        "symfony/http-client": "^5.4 || ^6.0",
-        "symfony/http-client-contracts": "^2.4 || ^3.1",
-        "symfony/http-foundation": "^4.4 || ^5.4",
-        "symfony/http-kernel": "^4.4 || ^5.4",
-        "symfony/lock": "^4.4 || ^5.4",
-        "symfony/options-resolver": "^4.4 || ^5.4",
-        "symfony/routing": "^4.4 || ^5.4",
-        "symfony/security-bundle": "^4.4 || ^5.4",
-        "symfony/uid": "^5.4 || ^6.0",
-        "symfony/workflow": "^4.4 || ^5.4",
-        "twig/twig": "^2.0 || ^3.0",
+        "symfony/config": "^5.4",
+        "symfony/dependency-injection": "^5.4",
+        "symfony/event-dispatcher": "^5.4",
+        "symfony/form": "^5.4",
+        "symfony/http-foundation": "^5.4",
+        "symfony/http-kernel": "^5.4",
+        "symfony/options-resolver": "^5.4",
+        "symfony/routing": "^5.4",
         "webmozart/assert": "^1.11"
     },
     "require-dev": {
         "api-platform/core": "^2.6",
         "friendsofsymfony/oauth-server-bundle": ">2.0.0-alpha.0 ^2.0@dev",
+        "kriswallsmith/buzz": "^1.2",
         "lexik/jwt-authentication-bundle": "^2.16",
         "matthiasnoback/symfony-config-test": "^4.3",
         "matthiasnoback/symfony-dependency-injection-test": "^4.3",
+        "nyholm/psr7": "^1.5",
         "phpunit/phpunit": "^9.5",
         "psalm/plugin-phpunit": "^0.17",
         "psalm/plugin-symfony": "^3.1",
         "roave/security-advisories": "dev-latest",
         "setono/code-quality-pack": "^2.2",
+        "setono/tag-bag": "^2.0@alpha",
+        "setono/tag-bag-bundle": "^3.0@alpha",
         "sylius/admin-api-bundle": "^1.11",
         "sylius/sylius": "~1.10.14",
-        "symfony/debug-bundle": "^4.4 || ^5.4",
-        "symfony/dotenv": "^4.4 || ^5.4",
-        "symfony/intl": "^4.4 || ^5.4",
-        "symfony/web-profiler-bundle": "^4.4 || ^5.4",
+        "symfony/debug-bundle": "^5.4",
+        "symfony/dotenv": "^5.4",
+        "symfony/intl": "^5.4",
+        "symfony/web-profiler-bundle": "^5.4",
         "symfony/webpack-encore-bundle": "^1.14"
     },
     "prefer-stable": true,
@@ -90,9 +84,9 @@
             "@ensure-test-container-exists",
             "psalm"
         ],
-        "check-style": "ecs check --ansi",
+        "check-style": "ecs check",
         "ensure-test-container-exists": "[[ -f tests/Application/var/cache/test/ApplicationTests_Setono_SyliusFacebookPlugin_Application_KernelTestDebugContainer.xml ]] || tests/Application/bin/console cache:warmup --env=test",
-        "fix-style": "ecs check --ansi --fix",
+        "fix-style": "ecs check --fix",
         "phpunit": "phpunit"
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -15,9 +15,5 @@
         <server name="IS_DOCTRINE_ORM_SUPPORTED" value="true" />
         <env name="APP_ENV" value="test"/>
         <env name="SHELL_VERBOSITY" value="-1" />
-        <env name="FACEBOOK_LIVE" value="0"/> <!-- Set to true and insert a token below to test live requests to Facebook API -->
-        <env name="FACEBOOK_PIXEL_ID" value=""/> <!-- Insert your Facebook PIXEL_ID -->
-        <env name="FACEBOOK_ACCESS_TOKEN" value=""/> <!-- Insert your Facebook ACCESS_TOKEN -->
-        <env name="FACEBOOK_TEST_EVENT_CODE" value=""/> <!-- Insert your Facebook test_event_code (optional) -->
     </php>
 </phpunit>
diff --git a/src/Client/Client.php b/src/Client/Client.php
diff --git a/src/Client/ClientInterface.php b/src/Client/ClientInterface.php
diff --git a/src/Command/CleanupEventsCommand.php b/src/Command/CleanupEventsCommand.php
diff --git a/src/Command/DelayAwareCommand.php b/src/Command/DelayAwareCommand.php