diff --git a/.github/workflows/psalm-matrix.yml b/.github/workflows/psalm-matrix.yml index 0df488d7be..e3e2fc6841 100644 --- a/.github/workflows/psalm-matrix.yml +++ b/.github/workflows/psalm-matrix.yml @@ -21,7 +21,7 @@ jobs: # do not stop on another job's failure fail-fast: false matrix: - ocp-version: [ 'dev-master' ] + ocp-version: [ 'dev-stable30' ] name: static-psalm-analysis ${{ matrix.ocp-version }} steps: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a2381c1fd8..19716699f9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: php-versions: ['8.1', '8.2', '8.3'] - nextcloud-versions: ['master'] + nextcloud-versions: ['stable30'] name: Nextcloud ${{ matrix.nextcloud-versions }} php${{ matrix.php-versions }} unit tests steps: - name: Set up Nextcloud env @@ -57,16 +57,16 @@ jobs: strategy: matrix: php-versions: ['8.3'] - nextcloud-versions: ['master'] + nextcloud-versions: ['stable30'] db: ['sqlite', 'mysql', 'pgsql'] cache: ['nocache'] include: - php-versions: 8.1 - nextcloud-versions: master + nextcloud-versions: stable30 db: 'sqlite' cache: 'redis' - php-versions: 8.2 - nextcloud-versions: master + nextcloud-versions: stable30 db: 'mysql' cache: 'redis' name: ${{ matrix.nextcloud-versions }} w/ php${{ matrix.php-versions }}-${{ matrix.db }}-${{ matrix.cache }} integration tests @@ -145,7 +145,7 @@ jobs: if: ${{ matrix.php-versions == '8.2' }} run: sed -i 's/max-version="8.1"/max-version="8.2"/' nextcloud/apps/mail/appinfo/info.xml - name: Install Mail - run: php -f nextcloud/occ app:enable -f mail + run: php -f nextcloud/occ app:enable mail - name: Configure Nextcloud for testing run: | php -f nextcloud/occ config:system:set debug --type bool --value true diff --git a/composer.json b/composer.json index 8362335e23..22c67c528c 100644 --- a/composer.json +++ b/composer.json @@ -38,13 +38,15 @@ "nextcloud/kitinerary-flatpak": "^1.0", "nextcloud/kitinerary-sys": "^1.0.1", "phpmailer/dkimvalidator": "^0.3.0", - "psr/log": "^1", "rubix/ml": "2.5.0", "sabberworm/php-css-parser": "^8.6.0", "youthweb/urllinker": "^2.0" }, "require-dev": { + "fig/log-test": "^1.1", + "nextcloud/ocp": "dev-stable30", "psalm/phar": "^5.25.0", + "psr/log": "^2.0.0", "roave/security-advisories": "dev-master" }, "autoload": { diff --git a/composer.lock b/composer.lock index 8170d48ab0..f62ad1a291 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": "fab486a104339fcd4a3f29c46d36092d", + "content-hash": "2630458e1f5c3e509447ba03c496c4fe", "packages": [ { "name": "amphp/amp", @@ -2268,30 +2268,30 @@ }, { "name": "psr/log", - "version": "1.1.4", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "d49695b909c3b7628b6289db5479a1c204601f11" + "reference": "ef29f6d262798707a9edd554e2b82517ef3a9376" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11", - "reference": "d49695b909c3b7628b6289db5479a1c204601f11", + "url": "https://api.github.com/repos/php-fig/log/zipball/ef29f6d262798707a9edd554e2b82517ef3a9376", + "reference": "ef29f6d262798707a9edd554e2b82517ef3a9376", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": ">=8.0.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { "psr-4": { - "Psr\\Log\\": "Psr/Log/" + "Psr\\Log\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -2312,9 +2312,9 @@ "psr-3" ], "support": { - "source": "https://github.com/php-fig/log/tree/1.1.4" + "source": "https://github.com/php-fig/log/tree/2.0.0" }, - "time": "2021-05-03T11:20:27+00:00" + "time": "2021-07-14T16:41:46+00:00" }, { "name": "rubix/ml", @@ -3548,6 +3548,96 @@ } ], "packages-dev": [ + { + "name": "fig/log-test", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/log-test.git", + "reference": "02d6eaf8b09784b7adacf57a3c951bad95229a7f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/log-test/zipball/02d6eaf8b09784b7adacf57a3c951bad95229a7f", + "reference": "02d6eaf8b09784b7adacf57a3c951bad95229a7f", + "shasum": "" + }, + "require": { + "php": "^8.0", + "psr/log": "^2.0 | ^3.0" + }, + "require-dev": { + "phpunit/phpunit": "^8.0 | ^9.0", + "squizlabs/php_codesniffer": "^3.6" + }, + "type": "library", + "autoload": { + "psr-4": { + "Psr\\Log\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/", + "role": "Organisation" + } + ], + "description": "Test utilities for the psr/log package that backs the PSR-3 specification.", + "support": { + "issues": "https://github.com/php-fig/log-test/issues", + "source": "https://github.com/php-fig/log-test/tree/1.1.0" + }, + "time": "2022-10-18T05:33:27+00:00" + }, + { + "name": "nextcloud/ocp", + "version": "dev-stable30", + "source": { + "type": "git", + "url": "https://github.com/nextcloud-deps/ocp.git", + "reference": "bb3336c59895050f406749977be8bae877dae104" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/bb3336c59895050f406749977be8bae877dae104", + "reference": "bb3336c59895050f406749977be8bae877dae104", + "shasum": "" + }, + "require": { + "php": "~8.0 || ~8.1 || ~8.2 || ~8.3", + "psr/clock": "^1.0", + "psr/container": "^2.0.2", + "psr/event-dispatcher": "^1.0", + "psr/log": "^2.0.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-stable30": "30.0.0-dev" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "AGPL-3.0-or-later" + ], + "authors": [ + { + "name": "Christoph Wurst", + "email": "christoph@winzerhof-wurst.at" + } + ], + "description": "Composer package containing Nextcloud's public API (classes, interfaces)", + "support": { + "issues": "https://github.com/nextcloud-deps/ocp/issues", + "source": "https://github.com/nextcloud-deps/ocp/tree/stable30" + }, + "time": "2024-10-11T18:45:44+00:00" + }, { "name": "psalm/phar", "version": "5.25.0", @@ -3583,6 +3673,157 @@ }, "time": "2024-06-19T20:02:02+00:00" }, + { + "name": "psr/clock", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/clock.git", + "reference": "e41a24703d4560fd0acb709162f73b8adfc3aa0d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/clock/zipball/e41a24703d4560fd0acb709162f73b8adfc3aa0d", + "reference": "e41a24703d4560fd0acb709162f73b8adfc3aa0d", + "shasum": "" + }, + "require": { + "php": "^7.0 || ^8.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Psr\\Clock\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common interface for reading the clock.", + "homepage": "https://github.com/php-fig/clock", + "keywords": [ + "clock", + "now", + "psr", + "psr-20", + "time" + ], + "support": { + "issues": "https://github.com/php-fig/clock/issues", + "source": "https://github.com/php-fig/clock/tree/1.0.0" + }, + "time": "2022-11-25T14:36:26+00:00" + }, + { + "name": "psr/container", + "version": "2.0.2", + "source": { + "type": "git", + "url": "https://github.com/php-fig/container.git", + "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963", + "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963", + "shasum": "" + }, + "require": { + "php": ">=7.4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Container\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common Container Interface (PHP FIG PSR-11)", + "homepage": "https://github.com/php-fig/container", + "keywords": [ + "PSR-11", + "container", + "container-interface", + "container-interop", + "psr" + ], + "support": { + "issues": "https://github.com/php-fig/container/issues", + "source": "https://github.com/php-fig/container/tree/2.0.2" + }, + "time": "2021-11-05T16:47:00+00:00" + }, + { + "name": "psr/event-dispatcher", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/event-dispatcher.git", + "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0", + "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0", + "shasum": "" + }, + "require": { + "php": ">=7.2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\EventDispatcher\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Standard interfaces for event handling.", + "keywords": [ + "events", + "psr", + "psr-14" + ], + "support": { + "issues": "https://github.com/php-fig/event-dispatcher/issues", + "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0" + }, + "time": "2019-01-08T18:20:26+00:00" + }, { "name": "roave/security-advisories", "version": "dev-master", @@ -4152,6 +4393,7 @@ "minimum-stability": "stable", "stability-flags": { "gravatarphp/gravatar": 20, + "nextcloud/ocp": 20, "roave/security-advisories": 20 }, "prefer-stable": false,