Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix issue #24635: Use of undefined constant GLOB_BRACE in dependency … #31296

Merged
merged 6 commits into from
Apr 28, 2021
Merged

Fix issue #24635: Use of undefined constant GLOB_BRACE in dependency … #31296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
37c2641
Fix issue #24635: Use of undefined constant GLOB_BRACE in dependency …
Dec 16, 2020
585bebe
Remove composer mirror
Dec 18, 2020
6319bb2
Change allure-framework/allure-phpunit version to ~1.3.1
Dec 22, 2020
631e8b3
issue#24635 Use of undefined constant GLOB_BRACE in dependency
Jan 15, 2021
1641143
Merge branch '2.4-develop' into 2.4-develop
vidyli Apr 7, 2021
155a851
Merge branch '2.4-develop-mainline' into vidyli-2.4-develop
engcom-Foxtrot Apr 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
"web-token/jwt-framework": "^v2.2.7"
},
"require-dev": {
"allure-framework/allure-phpunit": "~1.2.0",
"allure-framework/allure-phpunit": "~1.3.1",
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
"friendsofphp/php-cs-fixer": "~2.18.1",
"lusitanian/oauth": "~0.8.10",
Expand Down
67 changes: 40 additions & 27 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dev/tests/api-functional/phpunit_graphql.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<!-- Test listeners -->
<listeners>
<listener class="Magento\TestFramework\Event\PhpUnit"/>
<listener class="Yandex\Allure\Adapter\AllureAdapter">
<listener class="Yandex\Allure\PhpUnit\AllurePhpUnit">
<arguments>
<string>var/allure-results</string> <!-- XML files output folder -->
<boolean>true</boolean> <!-- Whether to delete previous results on rerun -->
Expand Down
2 changes: 1 addition & 1 deletion dev/tests/api-functional/phpunit_rest.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<!-- Test listeners -->
<listeners>
<listener class="Magento\TestFramework\Event\PhpUnit"/>
<listener class="Yandex\Allure\Adapter\AllureAdapter">
<listener class="Yandex\Allure\PhpUnit\AllurePhpUnit">
<arguments>
<string>var/allure-results</string> <!-- XML files output folder -->
<boolean>true</boolean> <!-- Whether to delete previous results on rerun -->
Expand Down
2 changes: 1 addition & 1 deletion dev/tests/api-functional/phpunit_soap.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<!-- Test listeners -->
<listeners>
<listener class="Magento\TestFramework\Event\PhpUnit"/>
<listener class="Yandex\Allure\Adapter\AllureAdapter">
<listener class="Yandex\Allure\PhpUnit\AllurePhpUnit">
<arguments>
<string>var/allure-results</string> <!-- XML files output folder -->
<boolean>true</boolean> <!-- Whether to delete previous results on rerun -->
Expand Down
2 changes: 1 addition & 1 deletion dev/tests/integration/framework/tests/unit/phpunit.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<ini name="date.timezone" value="America/Los_Angeles"/>
</php>
<listeners>
<listener class="Yandex\Allure\Adapter\AllureAdapter">
<listener class="Yandex\Allure\PhpUnit\AllurePhpUnit">
<arguments>
<string>var/allure-results</string> <!-- XML files output directory -->
<boolean>true</boolean> <!-- Whether to delete previous results on rerun -->
Expand Down
2 changes: 1 addition & 1 deletion dev/tests/integration/phpunit.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
</php>
<!-- Test listeners -->
<listeners>
<listener class="Yandex\Allure\Adapter\AllureAdapter">
<listener class="Yandex\Allure\PhpUnit\AllurePhpUnit">
<arguments>
<string>var/allure-results</string> <!-- XML files output directory -->
<boolean>true</boolean> <!-- Whether to delete previous results on rerun -->
Expand Down
2 changes: 1 addition & 1 deletion dev/tests/setup-integration/framework/tests/unit/phpunit.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<ini name="date.timezone" value="America/Los_Angeles"/>
</php>
<listeners>
<listener class="Yandex\Allure\Adapter\AllureAdapter">
<listener class="Yandex\Allure\PhpUnit\AllurePhpUnit">
<arguments>
<string>var/allure-results</string> <!-- XML files output directory -->
<boolean>true</boolean> <!-- Whether to delete previous results on rerun -->
Expand Down
2 changes: 1 addition & 1 deletion dev/tests/setup-integration/phpunit.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<listeners>
<listener class="Magento\TestFramework\Event\PhpUnit"/>
<listener class="Magento\TestFramework\ErrorLog\Listener"/>
<listener class="Yandex\Allure\Adapter\AllureAdapter">
<listener class="Yandex\Allure\PhpUnit\AllurePhpUnit">
<arguments>
<string>var/allure-results</string> <!-- XML files output directory -->
<boolean>true</boolean> <!-- Whether to delete previous results on rerun -->
Expand Down
2 changes: 1 addition & 1 deletion dev/tests/static/framework/tests/unit/phpunit.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<ini name="date.timezone" value="America/Los_Angeles"/>
</php>
<listeners>
<listener class="Yandex\Allure\Adapter\AllureAdapter">
<listener class="Yandex\Allure\PhpUnit\AllurePhpUnit">
<arguments>
<string>var/allure-results</string> <!-- XML files output directory -->
<boolean>true</boolean> <!-- Whether to delete previous results on rerun -->
Expand Down
2 changes: 1 addition & 1 deletion dev/tests/static/phpunit-all.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<const name="TESTCODESTYLE_IS_FULL_SCAN" value="0"/>
</php>
<listeners>
<listener class="Yandex\Allure\Adapter\AllureAdapter">
<listener class="Yandex\Allure\PhpUnit\AllurePhpUnit">
<arguments>
<string>var/allure-results</string> <!-- XML files output directory -->
<boolean>true</boolean> <!-- Whether to delete previous results on rerun -->
Expand Down
2 changes: 1 addition & 1 deletion dev/tests/static/phpunit.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<!--<const name="TESTS_COMPOSER_PATH" value="/usr/local/bin/composer"/>-->
</php>
<listeners>
<listener class="Yandex\Allure\Adapter\AllureAdapter">
<listener class="Yandex\Allure\PhpUnit\AllurePhpUnit">
<arguments>
<string>var/allure-results</string> <!-- XML files output directory -->
<boolean>true</boolean> <!-- Whether to delete previous results on rerun -->
Expand Down
2 changes: 1 addition & 1 deletion dev/tests/unit/phpunit.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
</whitelist>
</filter>
<listeners>
<listener class="Yandex\Allure\Adapter\AllureAdapter">
<listener class="Yandex\Allure\PhpUnit\AllurePhpUnit">
<arguments>
<string>var/allure-results</string> <!-- XML files output directory -->
<boolean>true</boolean> <!-- Whether to delete previous results on rerun -->
Expand Down