Merge branch 'develop' into phpstan

# Conflicts: # composer.lock
netz98 · Dec 14, 2024 · 1563f5a · 1563f5a
2 parents 0ba907a + 6efd115
commit 1563f5a
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -121,7 +121,7 @@ jobs:
           overwrite: true
 
       - name: Run update tasks on files.magerun.net
-        uses: appleboy/ssh-action@v1.1.0
+        uses: appleboy/ssh-action@v1.2.0
         with:
           host: ${{ secrets.SSH_DEPLOY_HOST }}
           username: ${{ secrets.SSH_DEPLOY_USERNAME }}

diff --git a/.github/workflows/test-magento-open-source.yml b/.github/workflows/test-magento-open-source.yml
@@ -73,7 +73,7 @@ jobs:
           COMPOSER_VENDOR_PATH : "${{ github.workspace }}/magento/vendor"
 
       - name: Report coverage
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           file: ./build/coverage/clover.xml # Or your specific coverage file
 

diff --git a/.github/workflows/test-openmage-20.0.yml b/.github/workflows/test-openmage-20.0.yml
@@ -80,7 +80,7 @@ jobs:
           COMPOSER_VENDOR_PATH : "${{ github.workspace }}/magento/vendor"
 
       - name: Report coverage
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           file: ./build/coverage/clover.xml
 

diff --git a/.github/workflows/test-openmage-20.1.yml b/.github/workflows/test-openmage-20.1.yml
@@ -84,7 +84,7 @@ jobs:
         continue-on-error: true
 
       - name: Report coverage
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           file: ./build/coverage/clover.xml
 

diff --git a/.github/workflows/test-openmage-20.10.yml b/.github/workflows/test-openmage-20.10.yml
@@ -81,7 +81,7 @@ jobs:
           COMPOSER_VENDOR_PATH : "${{ github.workspace }}/magento/vendor"
 
       - name: Report coverage
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           file: ./build/coverage/clover.xml
 

diff --git a/tests/N98/Magento/Command/System/Setup/IncrementalCommandTest.php b/tests/N98/Magento/Command/System/Setup/IncrementalCommandTest.php
@@ -25,7 +25,7 @@ public function testRegression747()
         $this->assertSame('barBaz', $actual);
     }
 
-    protected function protectedMethod($arg): string
+    public function protectedMethod($arg): string
     {
         $this->assertSame('fooBar', $arg);
         $this->addToAssertionCount(1);

diff --git a/tests/N98/Magento/Command/System/Setup/RemoveCommandTest.php b/tests/N98/Magento/Command/System/Setup/RemoveCommandTest.php
@@ -30,7 +30,7 @@ public function testRemoveModule()
 
         $coreResource = $this->getMockBuilder(Mage_Core_Model_Resource::class)
             ->setMethods(['getConnection'])
-            ->getMock();;
+            ->getMock();
 
         $coreResource->expects($this->once())
             ->method('getConnection')
@@ -68,7 +68,7 @@ public function testRemoveBySetupName()
 
         $coreResource = $this->getMockBuilder(Mage_Core_Model_Resource::class)
             ->setMethods(['getConnection'])
-            ->getMock();;
+            ->getMock();
 
         $coreResource->expects($this->once())
             ->method('getConnection')
@@ -110,7 +110,7 @@ public function testRemoveBySetupNameFailure()
 
         $coreResource = $this->getMockBuilder(Mage_Core_Model_Resource::class)
             ->setMethods(['getConnection', 'getTableName'])
-            ->getMock();;
+            ->getMock();
 
         $coreResource->expects($this->once())
             ->method('getConnection')