Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/mage-os/mirror-composer
Browse files Browse the repository at this point in the history
…into develop
  • Loading branch information
mage-os-ci committed Jun 15, 2024
2 parents 9e04685 + 526da66 commit 1ea8ab3
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 17 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"symfony/console": "~4.4.0||~5.4.0||~6.4.0"
},
"require-dev": {
"phpunit/phpunit": "^9"
"phpunit/phpunit": "^9 || ^10"
},
"autoload": {
"psr-4": {
Expand Down
24 changes: 10 additions & 14 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,27 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>

<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/9.1/phpunit.xsd"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
backupGlobals="false"
colors="true"
bootstrap="vendor/autoload.php"
>
bootstrap="vendor/autoload.php">
<php>
<ini name="error_reporting" value="-1" />
<ini name="error_reporting" value="-1"/>
</php>

<testsuites>
<testsuite name="Magento Composer Library Test">
<directory>./tests/</directory>
</testsuite>
</testsuites>

<filter>
<whitelist>
<source>
<include>
<directory>./</directory>
<exclude>
<directory>./tests</directory>
</exclude>
</whitelist>
</filter>
</include>
<exclude>
<directory>./tests</directory>
</exclude>
</source>
</phpunit>
2 changes: 1 addition & 1 deletion tests/Composer/InfoCommandTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public function testRunInstalled()
*
* @return array
*/
public function getCommandOutputDataProvider()
public static function getCommandOutputDataProvider()
{
return [
'Package not installed' => [
Expand Down
3 changes: 2 additions & 1 deletion tests/Composer/MagentoComposerApplicationTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ class MagentoComposerApplicationTest extends \PHPUnit\Framework\TestCase

protected function setUp(): void
{
$this->composerApplication = $this->createMock(\Composer\Console\Application::class);
$this->composerApplication = $this->getMockBuilder('Composer\Console\Application')
->getMock();
$this->inputFactory = $this->createMock(\Magento\Composer\ConsoleArrayInputFactory::class);
$this->consoleOutput = $this->createMock(\Symfony\Component\Console\Output\BufferedOutput::class);

Expand Down

0 comments on commit 1ea8ab3

Please sign in to comment.