Merge pull request #5 from magmodules/release/1.1.1

Release/1.1.1

.github/workflows/linting.yml

@@ -1,45 +1,23 @@
 name: Lint PHP files
-on: [push, pull_request]
+on: [ push, pull_request ]
 
 jobs:
-  php-71:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: StephaneBour/[email protected]
-        with:
-          dir: './'
-
-  php-72:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: StephaneBour/[email protected]
-        with:
-          dir: './'
-
-  php-73:
+  php-74:
     runs-on: ubuntu-latest
     steps:
-      - uses: StephaneBour/[email protected]
-        with:
-          dir: './'
+      - uses: prestashop/github-action-php-lint/[email protected]
 
-  php-74:
+  php-81:
     runs-on: ubuntu-latest
     steps:
-      - uses: StephaneBour/[email protected]
-        with:
-          dir: './'
+      - uses: prestashop/github-action-php-lint/[email protected]
 
-  php-80:
+  php-82:
     runs-on: ubuntu-latest
     steps:
-      - uses: StephaneBour/[email protected]
-        with:
-          dir: './'
+      - uses: prestashop/github-action-php-lint/[email protected]
 
-  php-81:
+  php-83:
     runs-on: ubuntu-latest
     steps:
-      - uses: StephaneBour/[email protected]
-        with:
-          dir: './'
+      - uses: prestashop/github-action-php-lint/[email protected]

.github/workflows/phpstan.yml

@@ -1,24 +1,32 @@
 name: phpstan
-on: pull_request
+on: [ pull_request ]
 
 jobs:
   build:
     strategy:
       matrix:
-        PHP_VERSION: [php74-fpm]
-        MAGENTO_VERSION: [2.4.2]
+        include:
+          - PHP_VERSION: php83-fpm
+            MAGENTO_VERSION: 2.4.7
+
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
 
       - name: Start Docker
         run: docker run --detach --name magento-project-community-edition michielgerritsen/magento-project-community-edition:${{ matrix.PHP_VERSION }}-magento${{ matrix.MAGENTO_VERSION }}
 
+      - name: Create branch for Composer and remove version from composer.json
+        run: git checkout -b continuous-integration-test-branch && sed -i '/version/d' ./composer.json
+
       - name: Upload our code into the docker container
         run: docker cp $(pwd) magento-project-community-edition:/data/extensions/
 
       - name: Install the extensions in Magento
-        run: docker exec magento-project-community-edition composer require magmodules/magento2-messagebird:@dev fooman/phpstan-magento2-magic-methods:^0.7
+        run: docker exec magento-project-community-edition composer require magmodules/magento2-messagebird:@dev --no-plugins
+
+      - name: Activate the extension
+        run: docker exec magento-project-community-edition ./retry "php bin/magento module:enable Magmodules_MessageBird && php bin/magento setup:upgrade && php bin/magento setup:di:compile"
 
       - name: Run PHPStan
-        run: docker exec magento-project-community-edition /bin/bash -c "./vendor/bin/phpstan analyse -c /data/extensions/*/phpstan.neon /data/extensions"
+        run: docker exec magento-project-community-edition /bin/bash -c "./vendor/bin/phpstan analyse --no-progress -c /data/extensions/*/phpstan.neon /data/extensions"

.github/workflows/setup-di-compile.yml

@@ -1,29 +1,34 @@
-name: setup:di:compile
-on: pull_request
+name: Run setup:upgrade and setup:di:compile
+on: [pull_request]
 
 jobs:
   build:
     strategy:
       matrix:
         include:
-          - PHP_VERSION: php71-fpm
-            MAGENTO_VERSION: 2.3.3
-          - PHP_VERSION: php73-fpm
-            MAGENTO_VERSION: 2.3.6-p1
           - PHP_VERSION: php74-fpm
-            MAGENTO_VERSION: 2.4.2
+            MAGENTO_VERSION: 2.4.0
+          - PHP_VERSION: php81-fpm
+            MAGENTO_VERSION: 2.4.4
+          - PHP_VERSION: php82-fpm
+            MAGENTO_VERSION: 2.4.6
+          - PHP_VERSION: php83-fpm
+            MAGENTO_VERSION: 2.4.7
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
 
       - name: Start Docker
         run: docker run --detach --name magento-project-community-edition michielgerritsen/magento-project-community-edition:${{ matrix.PHP_VERSION }}-magento${{ matrix.MAGENTO_VERSION }}
 
-      - name: Upload our code into the docker container
+      - name: Create branch for Composer and remove version from composer.json
+        run: git checkout -b continuous-integration-test-branch && sed -i '/version/d' ./composer.json
+
+      - name: Upload the code into the docker container
         run: docker cp $(pwd) magento-project-community-edition:/data/extensions/
 
       - name: Install the extension in Magento
-        run: docker exec magento-project-community-edition composer require magmodules/magento2-messagebird:@dev
+        run: docker exec magento-project-community-edition composer require magmodules/magento2-messagebird:@dev --no-plugins
 
       - name: Run setup:di:compile
-        run: docker exec magento-project-community-edition php bin/magento setup:di:compile
+        run: docker exec magento-project-community-edition ./retry "php bin/magento setup:di:compile"

composer.json

@@ -2,7 +2,7 @@
   "name": "magmodules/magento2-messagebird",
   "description": "MessageBird integration for Magento 2",
   "type": "magento2-module",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "require": {
       "magento/framework": ">=100.1.0",
       "messagebird/php-rest-api": ">=1.20",

etc/config.xml

@@ -8,7 +8,7 @@
     <default>
         <magmodules_messagebird>
             <general>
-                <version>v1.1.0</version>
+                <version>v1.1.1</version>
             </general>
             <communication>
                 <order_message>We successfully received your order with ID #{{order_id}} and awaiting your payment.</order_message>

etc/db_schema_whitelist.json

@@ -0,0 +1,17 @@
+{
+    "messagebird_log": {
+        "column": {
+            "entity_id": true,
+            "increment_id": true,
+            "firstname": true,
+            "lastname": true,
+            "email": true,
+            "status": true,
+            "type": true,
+            "created_at": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
+    }
+}

etc/module.xml

@@ -5,7 +5,16 @@
  * See COPYING.txt for license details.
  */
 -->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magmodules_MessageBird" setup_version="0.0.1"/>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magmodules_MessageBird" setup_version="0.0.1">
+        <sequence>
+            <module name="Magento_Backend" />
+            <module name="Magento_Catalog" />
+            <module name="Magento_Config" />
+            <module name="Magento_Customer" />
+            <module name="Magento_ProductAlert" />
+            <module name="Magento_Store" />
+            <module name="Magento_Sales" />
+        </sequence>
+    </module>
 </config>