From 7fbcfd26705d5a4ca2b2bb16b0f9c73c49341fcb Mon Sep 17 00:00:00 2001 From: David Buchmann Date: Tue, 19 Sep 2023 17:30:55 +0200 Subject: [PATCH 1/5] adjust to semantic branch naming --- composer.json | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 6ef57e6..3f81bbc 100644 --- a/composer.json +++ b/composer.json @@ -40,10 +40,5 @@ "autoload": { "psr-0": {"": "src"} }, - "bin": ["bin/phpcrsh"], - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - } + "bin": ["bin/phpcrsh"] } From 0790e8e64e537c330a6839dd0283d1a9ba733421 Mon Sep 17 00:00:00 2001 From: StyleCI Bot Date: Tue, 19 Sep 2023 15:32:40 +0000 Subject: [PATCH 2/5] Apply fixes from StyleCI --- spec/PHPCR/Shell/Config/ProfileLoaderSpec.php | 2 +- src/PHPCR/Shell/Config/Profile.php | 4 ++-- .../Shell/Console/Command/Phpcr/NodeListCommand.php | 10 +++++----- .../Shell/Console/Helper/ResultFormatterHelper.php | 8 ++++---- tests/PHPCR/Shell/Helper/EditorHelperTest.php | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/spec/PHPCR/Shell/Config/ProfileLoaderSpec.php b/spec/PHPCR/Shell/Config/ProfileLoaderSpec.php index 4f9ea3b..cf344d1 100644 --- a/spec/PHPCR/Shell/Config/ProfileLoaderSpec.php +++ b/spec/PHPCR/Shell/Config/ProfileLoaderSpec.php @@ -88,7 +88,7 @@ public function it_should_save_a_given_profile( password: leech EOT - , 0600)->shouldBeCalled(); + , 0600)->shouldBeCalled(); $this->saveProfile($profile); } } diff --git a/src/PHPCR/Shell/Config/Profile.php b/src/PHPCR/Shell/Config/Profile.php index a95c3c1..2f7d292 100644 --- a/src/PHPCR/Shell/Config/Profile.php +++ b/src/PHPCR/Shell/Config/Profile.php @@ -53,8 +53,8 @@ protected function validateDomain($domain) /** * Set a domain configuration. * - * @param string $domain - * @param $key + * @param string $domain + * @param $key * @param array|null $value */ public function set($domain, $key, $value = null) diff --git a/src/PHPCR/Shell/Console/Command/Phpcr/NodeListCommand.php b/src/PHPCR/Shell/Console/Command/Phpcr/NodeListCommand.php index b06c4a8..57c3e9f 100644 --- a/src/PHPCR/Shell/Console/Command/Phpcr/NodeListCommand.php +++ b/src/PHPCR/Shell/Console/Command/Phpcr/NodeListCommand.php @@ -137,11 +137,11 @@ public function execute(InputInterface $input, OutputInterface $output) if ($config['show_execution_time_list']) { $output->writeln( sprintf( - '%s nodes, %s properties in set (%s sec)', - $this->nbNodes, - $this->nbProperties, - number_format($this->time, $config['execution_time_expansion']) - ) + '%s nodes, %s properties in set (%s sec)', + $this->nbNodes, + $this->nbProperties, + number_format($this->time, $config['execution_time_expansion']) + ) ); } diff --git a/src/PHPCR/Shell/Console/Helper/ResultFormatterHelper.php b/src/PHPCR/Shell/Console/Helper/ResultFormatterHelper.php index b6cd225..54bc529 100644 --- a/src/PHPCR/Shell/Console/Helper/ResultFormatterHelper.php +++ b/src/PHPCR/Shell/Console/Helper/ResultFormatterHelper.php @@ -92,10 +92,10 @@ public function formatQueryResult(QueryResultInterface $result, OutputInterface if (true === $this->config['show_execution_time_query']) { $output->writeln( sprintf( - '%s rows in set (%s sec)', - count($result->getRows()), - number_format($elapsed, $this->config['execution_time_expansion']) - ) + '%s rows in set (%s sec)', + count($result->getRows()), + number_format($elapsed, $this->config['execution_time_expansion']) + ) ); } } diff --git a/tests/PHPCR/Shell/Helper/EditorHelperTest.php b/tests/PHPCR/Shell/Helper/EditorHelperTest.php index ce9e106..1249fad 100644 --- a/tests/PHPCR/Shell/Helper/EditorHelperTest.php +++ b/tests/PHPCR/Shell/Helper/EditorHelperTest.php @@ -40,7 +40,7 @@ public function testFromValue() Two Three EOT - , + , $res ); } From bdf1dfa6801c9e8e56327bf3af89de3e67ce64f2 Mon Sep 17 00:00:00 2001 From: David Buchmann Date: Tue, 19 Sep 2023 17:40:20 +0200 Subject: [PATCH 3/5] fix jackrabbit startup --- .github/workflows/test-application.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml index 651d423..d988f3c 100644 --- a/.github/workflows/test-application.yaml +++ b/.github/workflows/test-application.yaml @@ -63,7 +63,7 @@ jobs: - name: Start Jackrabbit run: | - JACKRABBIT_VERSION=2.21.10 tests/bin/travis_jackrabbit.sh + JACKRABBIT_VERSION=2.21.10 ./vendor/jackalope/jackalope-jackrabbit/bin/jackrabbit.sh - name: Execute test cases run: | From 38762df783a727f7a0222f2eb16e9476ea5068b2 Mon Sep 17 00:00:00 2001 From: David Buchmann Date: Tue, 19 Sep 2023 17:58:13 +0200 Subject: [PATCH 4/5] debug jackrabbit issue --- .github/workflows/test-application.yaml | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml index d988f3c..cfc37ef 100644 --- a/.github/workflows/test-application.yaml +++ b/.github/workflows/test-application.yaml @@ -21,25 +21,7 @@ jobs: matrix: include: - - php-version: '8.0' - dependencies: lowest - behat-suite: standalone - - php-version: '8.0' - dependencies: lowest - behat-suite: embedded - - - php-version: '8.0' - dependencies: lowest - behat-suite: cli - - - php-version: '8.1' - dependencies: highest - behat-suite: standalone - - - php-version: '8.1' - dependencies: highest - behat-suite: embedded - php-version: '8.1' dependencies: highest @@ -63,7 +45,11 @@ jobs: - name: Start Jackrabbit run: | - JACKRABBIT_VERSION=2.21.10 ./vendor/jackalope/jackalope-jackrabbit/bin/jackrabbit.sh + wget -nv http://archive.apache.org/dist/jackrabbit/2.21.10/jackrabbit-standalone-2.21.10.jar + zipinfo jackrabbit-standalone-2.21.10.jar | wc -l + java -version + java -jar jackrabbit-standalone-2.21.10.jar +# JACKRABBIT_VERSION=2.21.10 tests/bin/travis_jackrabbit.sh || java -jar ./vendor/jackalope/jackalope-jackrabbit/bin/jackrabbit-standalone-2.21.10.jar - name: Execute test cases run: | From 958f041e2c2400ed2730ce77e6ef9e73cd0126f2 Mon Sep 17 00:00:00 2001 From: David Buchmann Date: Wed, 20 Sep 2023 19:21:31 +0200 Subject: [PATCH 5/5] wrap up --- .github/workflows/test-application.yaml | 38 +++++++++++++++++++++---- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml index cfc37ef..f22a353 100644 --- a/.github/workflows/test-application.yaml +++ b/.github/workflows/test-application.yaml @@ -21,7 +21,25 @@ jobs: matrix: include: + - php-version: '8.0' + dependencies: lowest + behat-suite: standalone + - php-version: '8.0' + dependencies: lowest + behat-suite: embedded + + - php-version: '8.0' + dependencies: lowest + behat-suite: cli + + - php-version: '8.1' + dependencies: highest + behat-suite: standalone + + - php-version: '8.1' + dependencies: highest + behat-suite: embedded - php-version: '8.1' dependencies: highest @@ -31,6 +49,13 @@ jobs: - name: Checkout project uses: actions/checkout@v2 + # default java installation not able to run jackrabbit. use same as jackalope-jackrabbit action + - name: Install and configure Java + uses: actions/setup-java@v3 + with: + distribution: temurin + java-version: '8' + - name: Install and configure PHP uses: shivammathur/setup-php@v2 with: @@ -43,13 +68,16 @@ jobs: dependency-versions: ${{ matrix.dependencies }} composer-options: ${{ matrix.composer-options }} + - name: Cache Jackrabbit + id: cache-jackrabbit + uses: actions/cache@v3 + with: + path: vendor/jackalope/jackalope-jackrabbit/bin/jackrabbit-standalone-* + key: jackrabbit + - name: Start Jackrabbit run: | - wget -nv http://archive.apache.org/dist/jackrabbit/2.21.10/jackrabbit-standalone-2.21.10.jar - zipinfo jackrabbit-standalone-2.21.10.jar | wc -l - java -version - java -jar jackrabbit-standalone-2.21.10.jar -# JACKRABBIT_VERSION=2.21.10 tests/bin/travis_jackrabbit.sh || java -jar ./vendor/jackalope/jackalope-jackrabbit/bin/jackrabbit-standalone-2.21.10.jar + JACKRABBIT_VERSION=2.21.10 tests/bin/travis_jackrabbit.sh - name: Execute test cases run: |