Skip to content

adjust to semantic branch naming #218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Sep 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions .github/workflows/test-application.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
7 changes: 1 addition & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,5 @@
"autoload": {
"psr-0": {"": "src"}
},
"bin": ["bin/phpcrsh"],
"extra": {
"branch-alias": {
"dev-master": "1.x-dev"
}
}
"bin": ["bin/phpcrsh"]
}
2 changes: 1 addition & 1 deletion spec/PHPCR/Shell/Config/ProfileLoaderSpec.php
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public function it_should_save_a_given_profile(
password: leech

EOT
, 0600)->shouldBeCalled();
, 0600)->shouldBeCalled();
$this->saveProfile($profile);
}
}
4 changes: 2 additions & 2 deletions src/PHPCR/Shell/Config/Profile.php
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
10 changes: 5 additions & 5 deletions src/PHPCR/Shell/Console/Command/Phpcr/NodeListCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -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'])
)
);
}

Expand Down
8 changes: 4 additions & 4 deletions src/PHPCR/Shell/Console/Helper/ResultFormatterHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -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'])
)
);
}
}
Expand Down
2 changes: 1 addition & 1 deletion tests/PHPCR/Shell/Helper/EditorHelperTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public function testFromValue()
Two
Three
EOT
,
,
$res
);
}
Expand Down