Merge pull request #4 from dachcom-digital/p11

.github/workflows/codeception.yml

@@ -15,12 +15,12 @@ jobs:
             TEST_PROJECT_ROOT_DIR: "${{ github.workspace }}"
 
             PIMCORE_CODECEPTION_FRAMEWORK: "${{ github.workspace }}/pimcore-codeception-framework"
-            PIMCORE_CODECEPTION_VERSION: "2.0"
+            PIMCORE_CODECEPTION_VERSION: "3.0"
 
             APP_ENV: test
-            PIMCORE_TEST_DB_DSN: "mysql://root:root@127.0.0.1:3306/dachcom_bundle_test"
+            PIMCORE_TEST_DB_DSN: "mysql://test:test@127.0.0.1:3306/dachcom_bundle_test"
             PIMCORE_TEST_URL: "http://localhost"
-            PIMCORE_CLASS_DIRECTORY: "${{ github.workspace }}/lib/test-bundle/tests/_output/var/classes/DataObject"
+            PIMCORE_CLASS_DIRECTORY: "${{ github.workspace }}/lib/test-bundle/tests/_output/var/classes"
 
             SYMFONY_DEPRECATIONS_HELPER: "weak"
             PIMCORE_PHP_ERROR_REPORTING: 32767
@@ -38,12 +38,12 @@ jobs:
                 options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
         strategy:
             matrix:
-                php: [ 8.1 ]
-                symfony: [ ^5.4 ]
-                pimcore: [ ~10.6.0 ]
+                php: [ 8.2 ]
+                symfony: [ ^6.2 ]
+                pimcore: [ ~11.0.0 ]
                 include:
-                    -   pimcore: ~10.6.0
-                        template_tag: v10.2.5
+                    -   pimcore: ~11.0.0
+                        template_tag: v11.0.0
         steps:
             -   uses: actions/checkout@v2
                 with:
@@ -82,9 +82,19 @@ jobs:
                 run: php -v
 
             -   name: Setup MySql
-                run: |
-                    sudo systemctl start mysql
-                    mysql -uroot -proot -h127.0.0.1 -e "CREATE DATABASE dachcom_bundle_test CHARSET=utf8mb4;"
+                uses: shogo82148/actions-setup-mysql@v1
+                with:
+                    mysql-version: '8.0'
+                    user: test
+                    password: test
+                    root-password: root
+                    auto-start: true
+                    my-cnf: |
+                        max_allowed_packet=32505856
+                        max_connections=1000
+
+            -   name: Initial Database
+                run: mysql -utest -ptest -h127.0.0.1 -e 'CREATE DATABASE dachcom_bundle_test CHARSET=utf8mb4;'
 
             -   name: Setup Chromium
                 run: |
@@ -115,7 +125,7 @@ jobs:
                 run: |
                     composer config "minimum-stability" "dev"
                     composer config "prefer-stable" true
-                    sed -i 's,\("dachcom-digital\/social-data"\): "\(.*\)",\1: "2.x-dev",g' ${{ github.workspace }}/lib/test-bundle/composer.json
+                    sed -i 's,\("dachcom-digital\/social-data"\): "\(.*\)",\1: "3.x-dev",g' ${{ github.workspace }}/lib/test-bundle/composer.json
                     chmod +x ./pimcore-codeception-framework/src/_etc/scripts/composer.sh
                     ./pimcore-codeception-framework/src/_etc/scripts/composer.sh
 

.github/workflows/ecs.yml

@@ -15,7 +15,7 @@ jobs:
             TEST_PROJECT_ROOT_DIR: "${{ github.workspace }}"
 
             PIMCORE_CODECEPTION_FRAMEWORK: "${{ github.workspace }}/pimcore-codeception-framework"
-            PIMCORE_CODECEPTION_VERSION: "2.0"
+            PIMCORE_CODECEPTION_VERSION: "3.0"
 
             APP_ENV: test
             PIMCORE_TEST_DB_DSN: "mysql://root:[email protected]:3306/dachcom_bundle_test"
@@ -37,12 +37,12 @@ jobs:
                 options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
         strategy:
             matrix:
