Skip to content

Commit 59048ee

Browse files
committed
[UC-23] Remove GA4 plugin dependency from composer.json
1 parent a943e80 commit 59048ee

11 files changed

Lines changed: 9 additions & 145 deletions

File tree

composer.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,17 @@
66
"license": "MIT",
77
"require": {
88
"php": "^8.1",
9-
"bitbag/coding-standard": "^3.0",
10-
"bitbag/google-analytics-4-plugin": "^1.0",
9+
"bitbag/sylius-feed-plugin": "~0.2",
10+
"ext-openssl": "*",
1111
"sylius/sylius": "~1.13.0",
12+
"symfony/amqp-messenger": "^5.4 || ^6.4 || ^7.0",
1213
"symfony/messenger": "^5.4 || ^6.4",
13-
"symfony/webpack-encore-bundle": "^1.15",
14-
"ext-openssl": "*",
15-
"bitbag/sylius-feed-plugin": "~0.2",
16-
"symfony/amqp-messenger": "^5.4 || ^6.4 || ^7.0"
14+
"symfony/webpack-encore-bundle": "^1.15"
1715
},
1816
"require-dev": {
1917
"behat/behat": "^3.6.1",
2018
"behat/mink-selenium2-driver": "^1.4",
19+
"bitbag/coding-standard": "^3.0",
2120
"dbrekelmans/bdi": "^1.1",
2221
"dmore/behat-chrome-extension": "^1.3",
2322
"dmore/chrome-mink-driver": "^2.7",

config/bundles.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,5 @@
44
League\FlysystemBundle\FlysystemBundle::class => ['all' => true],
55
Setono\SyliusFeedPlugin\SetonoSyliusFeedPlugin::class => ['all' => true],
66
Setono\DoctrineORMBatcherBundle\SetonoDoctrineORMBatcherBundle::class => ['all' => true],
7-
Spinbits\SyliusGoogleAnalytics4Plugin\SpinbitsSyliusGoogleAnalytics4Plugin::class => ['all' => true],
87
Sylius\Bundle\GridBundle\SyliusGridBundle::class => ['all' => true],
98
];

doc/installation.md

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
2. Add required environment variables to your `.env` file:
77
```dotenv
88
USER_COM_FRONTEND_API_KEY=""
9-
GOOGLE_ANALYTICS_TAG=""
109
USER_COM_ENCRYPTION_KEY=your-32-character-long-key
1110
USER_COM_ENCRYPTION_IV=your-16-character-long-iv
1211
MESSENGER_USER_COM_ASYNCHRONOUS_DSN=""
@@ -16,7 +15,6 @@
1615
return [
1716
...
1817
BitBag\SyliusUserComPlugin\BitBagSyliusUserComPlugin::class => ['all' => true],
19-
Spinbits\SyliusGoogleAnalytics4Plugin\SpinbitsSyliusGoogleAnalytics4Plugin::class => ['all' => true],
2018
League\FlysystemBundle\FlysystemBundle::class => ['all' => true],
2119
Setono\SyliusFeedPlugin\SetonoSyliusFeedPlugin::class => ['all' => true],
2220
Setono\DoctrineORMBatcherBundle\SetonoDoctrineORMBatcherBundle::class => ['all' => true],
@@ -51,21 +49,15 @@
5149
```
5250
5351
>`UserComApiAwareTrait` contains mapping for annotations and for attributes which are required by UserCom integration. If you're using xml mapping, you should add mapping for those properties in your `Channel.orm.xml` file.
54-
55-
7. Take advantage of channel based configuration of GoogleAnalyticsPlugin by adding :
56-
```yaml
57-
spinbits_sylius_google_analytics4:
58-
id: "%env(GOOGLE_ANALYTICS_TAG)%"
59-
enabled: true
60-
```
61-
8. Compile assets
52+
53+
7. Compile assets
6254
```bash
6355
yarn install && yarn build
6456
```
65-
9. Add API credentials and GTM to your channel configuration in admin panel. If you decided to extend different object, please make sure that API credentials are set.
57+
8. Add API credentials and GTM to your channel configuration in admin panel. If you decided to extend different object, please make sure that API credentials are set.
6658
![Channel configuration](../doc/user_com_configuration.png)
6759
68-
10. Configure consumer to run in supervisor:
60+
9. Configure consumer to run in supervisor:
6961
```bash
7062
bin/console messenger:consume user_com_asynchronous
7163
```

src/BitBagSyliusUserComPlugin.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,13 @@
44

55
namespace BitBag\SyliusUserComPlugin;
66

7-
use BitBag\SyliusUserComPlugin\DependencyInjection\LogoutSubscriberPass;
87
use Sylius\Bundle\CoreBundle\Application\SyliusPluginTrait;
9-
use Symfony\Component\DependencyInjection\ContainerBuilder;
108
use Symfony\Component\HttpKernel\Bundle\Bundle;
119

1210
final class BitBagSyliusUserComPlugin extends Bundle
1311
{
1412
use SyliusPluginTrait;
1513

16-
public function build(ContainerBuilder $container): void
17-
{
18-
$container->addCompilerPass(new LogoutSubscriberPass());
19-
}
20-
2114
public function getPath(): string
2215
{
2316
return \dirname(__DIR__);

src/DTO/Event/Logout.php

Lines changed: 0 additions & 29 deletions
This file was deleted.

src/DependencyInjection/LogoutSubscriberPass.php

Lines changed: 0 additions & 51 deletions
This file was deleted.

src/Security/Handler/LogoutEventAddHandler.php

Lines changed: 0 additions & 30 deletions
This file was deleted.

tests/Application/.env

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ SYLIUS_MESSENGER_TRANSPORT_CATALOG_PROMOTION_REMOVAL_FAILED_DSN=doctrine://defau
3434

3535
###> UserCom
3636
USER_COM_FRONTEND_API_KEY=""
37-
GOOGLE_ANALYTICS_TAG=""
3837
USER_COM_ENCRYPTION_KEY=your-32-character-long-key
3938
USER_COM_ENCRYPTION_IV=your-16-character-long-
4039
MESSENGER_USER_COM_ASYNCHRONOUS_DSN="doctrine://default"

tests/Application/config/bundles.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,5 @@
6060
League\FlysystemBundle\FlysystemBundle::class => ['all' => true],
6161
Setono\SyliusFeedPlugin\SetonoSyliusFeedPlugin::class => ['all' => true],
6262
Setono\DoctrineORMBatcherBundle\SetonoDoctrineORMBatcherBundle::class => ['all' => true],
63-
Spinbits\SyliusGoogleAnalytics4Plugin\SpinbitsSyliusGoogleAnalytics4Plugin::class => ['all' => true],
6463
Sylius\Bundle\GridBundle\SyliusGridBundle::class => ['all' => true],
6564
];

tests/Application/config/packages/_sylius.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,3 @@ sylius_channel:
2424
channel:
2525
classes:
2626
model: Tests\BitBag\SyliusUserComPlugin\Entity\Channel
27-
28-
spinbits_sylius_google_analytics4:
29-
id: "%env(GOOGLE_ANALYTICS_TAG)%"
30-
enabled: true

0 commit comments

Comments
 (0)