diff options
| author | Mario <mario@mariovavti.com> | 2024-09-25 09:47:21 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2024-09-25 09:47:21 +0000 |
| commit | c12ef4fbf4b2046e0af68b11e8fe5af2d335f32e (patch) | |
| tree | 5ec2c9808e05fb9e72fc87e7b0b89b015cfc52ce | |
| parent | 424b31b7f093f6264ce11a259cff4953696b20de (diff) | |
| parent | 20ee1a5b5b74d865f5a4ef0a02ae54d45ca52ba9 (diff) | |
| download | volse-hubzilla-c12ef4fbf4b2046e0af68b11e8fe5af2d335f32e.tar.gz volse-hubzilla-c12ef4fbf4b2046e0af68b11e8fe5af2d335f32e.tar.bz2 volse-hubzilla-c12ef4fbf4b2046e0af68b11e8fe5af2d335f32e.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
| -rw-r--r-- | composer.json | 5 | ||||
| -rw-r--r-- | composer.lock | 10 | ||||
| -rw-r--r-- | tests/phpunit.xml | 2 | ||||
| -rw-r--r-- | tests/unit/bootstrap.php | 9 |
4 files changed, 16 insertions, 10 deletions
diff --git a/composer.json b/composer.json index 7ed537c39..a90a52db0 100644 --- a/composer.json +++ b/composer.json @@ -73,11 +73,6 @@ "Zotlabs\\": "Zotlabs/" } }, - "autoload-dev": { - "psr-4": { - "Zotlabs\\Tests\\Unit\\": "tests/unit" - } - }, "minimum-stability": "stable", "config": { "notify-on-install": false, diff --git a/composer.lock b/composer.lock index 67bcf53b8..f4c1af599 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "a3d39881eecda53834cbcb595100e00e", + "content-hash": "e15f86e41cc765cbdd319fc2cc5311fb", "packages": [ { "name": "blueimp/jquery-file-upload", @@ -4534,12 +4534,12 @@ "version": "3.6.2", "source": { "type": "git", - "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", + "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", "reference": "5e4e71592f69da17871dba6e80dd51bce74a351a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/5e4e71592f69da17871dba6e80dd51bce74a351a", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/5e4e71592f69da17871dba6e80dd51bce74a351a", "reference": "5e4e71592f69da17871dba6e80dd51bce74a351a", "shasum": "" }, @@ -5280,6 +5280,8 @@ "ext-sodium": "*", "ext-bcmath": "*" }, - "platform-dev": [], + "platform-dev": { + "ext-yaml": "*" + }, "plugin-api-version": "2.6.0" } diff --git a/tests/phpunit.xml b/tests/phpunit.xml index 3531cd05c..44ee9c2ee 100644 --- a/tests/phpunit.xml +++ b/tests/phpunit.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="../boot.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache"> +<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="unit/bootstrap.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache"> <php> <includePath>..</includePath> <!-- env name="HZ_TEST_DB_HOST" value=""/--> diff --git a/tests/unit/bootstrap.php b/tests/unit/bootstrap.php new file mode 100644 index 000000000..296e1b9b6 --- /dev/null +++ b/tests/unit/bootstrap.php @@ -0,0 +1,9 @@ +<?php +/** + * Bootstrapping unit test framework + * + */ + +require_once __dir__ . '/../../boot.php'; +require_once __dir__ . '/UnitTestCase.php'; +require_once __dir__ . '/Module/TestCase.php'; |