-                php: [ 8.1 ]
-                symfony: [ ^5.4 ]
-                pimcore: [ ~10.6.0 ]
+                php: [ 8.2 ]
+                symfony: [ ^6.2 ]
+                pimcore: [ ~11.0.0 ]
                 include:
-                    -   pimcore: ~10.6.0
-                        template_tag: v10.2.5
+                    -   pimcore: ~11.0.0
+                        template_tag: v11.0.0
         steps:
             -   uses: actions/checkout@v2
                 with:
@@ -105,7 +105,7 @@ jobs:
                 run: |
                     composer config "minimum-stability" "dev"
                     composer config "prefer-stable" true
-                    sed -i 's,\("dachcom-digital\/social-data"\): "\(.*\)",\1: "2.x-dev",g' ${{ github.workspace }}/lib/test-bundle/composer.json
+                    sed -i 's,\("dachcom-digital\/social-data"\): "\(.*\)",\1: "3.x-dev",g' ${{ github.workspace }}/lib/test-bundle/composer.json
                     chmod +x ./pimcore-codeception-framework/src/_etc/scripts/composer.sh
                     ./pimcore-codeception-framework/src/_etc/scripts/composer.sh
 

.github/workflows/php-stan.yml

@@ -15,7 +15,7 @@ jobs:
             TEST_PROJECT_ROOT_DIR: "${{ github.workspace }}"
 
             PIMCORE_CODECEPTION_FRAMEWORK: "${{ github.workspace }}/pimcore-codeception-framework"
-            PIMCORE_CODECEPTION_VERSION: "2.0"
+            PIMCORE_CODECEPTION_VERSION: "3.0"
 
             APP_ENV: test
             PIMCORE_TEST_DB_DSN: "mysql://root:[email protected]:3306/dachcom_bundle_test"
@@ -37,12 +37,12 @@ jobs:
                 options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
         strategy:
             matrix:
-                php: [ 8.1 ]
-                symfony: [ ^5.4 ]
-                pimcore: [ ~10.6.0 ]
+                php: [ 8.2 ]
+                symfony: [ ^6.2 ]
+                pimcore: [ ~11.0.0 ]
                 include:
-                    -   pimcore: ~10.6.0
-                        template_tag: v10.2.5
+                    -   pimcore: ~11.0.0
+                        template_tag: v11.0.0
         steps:
             -   uses: actions/checkout@v2
                 with:
@@ -105,7 +105,7 @@ jobs:
                 run: |
                     composer config "minimum-stability" "dev"
                     composer config "prefer-stable" true
-                    sed -i 's,\("dachcom-digital\/social-data"\): "\(.*\)",\1: "2.x-dev",g' ${{ github.workspace }}/lib/test-bundle/composer.json
+                    sed -i 's,\("dachcom-digital\/social-data"\): "\(.*\)",\1: "3.x-dev",g' ${{ github.workspace }}/lib/test-bundle/composer.json
                     chmod +x ./pimcore-codeception-framework/src/_etc/scripts/composer.sh
                     ./pimcore-codeception-framework/src/_etc/scripts/composer.sh
 

README.md

@@ -12,36 +12,27 @@ This Connector allows you to fetch social posts from Twitter (API v2).
 ### Release Plan
 | Release | Supported Pimcore Versions | Supported Symfony Versions | Release Date | Maintained     | Branch                                                                                   |
 |---------|----------------------------|----------------------------|--------------|----------------|------------------------------------------------------------------------------------------|
