Merge pull request #38 from xtreamwayz/2.0.x-merge-up-into-2.1.x_5f41…

…675766e7e4.43552069 Merge release 2.0.1 into 2.1.x
xtreamwayz · Aug 22, 2020 · f77d248 · f77d248
2 parents f7e9812 + bca6295
commit f77d248
Show file tree

Hide file tree

Showing 3 changed files with 1,357 additions and 646 deletions.
diff --git a/.github/workflows/automatic-release.yml b/.github/workflows/automatic-release.yml
@@ -15,7 +15,7 @@ jobs:
         uses: "actions/checkout@v2"
 
       - name: "Release"
-        uses: "laminas/automatic-releases@1.1.0"
+        uses: "laminas/automatic-releases@v1"
         with:
           command-name: "laminas:automatic-releases:release"
         env:
@@ -25,7 +25,7 @@ jobs:
           "GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}
 
       - name: "Create Merge-Up Pull Request"
-        uses: "laminas/automatic-releases@1.1.0"
+        uses: "laminas/automatic-releases@v1"
         with:
           command-name: "laminas:automatic-releases:create-merge-up-pull-request"
         env:
@@ -35,7 +35,7 @@ jobs:
           "GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}
 
       - name: "Create and/or Switch to new Release Branch"
-        uses: "laminas/automatic-releases@1.1.0"
+        uses: "laminas/automatic-releases@v1"
         with:
           command-name: "laminas:automatic-releases:switch-default-branch-to-next-minor"
         env:

diff --git a/composer.json b/composer.json
@@ -1,62 +1,62 @@
 {
-  "name": "xtreamwayz/psr-container-messenger",
-  "description": "PSR Container compatible Symfony Messenger",
-  "license": "MIT",
-  "require": {
-    "php": "^7.4",
-    "psr/container": "^1.0",
-    "symfony/event-dispatcher": "^4.4 || ^5.0",
-    "symfony/messenger": "^4.4 || ^5.0"
-  },
-  "require-dev": {
-    "doctrine/coding-standard": "^7.0",
-    "ext-json": "*",
-    "doctrine/dbal": "^2.6",
-    "doctrine/orm": "^2.6",
-    "laminas/laminas-servicemanager": "^3.4",
-    "phpunit/phpunit": "^9.0",
-    "psalm/plugin-phpunit": "^0.10.0",
-    "psr/log": "^1.1",
-    "symfony/console": "^4.4 || ^5.0",
-    "symfony/contracts": "^1.1 || ^2.0",
-    "vimeo/psalm": "^3.10"
-  },
-  "suggest": {
-    "laminas/laminas-cli": "For auto configuring the cli command."
-  },
-  "config": {
-    "sort-packages": true
-  },
-  "extra": {
-    "laminas": {
-      "config-provider": "Xtreamwayz\\PsrContainerMessenger\\ConfigProvider"
+    "name": "xtreamwayz/psr-container-messenger",
+    "description": "PSR Container compatible Symfony Messenger",
+    "license": "MIT",
+    "require": {
+        "php": "^7.4",
+        "psr/container": "^1.0",
+        "symfony/event-dispatcher": "^4.4 || ^5.0",
+        "symfony/messenger": "^4.4 || ~5.0.0"
+    },
+    "require-dev": {
+        "doctrine/coding-standard": "^7.0",
+        "ext-json": "*",
+        "doctrine/dbal": "^2.6",
+        "doctrine/orm": "^2.6",
+        "laminas/laminas-servicemanager": "^3.4",
+        "phpunit/phpunit": "^9.0",
+        "psalm/plugin-phpunit": "^0.10.0",
+        "psr/log": "^1.1",
+        "symfony/console": "^4.4 || ^5.0",
+        "symfony/contracts": "^1.1 || ^2.0",
+        "vimeo/psalm": "^3.10"
+    },
+    "suggest": {
+        "laminas/laminas-cli": "For auto configuring the cli command."
+    },
+    "config": {
+        "sort-packages": true
+    },
+    "extra": {
+        "laminas": {
+            "config-provider": "Xtreamwayz\\PsrContainerMessenger\\ConfigProvider"
+        }
+    },
+    "autoload": {
+        "psr-4": {
+            "Xtreamwayz\\PsrContainerMessenger\\": "src/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Xtreamwayz\\PsrContainerMessenger\\Test\\": "test/"
+        }
+    },
+    "scripts": {
+        "check": [
+            "@cs-check",
+            "@test",
+            "@static-analysis"
+        ],
+        "cs-check": "phpcs",
+        "cs-fix": "phpcbf",
+        "static-analysis": "psalm",
+        "test": "phpunit",
+        "test-coverage": "phpunit --coverage-clover clover.xml"
+    },
+    "support": {
+        "issues": "https://github.com/xtreamwayz/psr-container-messenger/issues",
+        "source": "https://github.com/xtreamwayz/psr-container-messenger",
+        "rss": "https://github.com/xtreamwayz/psr-container-messenger/releases.atom"
     }
-  },
-  "autoload": {
-    "psr-4": {
-      "Xtreamwayz\\PsrContainerMessenger\\": "src/"
-    }
-  },
-  "autoload-dev": {
-    "psr-4": {
-      "Xtreamwayz\\PsrContainerMessenger\\Test\\": "test/"
-    }
-  },
-  "scripts": {
-    "check": [
-      "@cs-check",
-      "@test",
-      "@static-analysis"
-    ],
-    "cs-check": "phpcs",
-    "cs-fix": "phpcbf",
-    "static-analysis": "psalm",
-    "test": "phpunit",
-    "test-coverage": "phpunit --coverage-clover clover.xml"
-  },
-  "support": {
-    "issues": "https://github.com/xtreamwayz/psr-container-messenger/issues",
-    "source": "https://github.com/xtreamwayz/psr-container-messenger",
-    "rss": "https://github.com/xtreamwayz/psr-container-messenger/releases.atom"
-  }
 }