Merge branch 'master' into update-symfony-to-7

auxmoney · Nov 7, 2024 · 2880b51 · 2880b51
2 parents 2d4d955 + a810742
commit 2880b51
Show file tree

Hide file tree

Showing 4 changed files with 209 additions and 217 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -21,15 +21,11 @@ jobs:
     strategy:
       matrix:
         include:
-          - symfony: '5.4.*'
-            php: '8.2'
-          - symfony: '6.2.*'
-            php: '8.2'
           - symfony: '7.1.*'
             php: '8.2'
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup PHP Action
         uses: shivammathur/setup-php@v2
         with:
@@ -61,15 +57,11 @@ jobs:
     strategy:
       matrix:
         include:
-          - symfony: '5.4.*'
-            php: '8.2'
-          - symfony: '6.2.*'
-            php: '8.2'
           - symfony: '7.1.*'
             php: '8.2'
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup PHP Action
         uses: shivammathur/setup-php@v2
         with:

diff --git a/Tests/Functional/TestProjectFiles/default/src/Command/TestErrorCmdCommand.php b/Tests/Functional/TestProjectFiles/default/src/Command/TestErrorCmdCommand.php
@@ -22,7 +22,7 @@ public function __construct(Opentracing $opentracing)
         $this->opentracing = $opentracing;
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $carrier = [];
         $this->opentracing->getTracerInstance()->inject($this->opentracing->getTracerInstance()->getActiveSpan()->getContext(), TEXT_MAP, $carrier);

diff --git a/composer.json b/composer.json
@@ -1,5 +1,5 @@
 {
-  "name": "auxmoney/opentracing-bundle-core",
+  "name": "pronata/opentracing-bundle-core",
   "description": "Symfony Opentracing bundle to easily enable distributed tracing",
   "keywords": [
     "auxmoney",
@@ -17,7 +17,7 @@
   "type": "library",
   "license": "MIT",
   "require": {
-    "php": "^8.2",
+    "php": "^8.1",
     "ext-json": "*",
     "psr/log": "^1.1|^2.0|^3.0",
     "psr/http-message": "^1.0",