-| **2.x** | `10.1` - `10.6`            | `5.4`                      | 05.01.2022   | Feature Branch | master                                                                                   |
+| **3.x** | `11.0`                     | `6.2`                      | 07.11.2023   | Feature Branch | master                                                                                   |
+| **2.x** | `10.1` - `10.6`            | `5.4`                      | 05.01.2022   | Unsupported    | [2.x](https://github.com/dachcom-digital/pimcore-social-data-twitter-connector/tree/2.x) |
 | **1.x** | `6.0` - `6.9`              | `3.4`, `^4.4`              | 22.10.2020   | Unsupported    | [1.x](https://github.com/dachcom-digital/pimcore-social-data-twitter-connector/tree/1.x) |
 
 ## Installation
 
-### I. Add Dependencies
 ```json
 "require" : {
-    "dachcom-digital/social-data" : "~2.0.0",
-    "dachcom-digital/social-data-twitter-connector" : "~1.0.0"
+    "dachcom-digital/social-data" : "~3.0.0",
+    "dachcom-digital/social-data-twitter-connector" : "~3.0.0"
 }
 ```
 
-### II. Register Connector Bundle
+Add Bundle to `bundles.php`:
 ```php
-// src/Kernel.php
-namespace App;
-
-use Pimcore\HttpKernel\BundleCollection\BundleCollection;
-
-class Kernel extends \Pimcore\Kernel
-{
-    public function registerBundlesToCollection(BundleCollection $collection)
-    {
-        $collection->addBundle(new SocialData\Connector\Twitter\SocialDataTwitterConnectorBundle());
-    }
-}
+return [
+    SocialData\Connector\Twitter\SocialDataTwitterConnectorBundle::class => ['all' => true],
+];
 ```
 
-### III. Install Assets
+### Install Assets
 ```bash
 bin/console assets:install public --relative --symlink
 ```
@@ -73,10 +64,10 @@ Twitter is auto connected after you have filled out the connector configuration
 
 ## Feed Configuration
 
-| Name | Description
-|------|----------------------|
-| `User Id` | Defines which user entries should be imported |
-| `Count` | Define a limit to restrict the amount of social posts to import |
+| Name      | Description                                                     |
+|-----------|-----------------------------------------------------------------|
+| `User Id` | Defines which user entries should be imported                   |
+| `Count`   | Define a limit to restrict the amount of social posts to import |
 
 ## Copyright and license
 Copyright: [DACHCOM.DIGITAL](http://dachcom-digital.ch)  

UPGRADE.md

@@ -1,9 +1,6 @@
 # Upgrade Notes
 
-## Migrating from Version 1.x to Version 2.0.0
+## Migrating from Version 2.x to Version 3.0.0
 
 ### Global Changes
-- PHP8 return type declarations added: you may have to adjust your extensions accordingly
-- ⚠️ Switched to twitter API v2:
-  - You need to create a project in twitter backoffice instead of an standalone app (https://developer.twitter.com/en/portal/projects-and-apps)
-  - Changed feed configuration: You need to set users ID instead of screen name in feed configuration
+- Recommended folder structure by symfony adopted

codeception.dist.yml

@@ -1,14 +1,15 @@
 namespace: DachcomBundle\Test
+support_namespace: Support
 actor: Tester
 paths:
     tests: tests
-    output: tests/_output
-    data: tests/_data
-    support: tests/_support
     envs: tests/_envs
+    output: tests/_output
     log: tests/_output/var/logs
+    data: tests/_data
+    support: tests/Support
+bootstrap: _bootstrap.php
 settings:
-    bootstrap: _bootstrap.php
     memory_limit: -1
     colors: true
 params:

composer.json

@@ -36,13 +36,13 @@
         }
     },
     "require": {
-        "dachcom-digital/social-data": "^2.0",
+        "dachcom-digital/social-data": "^3.0",
         "abraham/twitteroauth": "^3.2"
     },
     "require-dev": {
-        "codeception/codeception": "^4.1",
-        "codeception/module-webdriver": "^1.4",
-        "codeception/module-symfony": "^1.6",
+        "codeception/codeception": "^5.0",
+        "codeception/module-symfony": "^3.1",
+        "codeception/module-webdriver": "^4.0",
         "phpstan/phpstan": "^1.0",
         "phpstan/phpstan-symfony": "^1.0",
         "symplify/easy-coding-standard": "^9.0"

src/Resources/config/services.yml → config/services.yaml

@@ -32,3 +32,9 @@ services:
     SocialData\Connector\Twitter\Form\Admin\Type\TwitterFeedType:
         tags:
             - { name: form.type }
+
+    ## Events
+
+    SocialData\Connector\Twitter\EventListener\Admin\AssetListener:
+        tags:
+            - { name: kernel.event_subscriber }

phpstan.neon

@@ -7,5 +7,5 @@ parameters:
     symfony:
         container_xml_path: %currentWorkingDirectory%/var/cache/test/TestKernelTestDebugContainer.xml
         constant_hassers: false
-    excludes_analyse:  []
+    excludePaths: []
     ignoreErrors: []

src/DependencyInjection/SocialDataTwitterConnectorExtension.php

@@ -17,7 +17,7 @@ public function load(array $configs, ContainerBuilder $container): void
         $configuration = new Configuration();
         $this->processConfiguration($configuration, $configs);
 
-        $loader = new YamlFileLoader($container, new FileLocator([__DIR__ . '/../Resources/config']));
-        $loader->load('services.yml');
+        $loader = new YamlFileLoader($container, new FileLocator([__DIR__ . '/../../config']));
+        $loader->load('services.yaml');
     }
 }

src/EventListener/Admin/AssetListener.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace SocialData\Connector\Twitter\EventListener\Admin;
+
+use Pimcore\Event\BundleManager\PathsEvent;
+use Pimcore\Event\BundleManagerEvents;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+class AssetListener implements EventSubscriberInterface
+{
+    public static function getSubscribedEvents(): array
+    {
+        return [
+            BundleManagerEvents::CSS_PATHS => 'addCssFiles',
+            BundleManagerEvents::JS_PATHS  => 'addJsFiles',
+        ];
+    }
+
+    public function addCssFiles(PathsEvent $event): void
+    {
+        $event->addPaths([
+            '/bundles/socialdatatwitterconnector/css/admin.css'
+        ]);
+    }
+
+    public function addJsFiles(PathsEvent $event): void
+    {
+        $event->addPaths([
+            '/bundles/socialdatatwitterconnector/js/connector/twitter-connector.js',
+            '/bundles/socialdatatwitterconnector/js/feed/twitter-feed.js',
+        ]);
+    }
+}

src/SocialDataTwitterConnectorBundle.php

@@ -2,32 +2,22 @@
 
 namespace SocialData\Connector\Twitter;
 
-use Pimcore\Extension\Bundle\AbstractPimcoreBundle;
 use Pimcore\Extension\Bundle\Traits\PackageVersionTrait;
+use Symfony\Component\HttpKernel\Bundle\Bundle;
 
-class SocialDataTwitterConnectorBundle extends AbstractPimcoreBundle
+class SocialDataTwitterConnectorBundle extends Bundle
 {
     use PackageVersionTrait;
 
     public const PACKAGE_NAME = 'dachcom-digital/social-data-twitter-connector';
 
-    protected function getComposerPackageName(): string
+    public function getPath(): string
     {
-        return self::PACKAGE_NAME;
+        return \dirname(__DIR__);
     }
 
-    public function getCssPaths(): array
-    {
-        return [
-            '/bundles/socialdatatwitterconnector/css/admin.css'
-        ];
-    }
-
-    public function getJsPaths(): array
+    protected function getComposerPackageName(): string
     {
-        return [
-            '/bundles/socialdatatwitterconnector/js/connector/twitter-connector.js',
-            '/bundles/socialdatatwitterconnector/js/feed/twitter-feed.js',
-        ];
+        return self::PACKAGE_NAME;
     }
 }

tests/Functional.suite.dist.yml

@@ -0,0 +1,12 @@
+actor: FunctionalTester
+modules:
+    enabled:
+        - \Dachcom\Codeception\Support\Helper\PimcoreCore:
+                connect_db: true
+                rebootable_client: true
+        - \Dachcom\Codeception\Support\Helper\PimcoreBundleCore:
+                run_installer: true
+        - \Dachcom\Codeception\Support\Helper\Browser\PhpBrowser:
+                depends: \Dachcom\Codeception\Support\Helper\PimcoreCore
+        - \Dachcom\Codeception\Support\Helper\PimcoreBackend
+        - \Dachcom\Codeception\Support\Helper\PimcoreUser

tests/Support/FunctionalTester.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace DachcomBundle\Test\Support;
+
+class FunctionalTester extends \Dachcom\Codeception\Support\FunctionalTester
+{
+    use _generated\FunctionalTesterActions;
+}

tests/Support/UnitTester.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace DachcomBundle\Test\Support;
+
+class UnitTester extends \Dachcom\Codeception\Support\UnitTester
+{
+    use _generated\UnitTesterActions;
+}