Skip to content

Commit

Permalink
allow typed versions of simplecache too
Browse files Browse the repository at this point in the history
  • Loading branch information
dbu committed Sep 1, 2023
1 parent 867d578 commit 8fdd317
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/test-application.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,11 @@ jobs:
extensions: "pdo, pdo_sqlite, pdo_mysql, mysql, pdo_pgsql"
tools: 'composer:v2'

- name: PHP 8.0 simple cache
# Symfony 5 is not compatible with SimpleCache 3 but does not declare a conflict. Symfony 6 can not be installed on PHP 8.0.
if: ${{ '8.0' == matrix.php-version }}
run: composer require psr/simple-cache "^2.0" --no-update

- name: Install dependencies with Composer
uses: ramsey/composer-install@v2
with:
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ Changelog
2.0.0 (unreleased)
------------------

* Added static typing whereever possible. This should not change anything, but the added strictness
* Added static typing wherever possible. This should not change anything, but the added strictness
might trigger errors where it was more tolerant for incorrect types before.
* Renamed cli-config.php.dist to cli-config.dist.php and cleaned up to be better documented.
* [BC Break]: CachedClient now expects a PSR-16 cache rather than the abandoned doctrine/cache.
When instantiating the client, you need to provide at least the cache instance for metadata, as CachedClient does not know which implementation to pick.
* If you are on PHP 8.0 and install Jackalope with `symfony/cache`, you need to restrict `psr/simple-cache` to `^1.0 || ^2.0` in your application because Symfony 5 does not declare a conflict with it, but fails at runtime.
* Drop support for PHP 7.
* Fixed: While it is allowed to call `Repository::login` with `null` credentials, there used to be an error. It now correctly works.
If you use `jcr:createdBy` or `jcr:lastModifiedBy` in node types, those properties are not set if the credentials are `null`.
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"phpcr/phpcr": "~2.1.5",
"phpcr/phpcr-utils": "^1.8.0",
"jackalope/jackalope": "^2.0.0-beta2",
"psr/simple-cache": "^1.0"
"psr/simple-cache": "^1.0 || ^2.0 || ^3.0"
},
"provide": {
"jackalope/jackalope-transport": "2.0.0"
Expand Down

0 comments on commit 8fdd317

Please sign in to comment.