diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml index 651d423..f22a353 100644 --- a/.github/workflows/test-application.yaml +++ b/.github/workflows/test-application.yaml @@ -49,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: @@ -61,6 +68,13 @@ 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: | JACKRABBIT_VERSION=2.21.10 tests/bin/travis_jackrabbit.sh 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"] } 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 ); }