Skip to content

Commit

Permalink
Merge pull request #14 from AOEpeople/feature/ci-tools-php83
Browse files Browse the repository at this point in the history
[FEATURE] update ci tools for php83 and changed test.xmls back to the original ones
  • Loading branch information
sourcesoldier authored May 13, 2024
2 parents d3e3d33 + 82a8ba5 commit c6476e7
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 21 deletions.
29 changes: 20 additions & 9 deletions Tests/FunctionalTests.xml
Original file line number Diff line number Diff line change
@@ -1,23 +1,34 @@
<?xml version="1.0"?>
<phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
backupGlobals="true"
backupStaticAttributes="false"
bootstrap="../.Build/vendor/nimut/testing-framework/res/Configuration/FunctionalTestsBootstrap.php"
bootstrap="../.Build/vendor/typo3/testing-framework/Resources/Core/Build/FunctionalTestsBootstrap.php"
colors="true"
convertErrorsToExceptions="true"
convertWarningsToExceptions="true"
forceCoversAnnotation="false"
processIsolation="true"
stopOnError="false"
stopOnFailure="false"
stopOnIncomplete="false"
stopOnSkipped="false"
verbose="false">
<coverage processUncoveredFiles="true">
cacheDirectory=".phpunit.cache"
backupStaticProperties="false"
requireCoverageMetadata="false">
<source>
<include>
<directory suffix=".php">../Classes</directory>
</include>
</coverage>
</source>
<php>
<!-- @deprecated: will be removed with next major version, constant TYPO3_MODE is deprecated -->
<const name="TYPO3_MODE" value="BE"/>
<!--
@deprecated: Set this to not suppress warnings, notices and deprecations in functional tests
with TYPO3 core v11 and up.
Will always be done with next major version.
To still suppress warnings, notices and deprecations, do NOT define the constant at all.
-->
<const name="TYPO3_TESTING_FUNCTIONAL_REMOVE_ERROR_HANDLER" value="true"/>
<ini name="display_errors" value="1"/>
<env name="TYPO3_CONTEXT" value="Testing"/>
</php>
</phpunit>
17 changes: 7 additions & 10 deletions Tests/UnitTests.xml
Original file line number Diff line number Diff line change
@@ -1,24 +1,21 @@
<?xml version="1.0"?>
<phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
backupGlobals="true"
backupStaticAttributes="false"
bootstrap="../.Build/vendor/nimut/testing-framework/res/Configuration/UnitTestsBootstrap.php"
bootstrap="../.Build/vendor/typo3/testing-framework/Resources/Core/Build/UnitTestsBootstrap.php"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
forceCoversAnnotation="false"
processIsolation="false"
stopOnError="false"
stopOnFailure="false"
stopOnIncomplete="false"
stopOnSkipped="false"
verbose="false">
<coverage processUncoveredFiles="true">
cacheDirectory=".phpunit.cache"
backupStaticProperties="false"
requireCoverageMetadata="false">
<source>
<include>
<directory suffix=".php">../Classes</directory>
</include>
</coverage>
</source>
</phpunit>
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,11 @@
],
"test:unit": [
"[ -e .Build/bin/phpunit ] || composer update",
"TYPO3_PATH_ROOT=$PWD/.Build/Web .Build/bin/phpunit -c .Build/vendor/typo3/testing-framework/Resources/Core/Build/UnitTests-v10.xml Tests/Unit"
"TYPO3_PATH_ROOT=$PWD/.Build/Web .Build/bin/phpunit -c Tests/UnitTests.xml Tests/Unit"
],
"test:functional": [
"[ -e .Build/bin/phpunit ] || composer update",
"TYPO3_PATH_ROOT=$PWD/.Build/Web typo3DatabaseName=t3_congo_dev typo3DatabasePort=3307 typo3DatabaseHost=127.0.0.1 typo3DatabaseUsername=root typo3DatabasePassword=root .Build/bin/phpunit -c .Build/vendor/typo3/testing-framework/Resources/Core/Build/FunctionalTests-v10.xml Tests/Functional"
"TYPO3_PATH_ROOT=$PWD/.Build/Web typo3DatabaseName=t3_congo_dev typo3DatabasePort=3307 typo3DatabaseHost=127.0.0.1 typo3DatabaseUsername=root typo3DatabasePassword=root .Build/bin/phpunit -c Tests/FunctionalTests.xml Tests/Functional"
],
"code-style": [
"[ -e ./.Build/bin/rector ] || composer install",
Expand Down

0 comments on commit c6476e7

Please sign in to comment.