From fb3628b0d5b1fcaa41a31755f14fb47cff648882 Mon Sep 17 00:00:00 2001
From: David Buchmann <david.buchmann@liip.ch>
Date: Tue, 19 Sep 2023 18:06:41 +0200
Subject: [PATCH] allow and support jackalope version 2

---
 .github/workflows/test-application.yaml                   | 6 +++---
 CHANGELOG.md                                              | 5 +++++
 composer.json                                             | 6 +++---
 src/PHPCR/Shell/Console/Command/Phpcr/LockLockCommand.php | 2 +-
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml
index 5d43b66..a328c50 100644
--- a/.github/workflows/test-application.yaml
+++ b/.github/workflows/test-application.yaml
@@ -59,11 +59,11 @@ jobs:
 
         steps:
             - name: Checkout project
-              uses: actions/checkout@v2
+              uses: actions/checkout@v4
 
             # default java installation not able to run jackrabbit. use same as jackalope-jackrabbit action
             - name: Install and configure Java
-              uses: actions/setup-java@v3
+              uses: actions/setup-java@v4
               with:
                   distribution: temurin
                   java-version: '8'
@@ -82,7 +82,7 @@ jobs:
 
             - name: Cache Jackrabbit
               id: cache-jackrabbit
-              uses: actions/cache@v3
+              uses: actions/cache@v4
               with:
                 path: vendor/jackalope/jackalope-jackrabbit/bin/jackrabbit-standalone-*
                 key: jackrabbit
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 882a26c..1759618 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+1.6.0
+-----
+
+- Work with Jackalope 2.*.
+
 1.5.0
 -----
 
diff --git a/composer.json b/composer.json
index 3f81bbc..4301f2a 100644
--- a/composer.json
+++ b/composer.json
@@ -4,7 +4,7 @@
     "require": {
         "php": "^8.0",
         "symfony/console": "^5.0 || ^6.0",
-        "jackalope/jackalope": "^1.3.4",
+        "jackalope/jackalope": "^1.3.4 || ^2@dev",
         "phpcr/phpcr": "^2.1",
         "phpcr/phpcr-utils": "^1.2",
         "symfony/finder": "^5.0 || ^6.0",
@@ -18,8 +18,8 @@
         "phpunit/phpunit": "^9.5",
         "behat/behat": "^3.10",
         "phpspec/phpspec": "^7.2",
-        "jackalope/jackalope-doctrine-dbal": "^1.3",
-        "jackalope/jackalope-jackrabbit": "^1.4.4",
+        "jackalope/jackalope-doctrine-dbal": "^1.3 || ^2@dev",
+        "jackalope/jackalope-jackrabbit": "^1.4.4 || ^2@dev",
         "phpspec/prophecy-phpunit": "^2.0"
     },
     "suggest": {
diff --git a/src/PHPCR/Shell/Console/Command/Phpcr/LockLockCommand.php b/src/PHPCR/Shell/Console/Command/Phpcr/LockLockCommand.php
index 648f977..6bf014f 100644
--- a/src/PHPCR/Shell/Console/Command/Phpcr/LockLockCommand.php
+++ b/src/PHPCR/Shell/Console/Command/Phpcr/LockLockCommand.php
@@ -27,7 +27,7 @@ protected function configure(): void
         $this->addArgument('path', InputArgument::REQUIRED, 'Path of node to be locked');
         $this->addOption('deep', null, InputOption::VALUE_NONE, 'If given this lock will apply to this node and all its descendants; if not, it applies only to this node.');
         $this->addOption('session-scoped', null, InputOption::VALUE_NONE, 'If given, this lock expires with the current session; if not it expires when explicitly or automatically unlocked for some other reason');
-        $this->addOption('timeout', null, InputOption::VALUE_REQUIRED, 'Desired lock timeout in seconds (servers are free to ignore this value). If not used lock will not timeout');
+        $this->addOption('timeout', null, InputOption::VALUE_REQUIRED, 'Desired lock timeout in seconds (servers are free to ignore this value). If not used lock will not timeout', PHP_INT_MAX);
         $this->addOption('owner-info', null, InputOption::VALUE_REQUIRED, ' string containing owner information supplied by the client; servers are free to ignore this value. If none is specified, the implementation chooses one (i.e. user name of current backend authentication credentials');
         $this->setHelp(
             <<<'HERE'